Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

# Conflicts:
#	erp-produce/src/main/resources/template/js/departmentMachining/machiningGantt.js

erp-produce/src/main/resources/template/js/erpPick/erpReturnPickToPut.js

@@ -18,7 +18,6 @@ layui.config({
     // 退料入库转仓库入库单
     AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryReturnPutTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
             let data = json.bean;
-            console.log(data)
             // 仓库入库的【编辑布局】
             dsFormUtil.initEditPageForStatic('content', 'FP2024070100009', data, {
                 savePreParams: function (params) {

erp-produce/src/main/resources/template/js/erpPick/turnRequisitionMaterialToOut.js

@@ -24,7 +24,6 @@ layui.config({
             item.unitPrice=item.normsMation.estimatePurchasePrice
             item.taxRate=0
         });
-        console.log(data.erpOrderItemList)
         // 领料出库的【编辑布局】
         dsFormUtil.initEditPageForStatic('content', 'FP2024071200005', data, {
             savePreParams: function (params) {

erp-produce/src/main/resources/template/js/erpPick/turnReturnMaterialToPut.js

@@ -24,7 +24,6 @@ layui.config({
                 item.unitPrice=item.normsMation.estimatePurchasePrice
                 item.taxRate=0
             });
-            console.log(data.erpOrderItemList)
             // 退料入库的【编辑布局】
             dsFormUtil.initEditPageForStatic('content', 'FP2024071200012', data, {
                 savePreParams: function (params) {

erp-produce/src/main/resources/template/js/materialReturnOrder/materialReturnOrderToPut.js

@@ -18,7 +18,6 @@ layui.config({
     // 物料退货转仓库入库
     AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryConfirmReturnTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
             let data = json.bean;
-            console.log(data)
             // 仓库入库的【编辑布局】
             dsFormUtil.initEditPageForStatic('content', 'FP2024070100009', data, {
                 savePreParams: function (params) {

erp-produce/src/main/resources/template/js/wholeOut/wholeOutToArrival.js

@@ -18,7 +18,6 @@ layui.config({
     // 整单委外单转到货单
     AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryWholeOrderOutTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
             let data = json.bean;
-            console.log(data)
             // 采购到货的【编辑布局】
             dsFormUtil.initEditPageForStatic('content', 'FP2024061100002', data, {
                 savePreParams: function (params) {

erp-produce/src/main/resources/template/js/workshopPersonnel/workshopPersonnelAllocation.js

@@ -113,11 +113,9 @@ layui.config({
         systemCommonUtil.checkStaffMation = []; // 选择时返回的对象
         systemCommonUtil.openSysAllUserStaffChoosePage(function (checkStaffMation) {
             var list = new Array();
-            console.log(checkStaffMation)
             $.each(checkStaffMation, function (i, item) {
                 list.push(item.id);
             });
-            console.log(list)
             var params = {
                 farmId: chooseWorkshopId,
                 staffId: JSON.stringify(list)

erp/src/main/resources/template/js/purchaseOrder/purchaseToWaybill.js

@@ -18,7 +18,6 @@ layui.config({
     // 采购订购单转到货单
     AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryPurchaseOrderTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
         let data = json.bean;
-            console.log(data)
         // 采购到货的【编辑布局】
         dsFormUtil.initEditPageForStatic('content', 'FP2024061100002', data, {
             savePreParams: function (params) {

erp/src/main/resources/template/js/retailOutlet/retailOutToOut.js

@@ -50,5 +50,4 @@ layui.config({
             }
         });
     }});
-
 });
\ No newline at end of file

erp/src/main/resources/template/js/retailReturns/retailReturnsToPut.js

@@ -18,7 +18,6 @@ layui.config({
     // 零售退货转仓库入库单
     AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryRetailReturnsTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
         let data = json.bean;
-            console.log(data)
         // 仓库入库的【编辑布局】
         dsFormUtil.initEditPageForStatic('content', 'FP2024070100009', data, {
             savePreParams: function (params) {
@@ -51,5 +50,4 @@ layui.config({
             }
         });
     }});
-
 });
\ No newline at end of file

erp/src/main/resources/template/js/salesOrder/salesOrderToReturns.js

@@ -25,7 +25,6 @@ layui.config({
                 params.holderKey=data.holderKey
             },
             saveData: function (params) {
-                    console.log(params)
                 // 保存数据
                 AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertSealsOrderToSealsReturns", params: params, type: 'json', method: "POST", callback: function(json) {
                     parent.layer.close(index);

erp/src/main/resources/template/js/supplierContract/contractToOrder.js

@@ -19,7 +19,6 @@ layui.config({
     AjaxPostUtil.request({url: sysMainMation.erpBasePath + "querySupplierContractTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
         let data = json.bean;
         data.erpOrderItemList = data.supplierContractChildList
-            console.log(data)
         // 采购订单的【编辑布局】
         dsFormUtil.initEditPageForStatic('content', 'FP2023042000002', data, {
             savePreParams: function (params) {

erp/src/main/resources/template/js/warehousePersonnel/warehousePersonnel.js

@@ -15,7 +15,6 @@ layui.config({
     loadWareshop();
 
     form.render();
-    var chooseWorkshopId = "";
     function loadWareshop() {
         table.render({
             id: 'warehouseTable',
@@ -113,11 +112,9 @@ layui.config({
         systemCommonUtil.checkStaffMation = []; // 选择时返回的对象
         systemCommonUtil.openSysAllUserStaffChoosePage(function (checkStaffMation) {
             var list = new Array();
-            console.log(checkStaffMation)
             $.each(checkStaffMation, function (i, item) {
                 list.push(item.id);
             });
-            console.log(list)
             var params = {
                 depotId: depotId,
                 staffId: JSON.stringify(list)

school/src/main/resources/template/js/announcement/announcementList.js

+
+var objectKey = "";
+var objectId = "";
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
+    winui.renderColor();
+    var $ = layui.$,
+        form = layui.form,
+        table = layui.table;
+    objectKey = GetUrlParam("objectKey");
+    objectId = GetUrlParam("objectId");
+    subjectClassesId = GetUrlParam("subjectClassesId");
+    if (isNull(objectKey) || isNull(objectId)) {
+        winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
+        return false;
+    }
+
+    table.render({
+        id: 'messageTable',
+        elem: '#messageTable',
+        method: 'get',
+        url: sysMainMation.schoolBasePath + 'queryAnnouncementAllList',
+        where: getTableParams(),
+        even: false,
+        page: false,
+        cols: [[
+            { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+            { field: 'title', title: '标题', align: 'left', width: 300, templet: function (d) {
+                return '<a lay-event="details" class="notice-title-click">' + d.title + '</a>';
+            }},
+            { field: 'content', title: '内容', align: 'left', width: 300},
+            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 , templet: function(d) {
+                return getNotUndefinedVal(d.createMation?.name);
+            }},
+            { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
+            { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 , templet: function(d) {
+                return getNotUndefinedVal(d.lastUpdateMation?.name);
+            }},
+            { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
+            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#tableBar' }
+        ]],
+        done: function(json) {
+            matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入名称", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
+        }
+    });
+
+    table.on('tool(messageTable)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+        if (layEvent === 'edit') { //编辑
+            edit(data);
+        } else if (layEvent === 'details') { //详情
+            details(data);
+        } else if (layEvent === 'del') { //删除
+            del(data);
+        }
+    });
+
+    // 新增
+    $("body").on("click", "#addBean", function() {
+        parent._openNewWindows({
+            url: '../../tpl/announcement/write.html?objectId=' + objectId + '&objectKey=' + objectKey + '&subjectClassesId=' + subjectClassesId,
+            title: systemLanguage["com.skyeye.addPageTitle"][languageType],
+            pageId: "announcementAdd",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    });
+
+    // 编辑
+    function edit(data) {
+        parent._openNewWindows({
+            url: '../../tpl/announcement/write.html?objectId=' + objectId + '&objectKey=' + objectKey + '&subjectClassesId=' + subjectClassesId+ '&id=' + data.id,
+            title: systemLanguage["com.skyeye.editPageTitle"][languageType],
+            pageId: "announcementEdit",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    }
+
+    // 详情
+    function details(data) {
+        parent._openNewWindows({
+            url: systemCommonUtil.getUrl('FP2024072000006&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+            pageId: "announcementDetails",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+            }});
+    }
+
+    // 删除
+    function del(data, obj) {
+        layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
+            layer.close(index);
+            AjaxPostUtil.request({url: sysMainMation.schoolBasePath + "deleteAnnouncementById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
+                    winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
+                    loadTable();
+                }});
+        });
+    }
+
+    form.render();
+    $("body").on("click", "#reloadTable", function() {
+        loadTable();
+    });
+    function loadTable() {
+        table.reloadData("messageTable", {where: getTableParams()});
+    }
+
+    function getTableParams() {
+        return $.extend(true, {objectKey: objectKey, objectId: subjectClassesId,subjectClassesId: subjectClassesId}, initTableSearchUtil.getSearchValue("messageTable"));
+    }
+
+    exports('announcementList', {});
+});
\ No newline at end of file

school/src/main/resources/template/js/announcement/write.js

+
+// 以下两个参数开启团队权限时有值
+var objectId = '', objectKey = '';
+var objectParams = {};
+// 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断
+var serviceClassName;
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery'], function (exports) {
+    winui.renderColor();
+    var index = parent.layer.getFrameIndex(window.name);
+    var $ = layui.$;
+    var id = GetUrlParam("id");
+    var objectId = GetUrlParam("objectId");
+    var objectKey = GetUrlParam("objectKey");
+    objectParams.subjectClassesId = GetUrlParam("subjectClassesId");
+
+    if (isNull(id)) {
+        dsFormUtil.initAddPageForStatic('content', 'FP2024072000004', {
+            savePreParams: function (params) {
+                params.objectId = objectId;
+                params.objectKey = objectKey;
+                params.subjectClassesId = objectParams.subjectClassesId;
+            }
+        });
+    }else{
+        AjaxPostUtil.request({
+            url: sysMainMation.schoolBasePath + "queryAnnouncementById",
+            params: {id: id},
+            type: 'json',
+            method: 'GET',
+            callback: function (json) {
+                let data = json.bean;
+                dsFormUtil.initEditPageForStatic('content', 'FP2024072000005', data, {
+                    savePreParams: function (params) {
+                        params.objectId = objectId;
+                        params.objectKey = objectKey;
+                        params.subjectClassesId = objectParams.subjectClassesId;
+                    }
+                });
+            }
+        });
+
+    }
+
+});
\ No newline at end of file

school/src/main/resources/template/js/courseware/coursewareList.js

@@ -30,6 +30,9 @@ layui.config({
         page: false,
         cols: [[
             { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+            { field: 'section', title: '章节', align: 'center', width: 100, templet: function (d) {
+                return '第 ' + d.chapterMation?.section + ' 章';
+            }},
             { field: 'name', title: '名称', align: 'left', width: 300, templet: function (d) {
                 return '<a lay-event="details" class="notice-title-click">' + d.name + '</a>';
             }},

school/src/main/resources/template/js/knowledge/knowledgeList.js

@@ -32,6 +32,9 @@ layui.config({
 	    limit: getLimit(),
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+			{ field: 'section', title: '章节', align: 'center', width: 100, templet: function (d) {
+				return '第 ' + d.chapterMation?.section + ' 章';
+			}},
 			{ field: 'name', title: '名称', align: 'left', width: 300, templet: function (d) {
 				return '<a lay-event="details" class="notice-title-click">' + d.name + '</a>';
 			}},

school/src/main/resources/template/js/material/materialList.js

+
+var objectKey = "";
+var objectId = "";
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
+    winui.renderColor();
+    var $ = layui.$,
+        form = layui.form,
+        table = layui.table;
+    objectKey = GetUrlParam("objectKey");
+    objectId = GetUrlParam("objectId");
+    subjectClassesId = GetUrlParam("subjectClassesId");
+    if (isNull(objectKey) || isNull(objectId)) {
+        winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
+        return false;
+    }
+
+    table.render({
+        id: 'messageTable',
+        elem: '#messageTable',
+        method: 'post',
+        url: sysMainMation.schoolBasePath + 'queryDatumList',
+        where: getTableParams(),
+        even: false,
+        page: false,
+        cols: [[
+            { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+            { field: 'section', title: '章节', align: 'center', width: 100, templet: function (d) {
+                return '第 ' + d.chapterMation?.section + ' 章';
+            }},
+            { field: 'name', title: '名称', align: 'left', width: 300, templet: function (d) {
+                return '<a lay-event="details" class="notice-title-click">' + d.name + '</a>';
+            }},
+            { field: 'name', title: '内容', align: 'left', width: 300, templet: function (d) {
+                return  d.uploadDatum ;
+            }},
+            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 , templet: function(d) {
+                return getNotUndefinedVal(d.createMation?.name);
+            }},
+            { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
+            { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 , templet: function(d) {
+                return getNotUndefinedVal(d.lastUpdateName);
+            }},
+            { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 , templet: function(d) {
+                return getNotUndefinedVal(d.lastUpdateTime);
+            }},
+            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#tableBar' }
+        ]],
+        done: function(json) {
+            matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入名称", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
+        }
+    });
+
+    table.on('tool(messageTable)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+        if (layEvent === 'edit') { //编辑
+            edit(data);
+        } else if (layEvent === 'details') { //详情
+            details(data);
+        } else if (layEvent === 'del') { //删除
+            del(data);
+        }
+    });
+
+    // 新增
+    $("body").on("click", "#addBean", function() {
+        parent._openNewWindows({
+            url: '../../tpl/material/write.html?objectId=' + objectId + '&objectKey=' + objectKey + '&subjectClassesId=' + subjectClassesId,
+            title: systemLanguage["com.skyeye.addPageTitle"][languageType],
+            pageId: "materialAdd",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    });
+
+    // 编辑
+    function edit(data) {
+        parent._openNewWindows({
+            url: '../../tpl/material/write.html?objectId=' + objectId + '&objectKey=' + objectKey + '&subjectClassesId=' + subjectClassesId + '&id=' + data.id,
+            title: systemLanguage["com.skyeye.editPageTitle"][languageType],
+            pageId: "materialEdit",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    }
+
+    // 详情
+    function details(data) {
+        parent._openNewWindows({
+            url: systemCommonUtil.getUrl('FP2024072000003&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+            pageId: "materialDetails",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+            }});
+    }
+
+    // 删除
+    function del(data, obj) {
+        layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
+            layer.close(index);
+            AjaxPostUtil.request({url: sysMainMation.schoolBasePath + "deleteDatumById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
+                    winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
+                    loadTable();
+                }});
+        });
+    }
+
+    form.render();
+    $("body").on("click", "#reloadTable", function() {
+        loadTable();
+    });
+    function loadTable() {
+        table.reloadData("messageTable", {where: getTableParams()});
+    }
+
+    function getTableParams() {
+        return $.extend(true, {objectKey: objectKey, objectId: subjectClassesId,holderId: subjectClassesId,}, initTableSearchUtil.getSearchValue("messageTable"));
+    }
+
+    exports('materialList', {});
+});
\ No newline at end of file

school/src/main/resources/template/js/material/write.js

+
+// 以下两个参数开启团队权限时有值
+var objectId = '', objectKey = '';
+var objectParams = {};
+// 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断
+var serviceClassName;
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery'], function (exports) {
+    winui.renderColor();
+    var index = parent.layer.getFrameIndex(window.name);
+    var $ = layui.$;
+    var id = GetUrlParam("id");
+    var objectId = GetUrlParam("objectId");
+    var objectKey = GetUrlParam("objectKey");
+    objectParams.subjectClassesId = GetUrlParam("subjectClassesId");
+
+    if (isNull(id)) {
+        dsFormUtil.initAddPageForStatic('content', 'FP2024072000001', {
+            savePreParams: function (params) {
+                params.objectId = objectId;
+                params.objectKey = objectKey;
+                params.subjectClassesId = objectParams.subjectClassesId;
+            }
+        });
+    }else{
+        AjaxPostUtil.request({
+            url: sysMainMation.schoolBasePath + "queryDatumById",
+            params: {id: id},
+            type: 'json',
+            method: 'GET',
+            callback: function (json) {
+                let data = json.bean;
+                dsFormUtil.initEditPageForStatic('content', 'FP2024072000002', data, {
+                    savePreParams: function (params) {
+                        params.objectId = objectId;
+                        params.objectKey = objectKey;
+                        params.subjectClassesId = objectParams.subjectClassesId;
+                    }
+                });
+            }
+        });
+
+    }
+
+});
\ No newline at end of file

school/src/main/resources/template/js/subjectClass/manage.js

@@ -31,6 +31,15 @@ layui.config({
 		}, {
 			title: '作业',
 			pageUrl: '../../tpl/homework/homeworkList.html?subjectClassesId=' + subjectClassesId
+		}, {
+			title: '资料',
+			pageUrl: '../../tpl/material/materialList.html?subjectClassesId=' + subjectClassesId
+		}, {
+			title: '公告',
+			pageUrl: '../../tpl/announcement/announcementList.html?subjectClassesId=' + subjectClassesId
+		}, {
+			title: '话题',
+			pageUrl: '../../tpl/topic/topicList.html?subjectClassesId=' + subjectClassesId
 		}],
 		element: layui.element,
 		object: {

school/src/main/resources/template/js/topic/details.js

+
+var objectKey = "";
+var objectId = "";
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
+    winui.renderColor();
+    var $ = layui.$,
+        form = layui.form,
+        table = layui.table;
+    objectKey = GetUrlParam("objectKey");
+    objectId = GetUrlParam("objectId");
+    id = GetUrlParam("id");
+    if (isNull(objectKey) || isNull(objectId)) {
+        winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
+        return false;
+    }
+
+    table.render({
+        id: 'messageTable',
+        elem: '#messageTable',
+        method: 'post',
+        url: sysMainMation.schoolBasePath + 'queryTopicCommentList',
+        where: getTableParams(),
+        even: false,
+        page: false,
+        cols: [[
+            { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+            // { field: 'title', title: '标题', align: 'left', width: 300},
+            { field: 'content', title: '内容', align: 'left', width: 300},
+            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 , templet: function(d) {
+                    return getNotUndefinedVal(d.createMation?.name);
+                }},
+            { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
+            { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 , templet: function(d) {
+                    return getNotUndefinedVal(d.lastUpdateName);
+                }},
+            { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
+            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#tableBar' }
+        ]],
+        done: function(json) {
+            matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入名称", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
+        }
+    });
+
+    table.on('tool(messageTable)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+       if (layEvent === 'del') { //删除
+            del(data);
+        }
+    });
+
+    // 删除
+    function del(data, obj) {
+        layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
+            layer.close(index);
+            AjaxPostUtil.request({url: sysMainMation.schoolBasePath + "deleteTopicById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
+                    winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
+                    loadTable();
+                }});
+        });
+    }
+
+    form.render();
+    $("body").on("click", "#reloadTable", function() {
+        loadTable();
+    });
+    function loadTable() {
+        table.reloadData("messageTable", {where: getTableParams()});
+    }
+
+    function getTableParams() {
+        return $.extend(true, {objectKey: objectKey, objectId: objectId,holderId: id}, initTableSearchUtil.getSearchValue("messageTable"));
+    }
+
+    exports('details', {});
+});
\ No newline at end of file

school/src/main/resources/template/js/topic/topicList.js

+
+var objectKey = "";
+var objectId = "";
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
+    winui.renderColor();
+    var $ = layui.$,
+        form = layui.form,
+        table = layui.table;
+    objectKey = GetUrlParam("objectKey");
+    objectId = GetUrlParam("objectId");
+    subjectClassesId = GetUrlParam("subjectClassesId");
+    if (isNull(objectKey) || isNull(objectId)) {
+        winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
+        return false;
+    }
+
+    table.render({
+        id: 'messageTable',
+        elem: '#messageTable',
+        method: 'post',
+        url: sysMainMation.schoolBasePath + 'queryTopicList',
+        where: getTableParams(),
+        even: false,
+        page: false,
+        cols: [[
+            { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+            { field: 'title', title: '标题', align: 'left', width: 300},
+            { field: 'content', title: '内容', align: 'left', width: 300},
+            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 , templet: function(d) {
+                return getNotUndefinedVal(d.createMation?.name);
+            }},
+            { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
+            { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 , templet: function(d) {
+                return getNotUndefinedVal(d.lastUpdateName);
+            }},
+            { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
+            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#tableBar' }
+        ]],
+        done: function(json) {
+            matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入名称", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
+        }
+    });
+
+    table.on('tool(messageTable)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+        if (layEvent === 'details') { //详情
+            details(data);
+        } else if (layEvent === 'del') { //删除
+            del(data);
+        }
+    });
+
+    // 新增
+    $("body").on("click", "#addBean", function() {
+        parent._openNewWindows({
+            url: '../../tpl/topic/write.html?objectId=' + objectId + '&objectKey=' + objectKey + '&subjectClassesId=' + subjectClassesId,
+            title: systemLanguage["com.skyeye.addPageTitle"][languageType],
+            pageId: "topicAdd",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    });
+
+    // 详情
+    function details(data) {
+        parent._openNewWindows({
+            url: '../../tpl/topic/details.html?objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id,
+            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+            pageId: "topicDetails",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    }
+
+    // 删除
+    function del(data, obj) {
+        layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
+            layer.close(index);
+            AjaxPostUtil.request({url: sysMainMation.schoolBasePath + "deleteTopicById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
+                    winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
+                    loadTable();
+                }});
+        });
+    }
+
+    form.render();
+    $("body").on("click", "#reloadTable", function() {
+        loadTable();
+    });
+    function loadTable() {
+        table.reloadData("messageTable", {where: getTableParams()});
+    }
+
+    function getTableParams() {
+        return $.extend(true, {objectKey: objectKey, objectId: subjectClassesId,holderId:subjectClassesId}, initTableSearchUtil.getSearchValue("messageTable"));
+    }
+
+    exports('topicList', {});
+});
\ No newline at end of file

school/src/main/resources/template/js/topic/write.js

+
+// 以下两个参数开启团队权限时有值
+var objectId = '', objectKey = '';
+var objectParams = {};
+// 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断
+var serviceClassName;
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery'], function (exports) {
+    winui.renderColor();
+    var index = parent.layer.getFrameIndex(window.name);
+    var $ = layui.$;
+    var id = GetUrlParam("id");
+    var objectId = GetUrlParam("objectId");
+    var objectKey = GetUrlParam("objectKey");
+    objectParams.subjectClassesId = GetUrlParam("subjectClassesId");
+        dsFormUtil.initAddPageForStatic('content', 'FP2024072000007', {
+            savePreParams: function (params) {
+                params.objectId = objectId;
+                params.objectKey = objectKey;
+                params.subjectClassesId = objectParams.subjectClassesId;
+            }
+        });
+
+
+});
\ No newline at end of file

school/src/main/resources/template/tpl/announcement/announcementList.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+<div class="winui-toolbar">
+    <div class="winui-tool">
+        <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+        <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="add"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+    </div>
+</div>
+<div style="margin:auto 10px;">
+    <table id="messageTable" lay-filter="messageTable"></table>
+    <script type="text/html" id="tableBar">
+        <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
+        <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del"><language showName="com.skyeye.deleteBtn"></language></a>
+    </script>
+</div>
+<script src="../../assets/lib/layui/layui.js"></script>
+<script src="../../assets/lib/layui/custom.js"></script>
+<script type="text/javascript">
+    layui.config({base: '../../js/announcement/'}).use('announcementList');
+</script>
+</body>
+</html>
\ No newline at end of file

school/src/main/resources/template/tpl/announcement/write.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+<div style="margin:0 auto;padding:20px;">
+    <form class="layui-form" action="" id="showForm" autocomplete="off">
+        <div id="content"></div>
+        <div class="layui-form-item layui-col-xs12">
+            <div class="layui-input-block">
+                <button class="winui-btn" type="button" id="cancle"><language showName="com.skyeye.cancel"></language></button>
+                <button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">保存</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<script src="../../assets/lib/layui/layui.js"></script>
+<script src="../../assets/lib/layui/custom.js"></script>
+<script type="text/javascript">
+    layui.config({base: '../../js/announcement/'}).use('write');
+</script>
+</body>
+</html>
\ No newline at end of file

school/src/main/resources/template/tpl/material/materialList.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+<div class="winui-toolbar">
+    <div class="winui-tool">
+        <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+        <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="add"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+    </div>
+</div>
+<div style="margin:auto 10px;">
+    <table id="messageTable" lay-filter="messageTable"></table>
+    <script type="text/html" id="tableBar">
+        <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
+        <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del"><language showName="com.skyeye.deleteBtn"></language></a>
+    </script>
+</div>
+<script src="../../assets/lib/layui/layui.js"></script>
+<script src="../../assets/lib/layui/custom.js"></script>
+<script type="text/javascript">
+    layui.config({base: '../../js/material/'}).use('materialList');
+</script>
+</body>
+</html>
\ No newline at end of file

school/src/main/resources/template/tpl/material/write.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+<div style="margin:0 auto;padding:20px;">
+    <form class="layui-form" action="" id="showForm" autocomplete="off">
+        <div id="content"></div>
+        <div class="layui-form-item layui-col-xs12">
+            <div class="layui-input-block">
+                <button class="winui-btn" type="button" id="cancle"><language showName="com.skyeye.cancel"></language></button>
+                <button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">保存</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<script src="../../assets/lib/layui/layui.js"></script>
+<script src="../../assets/lib/layui/custom.js"></script>
+<script type="text/javascript">
+    layui.config({base: '../../js/material/'}).use('write');
+</script>
+</body>
+</html>
\ No newline at end of file

school/src/main/resources/template/tpl/topic/details.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+<div class="winui-toolbar">
+    <div class="winui-tool">
+        <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+    </div>
+</div>
+<div style="margin:auto 10px;">
+    <table id="messageTable" lay-filter="messageTable"></table>
+    <script type="text/html" id="tableBar">
+        <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del"><language showName="com.skyeye.deleteBtn"></language></a>
+    </script>
+</div>
+<script src="../../assets/lib/layui/layui.js"></script>
+<script src="../../assets/lib/layui/custom.js"></script>
+<script type="text/javascript">
+    layui.config({base: '../../js/topic/'}).use('details');
+</script>
+</body>
+</html>
\ No newline at end of file

school/src/main/resources/template/tpl/topic/topicList.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+<div class="winui-toolbar">
+    <div class="winui-tool">
+        <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+        <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="add"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+    </div>
+</div>
+<div style="margin:auto 10px;">
+    <table id="messageTable" lay-filter="messageTable"></table>
+    <script type="text/html" id="tableBar">
+        <a class="layui-btn layui-btn-xs layui-btn-primary" lay-event="details">评论详情</language></a>
+        <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del"><language showName="com.skyeye.deleteBtn"></language></a>
+    </script>
+</div>
+<script src="../../assets/lib/layui/layui.js"></script>
+<script src="../../assets/lib/layui/custom.js"></script>
+<script type="text/javascript">
+    layui.config({base: '../../js/topic/'}).use('topicList');
+</script>
+</body>
+</html>
\ No newline at end of file

school/src/main/resources/template/tpl/topic/write.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+<div style="margin:0 auto;padding:20px;">
+    <form class="layui-form" action="" id="showForm" autocomplete="off">
+        <div id="content"></div>
+        <div class="layui-form-item layui-col-xs12">
+            <div class="layui-input-block">
+                <button class="winui-btn" type="button" id="cancle"><language showName="com.skyeye.cancel"></language></button>
+                <button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">保存</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<script src="../../assets/lib/layui/layui.js"></script>
+<script src="../../assets/lib/layui/custom.js"></script>
+<script type="text/javascript">
+    layui.config({base: '../../js/topic/'}).use('write');
+</script>
+</body>
+</html>
\ No newline at end of file