From f64c28f3187fd95b976debb763297271ee9da737 Mon Sep 17 00:00:00 2001 From: liuwu <975499773@qq.com> Date: Fri, 8 Sep 2023 18:01:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=92=8C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/BaseDeptController.java | 8 + .../controller/TAmentBranchController.java | 11 +- .../TAmentPartyAffairsController.java | 22 ++- .../controller/TAmentPersonnelController.java | 2 + .../templates/base/advanceddept/add.html | 2 +- .../templates/base/advanceddept/edit.html | 2 +- .../resources/templates/base/affairs/add.html | 4 +- .../resources/templates/base/affairs/day.html | 6 + .../templates/base/affairs/edit.html | 144 ++++++++++-------- .../base/affairs/finishedstatic.html | 28 ++-- .../templates/base/affairs/reviewed.html | 50 +++++- .../templates/base/affairs/warn.html | 47 ++++-- .../resources/templates/base/branch/add.html | 13 +- .../resources/templates/base/branch/edit.html | 14 +- .../resources/templates/base/dept/add.html | 5 +- .../resources/templates/base/dept/edit.html | 5 +- .../templates/base/personnel/add.html | 19 ++- .../templates/base/personnel/edit.html | 39 +++-- .../src/main/resources/templates/login.html | 4 +- .../src/main/resources/templates/main.html | 5 +- .../mapper/base/TAmentPartyAffairsMapper.xml | 3 +- 21 files changed, 285 insertions(+), 148 deletions(-) diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/BaseDeptController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/BaseDeptController.java index 112f19a..7295479 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/BaseDeptController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/BaseDeptController.java @@ -9,6 +9,9 @@ import com.cyx.common.core.domain.entity.SysDept; import com.cyx.common.enums.BusinessType; import com.cyx.common.utils.StringUtils; import com.cyx.system.service.ISysDeptService; +import com.cyx.web.base.domain.TAmentBranch; +import com.cyx.web.base.domain.TAmentPersonnel; +import com.cyx.web.base.service.ITAmentPersonnelService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -48,6 +51,9 @@ public class BaseDeptController extends BaseController return deptList; } + @Autowired + private ITAmentPersonnelService personnelService; + /** * 新增部门 */ @@ -59,6 +65,7 @@ public class BaseDeptController extends BaseController parentId = getSysUser().getDeptId(); } mmap.put("dept", deptService.selectDeptById(parentId)); + mmap.put("perList",personnelService.selectTAmentPersonnelList(new TAmentPersonnel())); return prefix + "/add"; } @@ -93,6 +100,7 @@ public class BaseDeptController extends BaseController dept.setParentName("无"); } mmap.put("dept", dept); + mmap.put("perList",personnelService.selectTAmentPersonnelList(new TAmentPersonnel())); return prefix + "/edit"; } diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentBranchController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentBranchController.java index 8331296..5ac7962 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentBranchController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentBranchController.java @@ -8,6 +8,8 @@ import com.cyx.common.core.domain.AjaxResult; import com.cyx.common.core.page.TableDataInfo; import com.cyx.common.enums.BusinessType; import com.cyx.common.utils.poi.ExcelUtil; +import com.cyx.web.base.domain.TAmentPersonnel; +import com.cyx.web.base.service.ITAmentPersonnelService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -34,6 +36,8 @@ public class TAmentBranchController extends BaseController @Autowired private ITAmentBranchService tAmentBranchService; + @Autowired + private ITAmentPersonnelService personnelService; @RequiresPermissions("base:branch:view") @GetMapping() @@ -73,9 +77,12 @@ public class TAmentBranchController extends BaseController * 新增支部 */ @GetMapping("/add") - public String add() + public String add( ModelMap mmap) { + mmap.put("branchList",tAmentBranchService.selectTAmentBranchList(new TAmentBranch())); + mmap.put("perList",personnelService.selectTAmentPersonnelList(new TAmentPersonnel())); return prefix + "/add"; + } /** @@ -99,6 +106,8 @@ public class TAmentBranchController extends BaseController { TAmentBranch tAmentBranch = tAmentBranchService.selectTAmentBranchByBranchId(branchId); mmap.put("tAmentBranch", tAmentBranch); + mmap.put("branchList",tAmentBranchService.selectTAmentBranchList(new TAmentBranch())); + mmap.put("perList",personnelService.selectTAmentPersonnelList(new TAmentPersonnel())); return prefix + "/edit"; } diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java index 2047823..3c9cb69 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java @@ -9,15 +9,13 @@ import com.alibaba.fastjson.JSONObject; import com.cyx.common.annotation.Log; import com.cyx.common.core.controller.BaseController; import com.cyx.common.core.domain.AjaxResult; +import com.cyx.common.core.domain.entity.SysDept; import com.cyx.common.core.page.TableDataInfo; import com.cyx.common.enums.BusinessType; import com.cyx.common.utils.poi.ExcelUtil; -import com.cyx.web.base.domain.TAmentCommitHis; -import com.cyx.web.base.domain.TAmentPersonnel; -import com.cyx.web.base.domain.TAmentReviewedHis; -import com.cyx.web.base.service.ITAmentCommitHisService; -import com.cyx.web.base.service.ITAmentPersonnelService; -import com.cyx.web.base.service.ITAmentReviewedHisService; +import com.cyx.system.service.ISysDeptService; +import com.cyx.web.base.domain.*; +import com.cyx.web.base.service.*; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -27,8 +25,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.cyx.web.base.domain.TAmentPartyAffairs; -import com.cyx.web.base.service.ITAmentPartyAffairsService; /** * 党务Controller @@ -40,6 +36,13 @@ import com.cyx.web.base.service.ITAmentPartyAffairsService; @RequestMapping("/base/affairs") public class TAmentPartyAffairsController extends BaseController { + + @Autowired + private ITAmentPersonnelService personnelService; + @Autowired + private ISysDeptService deptService; + @Autowired + private ITAmentBranchService branchService; /** * 待办预警 */ @@ -324,6 +327,9 @@ public class TAmentPartyAffairsController extends BaseController { TAmentPartyAffairs tAmentPartyAffairs = tAmentPartyAffairsService.selectTAmentPartyAffairsById(id); mmap.put("tAmentPartyAffairs", tAmentPartyAffairs); + mmap.put("perList",personnelService.selectTAmentPersonnelList(new TAmentPersonnel())); + mmap.put("deptList",deptService.selectDeptList(new SysDept())); + mmap.put("branchList",branchService.selectTAmentBranchList(new TAmentBranch())); return prefix + "/edit"; } diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPersonnelController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPersonnelController.java index 667a38b..2643f6a 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPersonnelController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPersonnelController.java @@ -149,6 +149,8 @@ public class TAmentPersonnelController extends BaseController { TAmentPersonnel tAmentPersonnel = tAmentPersonnelService.selectTAmentPersonnelById(id); mmap.put("tAmentPersonnel", tAmentPersonnel); + mmap.put("deptList",deptService.selectDeptList(new SysDept())); + mmap.put("branchList",branchService.selectTAmentBranchList(new TAmentBranch())); return prefix + "/edit"; } diff --git a/cyx-admin/src/main/resources/templates/base/advanceddept/add.html b/cyx-admin/src/main/resources/templates/base/advanceddept/add.html index 8274537..2ea2c8e 100644 --- a/cyx-admin/src/main/resources/templates/base/advanceddept/add.html +++ b/cyx-admin/src/main/resources/templates/base/advanceddept/add.html @@ -69,7 +69,7 @@
- +
diff --git a/cyx-admin/src/main/resources/templates/base/advanceddept/edit.html b/cyx-admin/src/main/resources/templates/base/advanceddept/edit.html index 4661007..3fda430 100644 --- a/cyx-admin/src/main/resources/templates/base/advanceddept/edit.html +++ b/cyx-admin/src/main/resources/templates/base/advanceddept/edit.html @@ -62,7 +62,7 @@
- +
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/add.html b/cyx-admin/src/main/resources/templates/base/affairs/add.html index a5fc094..9ef404b 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/add.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/add.html @@ -53,7 +53,7 @@
- +
- +
- - - - - - + + + + + + + +
+ +
+ +
+
- + +
+
+
+ +
+
- +
- +
- +
- +
- + + + +
@@ -57,6 +80,7 @@
@@ -71,27 +95,30 @@
- +
- +
- +
@@ -111,52 +138,47 @@ focusCleanup: true }); - refresh() - function refresh(){ - $.ajax({ - type: "post", - url: ctx + "base/personnel/personnelList", - data: { - }, - success: function(data) { - var opt = ''; - data.data.forEach(d=>{ - opt += ''; - }) - $("#head")[0].innerHTML=opt; - $("#reviewed")[0].innerHTML=opt; - $("#perId")[0].innerHTML=opt; - } - }); - - $.ajax({ - type: "post", - url: ctx + "base/personnel/deptList", - data: { - }, - success: function(data) { - var opt = ''; - data.data.forEach(d=>{ - opt += ''; - }) - $("#deptId")[0].innerHTML=opt; - } - }); - - $.ajax({ - type: "post", - url: ctx + "base/personnel/branchList", - data: { - }, - success: function(data) { - var opt = ''; - data.data.forEach(d=>{ - opt += ''; - }) - $("#branchId")[0].innerHTML=opt; - } - }); - } + $("#type-selector").on("change", function() { + var type = $(this).val(); + var target = $("#target"); + var demand = $("#demand"); + var detailed = $("#detailed"); + var score = $("#score"); + switch (type) { + case "党务及意识形态": + $("#dw").show() + $(".dy").hide() + target[0].innerHTML = '目标项：' + demand[0].innerHTML = '目标要求：' + detailed[0].innerHTML = '工作任务：' + score[0].innerHTML = '达标分：' + break; + case "党风廉政建设": + $("#dw").show() + $(".dy").hide() + target[0].innerHTML = '责任类别：' + demand[0].innerHTML = '目标要求：' + detailed[0].innerHTML = '工作任务：' + score[0].innerHTML = '达标分：' + break; + case "日常考核指标": + $("#dw").hide() + $(".dy").show() + target[0].innerHTML = '考核内容：' + demand[0].innerHTML = '考核目标：' + detailed[0].innerHTML = '工作任务：' + score[0].innerHTML = '分值：' + break; + case "季度考核指标": + $("#dw").hide() + $(".dy").show() + target[0].innerHTML = '考核内容：' + demand[0].innerHTML = '考核目标：' + detailed[0].innerHTML = '评分办法：' + score[0].innerHTML = '分值：' + break; + } + }); function submitHandler() { if ($.validate.form()) { diff --git a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html index d09e247..e3ae9cc 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html @@ -32,20 +32,20 @@
-
- - 添加 - - - 修改 - - - 删除 - - - 导出 - -
+ + + + + + + + + + + + + +
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html b/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html index 6ecba93..2abaecb 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html @@ -12,7 +12,8 @@
- + +
@@ -28,25 +29,48 @@
-
- -
- - -
-
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
@@ -110,12 +134,22 @@ let deptName = parent.parent.a_deptName; let shotName = parent.parent.a_shotName; let reviewer = parent.parent.a_reviewer; + let type = parent.parent.a_type; + let demand = parent.parent.a_demand; + let detailed = parent.parent.a_detailed; + let updatetime = parent.parent.a_updatetime; + let score = parent.parent.a_score; $("#id").val(_id) $("#reviewer").val(reviewer) + $("#type").val(type) + $("#demand").val(demand) + $("#detailed").val(detailed) $("#shotName").val(shotName) $("#header").val(header) $("#deptName").val(deptName) $("#commitTime").val(new Date()) + $("#updatetime").val(updatetime) + $("#score").val(score) }); diff --git a/cyx-admin/src/main/resources/templates/base/affairs/warn.html b/cyx-admin/src/main/resources/templates/base/affairs/warn.html index 8eecb16..575c024 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/warn.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/warn.html @@ -39,20 +39,20 @@
-
- - 添加 - - - 修改 - - - 删除 - - - 导出 - -
+ + + + + + + + + + + + + +
@@ -124,7 +124,12 @@ }, { field: 'commitTime', - title: '提交时间' + title: '提交时间', + formatter: function(value, row, index) { + if (row.status === '2'){ + return row.updateTime + } + } }, { field: 'finishDate', @@ -163,7 +168,7 @@ if (row.status === '1'){ actions.push('上传附件 '); }else if (row.status === '2'){ - actions.push('审批 '); + actions.push('审批 '); }else if (row.status === '3'){ actions.push('已驳回 '); actions.push('重新上传附件 '); @@ -180,10 +185,15 @@ $("#bootstrap-table").on('click','.shenhe',function () { let _id = $(this)[0].dataset.id; let header = $(this)[0].dataset.header; + let score = $(this)[0].dataset.score; let nowScore = $(this)[0].dataset.nowscore; let deptName = $(this)[0].dataset.deptname; let shotName = $(this)[0].dataset.shotname; let reviewer = $(this)[0].dataset.reviewer; + let updatetime = $(this)[0].dataset.updatetime; + let type = $(this)[0].dataset.type; + let demand = $(this)[0].dataset.demand; + let detailed = $(this)[0].dataset.detailed; layer.open({ title:'审批', area:['40%','50%'], @@ -194,11 +204,16 @@ parent.a_upload_id = _id; parent.a_header = header; parent.a_nowScore = nowScore; + parent.a_score = score; parent.a_deptName = deptName; parent.a_shotName = shotName; parent.a_reviewer = reviewer; + parent.a_updatetime = updatetime; parent.a_upload_index = index; parent.a_upload_type = "1"; + parent.a_type = type; + parent.a_demand = demand; + parent.a_detailed = detailed; }, end(){ $.table.search() diff --git a/cyx-admin/src/main/resources/templates/base/branch/add.html b/cyx-admin/src/main/resources/templates/base/branch/add.html index 757f738..c8b149e 100644 --- a/cyx-admin/src/main/resources/templates/base/branch/add.html +++ b/cyx-admin/src/main/resources/templates/base/branch/add.html @@ -7,9 +7,12 @@
- +
- +
@@ -27,7 +30,11 @@
- + +
diff --git a/cyx-admin/src/main/resources/templates/base/branch/edit.html b/cyx-admin/src/main/resources/templates/base/branch/edit.html index 6a98db8..581b6bd 100644 --- a/cyx-admin/src/main/resources/templates/base/branch/edit.html +++ b/cyx-admin/src/main/resources/templates/base/branch/edit.html @@ -8,9 +8,13 @@
- +
- + +
@@ -28,7 +32,11 @@
- + +
diff --git a/cyx-admin/src/main/resources/templates/base/dept/add.html b/cyx-admin/src/main/resources/templates/base/dept/add.html index 7f15d38..1acde83 100644 --- a/cyx-admin/src/main/resources/templates/base/dept/add.html +++ b/cyx-admin/src/main/resources/templates/base/dept/add.html @@ -31,7 +31,10 @@
- +
diff --git a/cyx-admin/src/main/resources/templates/base/dept/edit.html b/cyx-admin/src/main/resources/templates/base/dept/edit.html index a007407..693532c 100644 --- a/cyx-admin/src/main/resources/templates/base/dept/edit.html +++ b/cyx-admin/src/main/resources/templates/base/dept/edit.html @@ -32,7 +32,10 @@
- +
diff --git a/cyx-admin/src/main/resources/templates/base/personnel/add.html b/cyx-admin/src/main/resources/templates/base/personnel/add.html index 80cf8a5..b83576c 100644 --- a/cyx-admin/src/main/resources/templates/base/personnel/add.html +++ b/cyx-admin/src/main/resources/templates/base/personnel/add.html @@ -9,9 +9,11 @@
- +
- +
@@ -135,6 +137,19 @@ $("#deptId")[0].innerHTML=opt; } }); + $.ajax({ + type: "post", + url: ctx + "base/personnel/branchList", + data: { + }, + success: function(data) { + var opt = ''; + data.data.forEach(d=>{ + opt += ''; + }) + $("#branchId")[0].innerHTML=opt; + } + }); }) function submitHandler() { diff --git a/cyx-admin/src/main/resources/templates/base/personnel/edit.html b/cyx-admin/src/main/resources/templates/base/personnel/edit.html index e1b34ef..d3922a2 100644 --- a/cyx-admin/src/main/resources/templates/base/personnel/edit.html +++ b/cyx-admin/src/main/resources/templates/base/personnel/edit.html @@ -20,6 +20,15 @@
+
+ +
+ +
+
@@ -30,6 +39,8 @@
@@ -78,10 +89,13 @@
-
- +
+
- +
@@ -115,25 +129,6 @@ focusCleanup: true }); - $(document).ready(function () { - $("#deptId").on("change", function() { - console.log($(this).val()) - }); - $.ajax({ - type: "post", - url: ctx + "base/personnel/deptList", - data: { - }, - success: function(data) { - var opt = ''; - data.data.forEach(d=>{ - opt += ''; - }) - $("#deptId").html(opt); - } - }); - }) - function submitHandler() { if ($.validate.form()) { $.operate.save(prefix + "/edit", $('#form-personnel-edit').serialize()); diff --git a/cyx-admin/src/main/resources/templates/login.html b/cyx-admin/src/main/resources/templates/login.html index 53185ff..b2cb998 100644 --- a/cyx-admin/src/main/resources/templates/login.html +++ b/cyx-admin/src/main/resources/templates/login.html @@ -35,8 +35,8 @@

请登录：业务绩效考核系统

- - + +
+ @@ -30,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, type, files, unit, target, status, demand, detailed, score,now_score, method, head, reviewed, finish_date, per_id, dept_id, branch_id, create_by, create_time, update_by, update_time, remark from t_ament_party_affairs + select id, type,shot_name ,files, unit, target, status, demand, detailed, score,now_score, method, head, reviewed, finish_date, per_id, dept_id, branch_id, create_by, create_time, update_by, update_time, remark from t_ament_party_affairs