解决冲突

web/src/main/java/com/ibeetl/jlw/web/ResourcesApplicationCourseController.java

@@ -62,11 +62,19 @@ public class ResourcesApplicationCourseController{
         return view;
     }
 
+   /**
+   *@author 姚丹
+   *@data 2022/10/13
+    */
     @GetMapping(MODEL + "/add.do")
     @Function("resourcesApplicationCourse.add")
     @ResponseBody
-    public ModelAndView add() {
+    public ModelAndView add(Long resourcesApplicationCourseId) {
         ModelAndView view = new ModelAndView("/jlw/resourcesApplicationCourse/add.html");
+        if(resourcesApplicationCourseId != null){
+            ResourcesApplicationCourse resourcesApplicationCourse = resourcesApplicationCourseService.queryById(resourcesApplicationCourseId);
+            view.addObject("resourcesApplicationCourse", resourcesApplicationCourse);
+        }
         return view;
     }
 

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

@@ -8,11 +8,11 @@ import com.ibeetl.jlw.entity.ResourcesApplicationCourse;
  *ResourcesApplicationCourse查询
  */
 public class ResourcesApplicationCourseQuery extends PageParam {
-    @Query(name = "ID", display = true)
+    @Query(name = "ID", display = false)
     private Long resourcesApplicationCourseId;
-    @Query(name = "应用管理ID", display = true)
+    @Query(name = "应用管理ID", display = false)
     private Long resourcesApplicationId;
-    @Query(name = "课程配置ID", display = true)
+    @Query(name = "课程配置ID", display = false)
     private Long courseInfoId;
 
 

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

@@ -152,7 +152,6 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
         }, initTableTool: table.on('tool(resourcesApplicationCourseTable)', function (obj) {
             var data = obj.data;
             if (obj.event === 'edit') {
-                console.log(data.resourcesApplicationCourseId)
                 var url = "/jlw/resourcesApplicationCourse/add.do?resourcesApplicationCourseId="+data.resourcesApplicationCourseId;
                 Common.openDlg(url,"");
             }else if(obj.event === "del"){

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

@@ -64,10 +64,15 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     field : 'studentWeixinInfo',
                         title : '微信号',align: "center"
                 },
+                    {
+
+                        field : 'undefinedYD',
+                        title : '账号来源',align: "center"
+                    },
                 {
 
                     field : 'addTime',
-                    title : '注册时间',align: "center"
+                    title : '创建时间',align: "center"
                 },
                 {
                     field : 'userId',title : '操作',align:"center",fixed: "right", width: 200, templet: function (d) {

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

@@ -1,19 +1,35 @@
 <!--#layout("/common/layout.html",{"jsBase":"/js/jlw/resourcesApplicationCourse/"}){ -->
+<style>
+    .layui-table-body, .layui-table-box, .layui-table-cell{
+        overflow:visible;
+    }
+    .layui-table a {
+        margin-right: 10px;
+    }
+</style>
 <layui:searchForm formId="searchForm" searchList="" condition="${search}">
+    <div class="layui-inline">
+        <label class="layui-form-label">课程名称</label>
+        <div class="layui-input-inline">
+            <input type="text" name="courseInfoName" id="courseInfoName" autocomplete="off" placeholder="请输入检索条件" class="layui-input"
+                   style="width: 200px;float: left;margin-right: 10px;">
+        </div>
+    </div>
 </layui:searchForm>
 
-<div class="layui-btn-group">
+<!--<div class="layui-btn-group">
     <layui:accessButton function="resourcesApplicationCourse.add"  action="add">新增</layui:accessButton>
     <layui:accessButton function="resourcesApplicationCourse.edit"  action="edit">编辑</layui:accessButton>
     <layui:accessButton function="resourcesApplicationCourse.del"  action="del">删除</layui:accessButton>
-</div>
+</div>-->
 
 <table id="resourcesApplicationCourseTable" lay-filter="resourcesApplicationCourseTable"></table>
 <!--#} -->
 <script>
 
 layui.use(['index'], function(){
-    var index = layui.index
+    var index = layui.index;
+
     index.init();
 });