fix 几个模块字段不显示的问题

doc/sql/mysql/tianze-pro-update.sql

@@ -148,3 +148,6 @@ CREATE TABLE `teacher_open_course_knowledge_point_relation` (
     PRIMARY KEY (`teacher_open_course_knowledge_relation_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='教师-课程开课-知识点-关联表';
 
+
+# 院校增加默认管理员
+ALTER TABLE universities_colleges ADD COLUMN universities_cdolleges_default_admin_user_id bigint(20) COMMENT '院校默认管理员用户ID';

web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplicationCourse.java

@@ -1,6 +1,7 @@
 package com.ibeetl.jlw.entity;
 
 import cn.jlw.validate.ValidateConfig;
+import com.ibeetl.admin.core.annotation.Dict;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import org.beetl.sql.annotation.entity.AutoID;
 
@@ -25,6 +26,7 @@ public class ResourcesApplicationCourse extends BaseEntity{
 	
     //课程配置ID
 
+    @Dict(type="course_info.course_info_name.1=1")
     private Long courseInfoId ;
 	
     public ResourcesApplicationCourse(){

web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java

@@ -1,8 +1,10 @@
 package com.ibeetl.jlw.entity;
 
 import cn.jlw.validate.ValidateConfig;
+import com.ibeetl.admin.core.annotation.Dict;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.fetch.annotation.Fetch;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -12,6 +14,7 @@ import java.util.Date;
 * 院校管理
 * gen by Spring Boot2 Admin 2021-06-19
 */
+@Fetch
 public class UniversitiesColleges extends BaseEntity{
 
     //ID
@@ -65,6 +68,13 @@ public class UniversitiesColleges extends BaseEntity{
 
     private String universitiesCollegesAuthCode;
 
+    // 院校默认管理员用户ID
+    @Dict(type = "core_user.CODE.1=1")
+    private String universitiesCdollegesDefaultAdminUserId;
+
+//    @FetchSql("select * from core_user where id = #universitiesCdollegesDefaultAdminUserId# ")
+//    private CoreUser defaultAdminUser;
+
     //组织机构ID
 
     private Long orgId ;
@@ -252,4 +262,20 @@ public class UniversitiesColleges extends BaseEntity{
     public void setUniversitiesCollegesAuthCode(String universitiesCollegesAuthCode) {
         this.universitiesCollegesAuthCode = universitiesCollegesAuthCode;
     }
+
+    public String getUniversitiesCdollegesDefaultAdminUserId() {
+        return universitiesCdollegesDefaultAdminUserId;
+    }
+
+    public void setUniversitiesCdollegesDefaultAdminUserId(String universitiesCdollegesDefaultAdminUserId) {
+        this.universitiesCdollegesDefaultAdminUserId = universitiesCdollegesDefaultAdminUserId;
+    }
+
+//    public CoreUser getDefaultAdminUser() {
+//        return defaultAdminUser;
+//    }
+//
+//    public void setDefaultAdminUser(CoreUser defaultAdminUser) {
+//        this.defaultAdminUser = defaultAdminUser;
+//    }
 }

web/src/main/java/com/ibeetl/jlw/web/query/UniversitiesCollegesQuery.java

@@ -1,15 +1,13 @@
 package com.ibeetl.jlw.web.query;
 
-import com.ibeetl.jlw.entity.UniversitiesColleges;
-import org.apache.commons.lang3.StringUtils;
 import com.ibeetl.admin.core.annotation.Query;
-import com.ibeetl.admin.core.util.Tool;
-import com.ibeetl.admin.core.util.enums.CoreDictType;
 import com.ibeetl.admin.core.web.query.PageParam;
+import com.ibeetl.jlw.entity.UniversitiesColleges;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
+import static com.ibeetl.admin.core.annotation.Query.TYPE_DICT;
+
 /**
  *UniversitiesColleges查询
  */
@@ -34,6 +32,9 @@ public class UniversitiesCollegesQuery extends PageParam {
     private String universitiesCollegesLogo;
     @Query(name = "状态(1正常 2删除)", display = false)
     private Integer universitiesCollegesStatus;
+    // 院校默认管理员用户ID
+    @Query(name = "默认管理员", display = true, type = TYPE_DICT, dict="core_user.CODE.1=1")
+    private String universitiesCdollegesDefaultAdminUserId;
     @Query(name = "添加时间", display = false)
     private Date addTime;
     @Query(name = "组织机构ID", display = false)
@@ -157,4 +158,12 @@ public class UniversitiesCollegesQuery extends PageParam {
     public void setUseTypes(String useTypes) {
         this.useTypes = useTypes;
     }
+
+    public String getUniversitiesCdollegesDefaultAdminUserId() {
+        return universitiesCdollegesDefaultAdminUserId;
+    }
+
+    public void setUniversitiesCdollegesDefaultAdminUserId(String universitiesCdollegesDefaultAdminUserId) {
+        this.universitiesCdollegesDefaultAdminUserId = universitiesCdollegesDefaultAdminUserId;
+    }
 }

web/src/main/resources/sql/jlw/universitiesColleges.md

@@ -53,6 +53,9 @@ queryByCondition
       @if(!isEmpty(universitiesCollegesStatus)){
         and t.universities_colleges_status =#universitiesCollegesStatus#
       @}
+      @if(!isEmpty(universitiesCdollegesDefaultAdminUserId)){
+        and t.universities_cdolleges_default_admin_user_id =#universitiesCdollegesDefaultAdminUserId#
+      @}
       @if(!isEmpty(addTime)){
         and t.add_time =#addTime#
       @}
@@ -126,6 +129,9 @@ getUniversitiesCollegesValues
       @if(!isEmpty(universitiesCollegesStatus)){
         and t.universities_colleges_status =#universitiesCollegesStatus#
       @}
+      @if(!isEmpty(universitiesCdollegesDefaultAdminUserId)){
+        and t.universities_cdolleges_default_admin_user_id =#universitiesCdollegesDefaultAdminUserId#
+      @}
       @if(!isEmpty(addTime)){
         and t.add_time =#addTime#
       @}
@@ -190,6 +196,9 @@ getValuesByQuery
       @if(!isEmpty(universitiesCollegesStatus)){
         and t.universities_colleges_status =#universitiesCollegesStatus#
       @}
+      @if(!isEmpty(universitiesCdollegesDefaultAdminUserId)){
+        and t.universities_cdolleges_default_admin_user_id =#universitiesCdollegesDefaultAdminUserId#
+      @}
       @if(!isEmpty(addTime)){
         and t.add_time =#addTime#
       @}

web/src/main/resources/static/js/jlw/resourcesApplicationCourse/index.js

@@ -35,7 +35,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                         width: 60,
                     },*/
                     {
-                        field: 'courseInfoName',
+                        field: 'courseInfoIdText',
                         align:"center",
                         title: '课程名称',
                     },
@@ -92,8 +92,8 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                     },
                     {
 
-                        field: 'courseInfoId',
-                        title: '课程配置ID',
+                        field: 'operation_',
+                        title: '操作',
                         align:"center",
                         templet: function (d) {
                             var htm = '<a class="layui-table-link" lay-event="binding">绑定</a>';

web/src/main/resources/static/js/jlw/universitiesColleges/index.js

@@ -31,7 +31,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                         title: '院校名称', align: "center"
                     },
                     {
-                        field: 'undefinedYD',
+                        field: 'universitiesCdollegesDefaultAdminUserIdText',
                         title: '院校管理员账号', align: "center"
                     },
                     {

web/src/main/resources/templates/jlw/resourcesApplicationCourse/add.html

@@ -24,7 +24,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">课程名称</label>
             <div class="layui-input-inline">
-                <input type="text" name="courseInfoName" id="courseInfoName" autocomplete="off" value=""
+                <input type="text" name="courseInfoName" id="courseInfoName" autocomplete="off" value="${resourcesApplicationCourse.courseInfoIdText!}"
                        class="layui-input">
             </div>
         </div>

web/src/main/resources/templates/jlw/universitiesColleges/add.html

@@ -95,7 +95,7 @@
             <div class="layui-inline">
                 <label class="layui-form-label"><span class="req">*</span>用户名：</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="userName" value="${universitiesColleges.userName}" class="layui-input" >
+                    <input type="text" name="userName" value="${universitiesColleges.universitiesCdollegesDefaultAdminUserIdText!}" class="layui-input" >
                 </div>
             </div>
             <div class="layui-inline">