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 7623542..d682869 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 @@ -74,6 +74,7 @@ public class TAmentPartyAffairsController extends BaseController if (!getLoginName().equals("admin")){ tAmentPartyAffairs.setHead(getSysUser().getUserId()+""); } + tAmentPartyAffairs.setCurrentUser(getSysUser().getUserName()); List list = tAmentPartyAffairsService.allList(tAmentPartyAffairs); return getDataTable(list); } diff --git a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java index 02f642e..b2f8d79 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java @@ -51,6 +51,16 @@ public class TAmentPartyAffairs extends BaseEntity // @Excel(name = "单位名称") private String unit; + private String currentUser; + + public String getCurrentUser() { + return currentUser; + } + + public void setCurrentUser(String currentUser) { + this.currentUser = currentUser; + } + private String shotName; private String examineType; diff --git a/cyx-admin/src/main/resources/application.yml b/cyx-admin/src/main/resources/application.yml index f8d81a2..ecf0cb7 100644 --- a/cyx-admin/src/main/resources/application.yml +++ b/cyx-admin/src/main/resources/application.yml @@ -65,7 +65,7 @@ spring: servlet: multipart: # 单个文件大小 - max-file-size: 100MB + max-file-size: 200MB # 设置总上传的文件大小 max-request-size: 1000MB # 服务模块 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 7bbbde3..dffdb65 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html @@ -7,7 +7,7 @@
- +
@@ -98,9 +98,11 @@ function submitHandler() { if ($.validate.form()) { + var _str = "id="+$("#id").val()+"&nowScore="+$("#nowScore").val()+"&remark="+$("#remark").val(); $.ajax({ type: "get", - url: ctx + "base/affairs/reviewedSave?"+$('#commentForm').serialize(), + // url: ctx + "base/affairs/reviewedSave?"+$('#commentForm').serialize(), + url: ctx + "base/affairs/reviewedSave?"+_str, data: { }, success: function(data) { diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml index 06cf16e..975e915 100644 --- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml +++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml @@ -216,6 +216,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND a.STATUS = 1 ) OR ( a.`status` = 2 )) + AND (case WHEN a.status = 1 THEN d.`name` = #{currentUser} WHEN a.status=2 THEN c.`name` = #{currentUser} WHEN a.status=3 THEN d.`name` = #{currentUser} WHEN a.status=4 THEN d.`name` = #{currentUser} ELSE '' END) ORDER BY finish_date