修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/ZsyzShqxPzController.java

@@ -96,7 +96,7 @@ public class ZsyzShqxPzController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:pz:remove')")
     @Log(title = "招商引资_审核期限_配置", businessType = BusinessType.DELETE)
-    @GetMapping(value = "/delete/{id}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(zsyzShqxPzService.deleteZsyzShqxPzByIds(ids));

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/Task.java

@@ -86,8 +86,6 @@ public class Task {
     private FgwJdapDwMapper fgwJdapDwMapper;
 
 
-
-
     /***
      * 生成督办信息
      * */
@@ -103,11 +101,11 @@ public class Task {
         sysHoliday.setYear(year);
         // 法律规定的放假日期
         sysHoliday.setType("1");
-        List<SysHoliday> sysHolidayListLaw  = sysHolidayMapper.selectSysHolidayList(sysHoliday);
+        List<SysHoliday> sysHolidayListLaw = sysHolidayMapper.selectSysHolidayList(sysHoliday);
         List<String> lawHolidays = sysHolidayListLaw.stream().map(SysHoliday::getDay).collect(Collectors.toList());
         // 由于放假需要额外工作的周末
         sysHoliday.setType("2");
-        List<SysHoliday> sysHolidayListExtra  = sysHolidayMapper.selectSysHolidayList(sysHoliday);
+        List<SysHoliday> sysHolidayListExtra = sysHolidayMapper.selectSysHolidayList(sysHoliday);
         List<String> extraWorkdays = sysHolidayListExtra.stream().map(SysHoliday::getDay).collect(Collectors.toList());
 
         List<ZsyzDbd> zsyzDbds = new ArrayList<>();
@@ -142,13 +140,13 @@ public class Task {
         String deptName = "";
         String qx = "";
         for (ZsyzLcjl zsyzLcjl : zsyzLcjlList) {
-            if(StringUtils.isEmpty(zsyzLcjl.getProgress()) || StringUtils.isEmpty(zsyzLcjl.getXmStatus())){
+            if (StringUtils.isEmpty(zsyzLcjl.getProgress()) || StringUtils.isEmpty(zsyzLcjl.getXmStatus())) {
                 continue;
             }
             //项目首谈阶段
             if (zsyzLcjl.getProgress().equals(CommonConstants.ONE)) {
 
-                if(zsyzLcjl.getXmStatus().equals(CommonConstants.ONE)){
+                if (zsyzLcjl.getXmStatus().equals(CommonConstants.ONE)) {
                     //项目首谈待审核（判断首谈审核期限）
                     //查询招商中心
                     deptId = 100L;
@@ -159,28 +157,28 @@ public class Task {
                     List<ZsyzShqxXm> zsyzShqxXms = zsyzShqxXmcollect.get(zsyzLcjl.getXmId());
                     qx = CommonConstants.STSHQX;
                     //黄牌
-                    judgmentHuangP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds,qx ,zsyzShqxPzHuang, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHuangP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHuang, deptId, deptName, lawHolidays, extraWorkdays);
                     //红牌
-                    judgmentHongP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHong, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHongP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHong, deptId, deptName, lawHolidays, extraWorkdays);
                 }
 
-            }else if (zsyzLcjl.getProgress().equals(CommonConstants.TWO)) {
+            } else if (zsyzLcjl.getProgress().equals(CommonConstants.TWO)) {
                 //项目承接阶段
-                if(zsyzLcjl.getXmStatus().equals(CommonConstants.ONE)){
+                if (zsyzLcjl.getXmStatus().equals(CommonConstants.ONE)) {
                     //项目承接待审核（判断承接地期限和要素部门审核期限）
                     //判断是把督办发给承接地还是要素部门
                     //查询当前项目所归属的单位
                     ZsyzProjectDept zsyzProjectDept = new ZsyzProjectDept();
                     zsyzProjectDept.setXmId(zsyzLcjl.getXmId());
                     zsyzProjectDept.setIsHf("N");
-                    List<ZsyzProjectDept>  zsyzProjectDeptList = zsyzProjectDeptMapper.selectZsyzProjectDeptList(zsyzProjectDept);
+                    List<ZsyzProjectDept> zsyzProjectDeptList = zsyzProjectDeptMapper.selectZsyzProjectDeptList(zsyzProjectDept);
                     for (ZsyzProjectDept projectDept : zsyzProjectDeptList) {
                         //不给招商引荐单位发送督办信息
-                        if(!projectDept.equals(CommonConstants.THR) && projectDept.getIsHf().equals("N")){
+                        if (!projectDept.equals(CommonConstants.THR) && projectDept.getIsHf().equals("N")) {
 
-                            if(projectDept.equals(CommonConstants.ONE)){
+                            if (projectDept.equals(CommonConstants.ONE)) {
                                 qx = CommonConstants.CJDCJQX;
-                            }else{
+                            } else {
                                 qx = CommonConstants.YSBMSHQX;
                             }
 
@@ -192,18 +190,18 @@ public class Task {
 
                             List<ZsyzShqxXm> zsyzShqxXms = zsyzShqxXmcollect.get(zsyzLcjl.getXmId());
                             //黄牌
-                            judgmentHuangP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHuang, deptId,deptName,lawHolidays,extraWorkdays);
+                            judgmentHuangP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHuang, deptId, deptName, lawHolidays, extraWorkdays);
                             //红牌
-                            judgmentHongP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHong, deptId,deptName,lawHolidays,extraWorkdays);
+                            judgmentHongP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHong, deptId, deptName, lawHolidays, extraWorkdays);
 
                         }
 
                     }
-                }else if(zsyzLcjl.getXmStatus().equals(CommonConstants.TWO)){
+                } else if (zsyzLcjl.getXmStatus().equals(CommonConstants.TWO)) {
                     //项目承接已通过（判断签约信息录入期限，由承接地录入）
                     //查询承接地
                     for (ZsyzSbbzb zsyzSbbzb : zsyzSbbzbList) {
-                        if(zsyzSbbzb.getId().equals(zsyzLcjl.getXmId())){
+                        if (zsyzSbbzb.getId().equals(zsyzLcjl.getXmId())) {
                             deptId = zsyzSbbzb.getCjdId();
                             deptName = zsyzSbbzb.getCjdName();
                         }
@@ -215,11 +213,11 @@ public class Task {
                     List<ZsyzShqxXm> zsyzShqxXms = zsyzShqxXmcollect.get(zsyzLcjl.getXmId());
                     qx = CommonConstants.QYLRQX;
                     //黄牌
-                    judgmentHuangP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHuang, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHuangP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHuang, deptId, deptName, lawHolidays, extraWorkdays);
                     //红牌
-                    judgmentHongP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHong, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHongP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHong, deptId, deptName, lawHolidays, extraWorkdays);
 
-                }else if(zsyzLcjl.getXmStatus().equals(CommonConstants.THR)){
+                } else if (zsyzLcjl.getXmStatus().equals(CommonConstants.THR)) {
                     //项目承接未通过（判断首谈审核期限）
                     //查询招商中心
                     deptId = 100L;
@@ -230,16 +228,16 @@ public class Task {
                     List<ZsyzShqxXm> zsyzShqxXms = zsyzShqxXmcollect.get(zsyzLcjl.getXmId());
                     qx = CommonConstants.STSHQX;
                     //黄牌
-                    judgmentHuangP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHuang, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHuangP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHuang, deptId, deptName, lawHolidays, extraWorkdays);
                     //红牌
-                    judgmentHongP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHong, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHongP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHong, deptId, deptName, lawHolidays, extraWorkdays);
                 }
 
 
-            }else if (zsyzLcjl.getProgress().equals(CommonConstants.THR)) {
+            } else if (zsyzLcjl.getProgress().equals(CommonConstants.THR)) {
 
                 //项目签约阶段
-                if(zsyzLcjl.getXmStatus().equals(CommonConstants.ONE)){
+                if (zsyzLcjl.getXmStatus().equals(CommonConstants.ONE)) {
                     //项目签约待审核（判断签约信息审核期限）
                     //查询招商中心
                     deptId = 100L;
@@ -250,14 +248,14 @@ public class Task {
                     List<ZsyzShqxXm> zsyzShqxXms = zsyzShqxXmcollect.get(zsyzLcjl.getXmId());
                     qx = CommonConstants.QYSHQX;
                     //黄牌
-                    judgmentHuangP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHuang, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHuangP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHuang, deptId, deptName, lawHolidays, extraWorkdays);
                     //红牌
-                    judgmentHongP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHong, deptId,deptName,lawHolidays,extraWorkdays);
-                }else if(zsyzLcjl.getXmStatus().equals(CommonConstants.TWO)){
+                    judgmentHongP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHong, deptId, deptName, lawHolidays, extraWorkdays);
+                } else if (zsyzLcjl.getXmStatus().equals(CommonConstants.TWO)) {
                     //项目签约已通过（判断开工信息录入期限，由承接地录入）
                     //查询承接地
                     for (ZsyzSbbzb zsyzSbbzb : zsyzSbbzbList) {
-                        if(zsyzSbbzb.getId().equals(zsyzLcjl.getXmId())){
+                        if (zsyzSbbzb.getId().equals(zsyzLcjl.getXmId())) {
                             deptId = zsyzSbbzb.getCjdId();
                             deptName = zsyzSbbzb.getCjdName();
                         }
@@ -269,15 +267,15 @@ public class Task {
                     List<ZsyzShqxXm> zsyzShqxXms = zsyzShqxXmcollect.get(zsyzLcjl.getXmId());
                     qx = CommonConstants.KGLRQX;
                     //黄牌
-                    judgmentHuangP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHuang, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHuangP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHuang, deptId, deptName, lawHolidays, extraWorkdays);
                     //红牌
-                    judgmentHongP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHong, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHongP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHong, deptId, deptName, lawHolidays, extraWorkdays);
 
-                }else if(zsyzLcjl.getXmStatus().equals(CommonConstants.THR)){
+                } else if (zsyzLcjl.getXmStatus().equals(CommonConstants.THR)) {
                     //项目签约未通过（判断签约信息录入期限，由承接地录入）
                     //查询承接地
                     for (ZsyzSbbzb zsyzSbbzb : zsyzSbbzbList) {
-                        if(zsyzSbbzb.getId().equals(zsyzLcjl.getXmId())){
+                        if (zsyzSbbzb.getId().equals(zsyzLcjl.getXmId())) {
                             deptId = zsyzSbbzb.getCjdId();
                             deptName = zsyzSbbzb.getCjdName();
                         }
@@ -289,15 +287,15 @@ public class Task {
                     List<ZsyzShqxXm> zsyzShqxXms = zsyzShqxXmcollect.get(zsyzLcjl.getXmId());
                     qx = CommonConstants.QYLRQX;
                     //黄牌
-                    judgmentHuangP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHuang, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHuangP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHuang, deptId, deptName, lawHolidays, extraWorkdays);
                     //红牌
-                    judgmentHongP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHong, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHongP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHong, deptId, deptName, lawHolidays, extraWorkdays);
                 }
 
 
-            }else if (zsyzLcjl.getProgress().equals(CommonConstants.FOR)) {
+            } else if (zsyzLcjl.getProgress().equals(CommonConstants.FOR)) {
                 //项目开工阶段
-                if(zsyzLcjl.getXmStatus().equals(CommonConstants.ONE)){
+                if (zsyzLcjl.getXmStatus().equals(CommonConstants.ONE)) {
                     //项目开工待审核（判断开工信息审核期限）
                     //查询招商中心
                     deptId = 100L;
@@ -308,14 +306,14 @@ public class Task {
                     List<ZsyzShqxXm> zsyzShqxXms = zsyzShqxXmcollect.get(zsyzLcjl.getXmId());
                     qx = CommonConstants.KGSHQX;
                     //黄牌
-                    judgmentHuangP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHuang, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHuangP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHuang, deptId, deptName, lawHolidays, extraWorkdays);
                     //红牌
-                    judgmentHongP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHong, deptId,deptName,lawHolidays,extraWorkdays);
-                }else if(zsyzLcjl.getXmStatus().equals(CommonConstants.TWO)){
+                    judgmentHongP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHong, deptId, deptName, lawHolidays, extraWorkdays);
+                } else if (zsyzLcjl.getXmStatus().equals(CommonConstants.TWO)) {
                     //项目开工已通过（判断投产信息录入期限，由承接地录入）
                     //查询承接地
                     for (ZsyzSbbzb zsyzSbbzb : zsyzSbbzbList) {
-                        if(zsyzSbbzb.getId().equals(zsyzLcjl.getXmId())){
+                        if (zsyzSbbzb.getId().equals(zsyzLcjl.getXmId())) {
                             deptId = zsyzSbbzb.getCjdId();
                             deptName = zsyzSbbzb.getCjdName();
                         }
@@ -327,15 +325,15 @@ public class Task {
                     List<ZsyzShqxXm> zsyzShqxXms = zsyzShqxXmcollect.get(zsyzLcjl.getXmId());
                     qx = CommonConstants.TCLRQX;
                     //黄牌
-                    judgmentHuangP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHuang, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHuangP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHuang, deptId, deptName, lawHolidays, extraWorkdays);
                     //红牌
-                    judgmentHongP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHong, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHongP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHong, deptId, deptName, lawHolidays, extraWorkdays);
 
-                }else if(zsyzLcjl.getXmStatus().equals(CommonConstants.THR)){
+                } else if (zsyzLcjl.getXmStatus().equals(CommonConstants.THR)) {
                     //项目开工未通过（判断开工信息录入期限，由承接地录入）
                     //查询承接地
                     for (ZsyzSbbzb zsyzSbbzb : zsyzSbbzbList) {
-                        if(zsyzSbbzb.getId().equals(zsyzLcjl.getXmId())){
+                        if (zsyzSbbzb.getId().equals(zsyzLcjl.getXmId())) {
                             deptId = zsyzSbbzb.getCjdId();
                             deptName = zsyzSbbzb.getCjdName();
                         }
@@ -347,14 +345,14 @@ public class Task {
                     List<ZsyzShqxXm> zsyzShqxXms = zsyzShqxXmcollect.get(zsyzLcjl.getXmId());
                     qx = CommonConstants.KGLRQX;
                     //黄牌
-                    judgmentHuangP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHuang, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHuangP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHuang, deptId, deptName, lawHolidays, extraWorkdays);
                     //红牌
-                    judgmentHongP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHong, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHongP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHong, deptId, deptName, lawHolidays, extraWorkdays);
                 }
 
-            }else if (zsyzLcjl.getProgress().equals(CommonConstants.FIV)) {
+            } else if (zsyzLcjl.getProgress().equals(CommonConstants.FIV)) {
                 //项目开工阶段
-                if(zsyzLcjl.getXmStatus().equals(CommonConstants.ONE)){
+                if (zsyzLcjl.getXmStatus().equals(CommonConstants.ONE)) {
                     //项目投产待审核（判断投产信息审核期限）
                     //查询招商中心
                     deptId = 100L;
@@ -365,18 +363,18 @@ public class Task {
                     List<ZsyzShqxXm> zsyzShqxXms = zsyzShqxXmcollect.get(zsyzLcjl.getXmId());
                     qx = CommonConstants.TCSHQX;
                     //黄牌
-                    judgmentHuangP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHuang, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHuangP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHuang, deptId, deptName, lawHolidays, extraWorkdays);
                     //红牌
-                    judgmentHongP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHong, deptId,deptName,lawHolidays,extraWorkdays);
-                }else if(zsyzLcjl.getXmStatus().equals(CommonConstants.TWO)){
+                    judgmentHongP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHong, deptId, deptName, lawHolidays, extraWorkdays);
+                } else if (zsyzLcjl.getXmStatus().equals(CommonConstants.TWO)) {
                     //项目投产审核通过
                     //流程结束
 
-                }else if(zsyzLcjl.getXmStatus().equals(CommonConstants.THR)){
+                } else if (zsyzLcjl.getXmStatus().equals(CommonConstants.THR)) {
                     //项目投产未通过（判断投产信息录入期限，由承接地录入）
                     //查询承接地
                     for (ZsyzSbbzb zsyzSbbzb : zsyzSbbzbList) {
-                        if(zsyzSbbzb.getId().equals(zsyzLcjl.getXmId())){
+                        if (zsyzSbbzb.getId().equals(zsyzLcjl.getXmId())) {
                             deptId = zsyzSbbzb.getCjdId();
                             deptName = zsyzSbbzb.getCjdName();
                         }
@@ -388,9 +386,9 @@ public class Task {
                     List<ZsyzShqxXm> zsyzShqxXms = zsyzShqxXmcollect.get(zsyzLcjl.getXmId());
                     qx = CommonConstants.TCLRQX;
                     //黄牌
-                    judgmentHuangP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHuang, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHuangP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHuang, deptId, deptName, lawHolidays, extraWorkdays);
                     //红牌
-                    judgmentHongP(zsyzShqxXms,strTime,zsyzDbdList,zsyzLcjl,zsyzDbds, qx,zsyzShqxPzHong, deptId,deptName,lawHolidays,extraWorkdays);
+                    judgmentHongP(zsyzShqxXms, strTime, zsyzDbdList, zsyzLcjl, zsyzDbds, qx, zsyzShqxPzHong, deptId, deptName, lawHolidays, extraWorkdays);
                 }
 
             }
@@ -409,9 +407,9 @@ public class Task {
                 String jPushVO = "";
                 List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
                 listS.removeAll(Collections.singleton(null));
-                if(listS!=null && listS.size()>0){
-                    String[]  registrationId = listS.toArray(new String[listS.size()]);
-                    JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+                if (listS != null && listS.size() > 0) {
+                    String[] registrationId = listS.toArray(new String[listS.size()]);
+                    JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, registrationId);
                 }
 
                 for (SysUser sysUser : sysUsers) {
@@ -447,7 +445,7 @@ public class Task {
      * @throws Exception
      */
     private void judgmentHongP(List<ZsyzShqxXm> zsyzShqxXms, String strTime, List<ZsyzDbd> zsyzDbdList, ZsyzLcjl zsyzLcjl,
-                               List<ZsyzDbd> zsyzDbds, String qx, ZsyzShqxPz zsyzShqxPzHong,Long deptId,String deptName,List<String> lawHolidays,
+                               List<ZsyzDbd> zsyzDbds, String qx, ZsyzShqxPz zsyzShqxPzHong, Long deptId, String deptName, List<String> lawHolidays,
                                List<String> extraWorkdays) throws Exception {
 
         //黄牌
@@ -457,27 +455,27 @@ public class Task {
                 if ("2".equals(zsyzShqxXm.getType())) {
                     String endTime = DateUtils.getDate();
                     //计算strTime和endTime之间的工作日
-                    int count = DateUtils.calc(strTime, endTime,lawHolidays,extraWorkdays);
+                    int count = DateUtils.calc(strTime, endTime, lawHolidays, extraWorkdays);
                     //如果超过时间并且督办中不存在则录入督办
                     String ts = "";
 
-                    if(CommonConstants.STSHQX.equals(qx)){
+                    if (CommonConstants.STSHQX.equals(qx)) {
                         ts = zsyzShqxXm.getStshqx();
-                    }else if(CommonConstants.YSBMSHQX.equals(qx)){
+                    } else if (CommonConstants.YSBMSHQX.equals(qx)) {
                         ts = zsyzShqxXm.getYsbmshqx();
-                    }else if(CommonConstants.CJDCJQX.equals(qx)){
+                    } else if (CommonConstants.CJDCJQX.equals(qx)) {
                         ts = zsyzShqxXm.getCjdcjqx();
-                    }else if(CommonConstants.QYLRQX.equals(qx)){
+                    } else if (CommonConstants.QYLRQX.equals(qx)) {
                         ts = zsyzShqxXm.getQylrqx();
-                    }else if(CommonConstants.QYSHQX.equals(qx)){
+                    } else if (CommonConstants.QYSHQX.equals(qx)) {
                         ts = zsyzShqxXm.getQyshqx();
-                    }else if(CommonConstants.KGLRQX.equals(qx)){
+                    } else if (CommonConstants.KGLRQX.equals(qx)) {
                         ts = zsyzShqxXm.getKglrqx();
-                    }else if(CommonConstants.KGSHQX.equals(qx)){
+                    } else if (CommonConstants.KGSHQX.equals(qx)) {
                         ts = zsyzShqxXm.getKgshqx();
-                    }else if(CommonConstants.TCLRQX.equals(qx)){
+                    } else if (CommonConstants.TCLRQX.equals(qx)) {
                         ts = zsyzShqxXm.getTclrqx();
-                    }else if(CommonConstants.TCSHQX.equals(qx)){
+                    } else if (CommonConstants.TCSHQX.equals(qx)) {
                         ts = zsyzShqxXm.getTcshqx();
                     }
 
@@ -517,31 +515,31 @@ public class Task {
                     bls = false;
                 }
             }
-            if(bls){
+            if (bls) {
                 String endTime = DateUtils.getDate();
                 //计算strTime和endTime之间的工作日
-                int count = DateUtils.calc(strTime, endTime,lawHolidays,extraWorkdays);
+                int count = DateUtils.calc(strTime, endTime, lawHolidays, extraWorkdays);
                 //如果超过时间并且督办中不存在则录入督办
 
                 String ts = "";
 
-                if(CommonConstants.STSHQX.equals(qx)){
+                if (CommonConstants.STSHQX.equals(qx)) {
                     ts = zsyzShqxPzHong.getStshqx();
-                }else if(CommonConstants.YSBMSHQX.equals(qx)){
+                } else if (CommonConstants.YSBMSHQX.equals(qx)) {
                     ts = zsyzShqxPzHong.getYsbmshqx();
-                }else if(CommonConstants.CJDCJQX.equals(qx)){
+                } else if (CommonConstants.CJDCJQX.equals(qx)) {
                     ts = zsyzShqxPzHong.getCjdcjqx();
-                }else if(CommonConstants.QYLRQX.equals(qx)){
+                } else if (CommonConstants.QYLRQX.equals(qx)) {
                     ts = zsyzShqxPzHong.getQylrqx();
-                }else if(CommonConstants.QYSHQX.equals(qx)){
+                } else if (CommonConstants.QYSHQX.equals(qx)) {
                     ts = zsyzShqxPzHong.getQyshqx();
-                }else if(CommonConstants.KGLRQX.equals(qx)){
+                } else if (CommonConstants.KGLRQX.equals(qx)) {
                     ts = zsyzShqxPzHong.getKglrqx();
-                }else if(CommonConstants.KGSHQX.equals(qx)){
+                } else if (CommonConstants.KGSHQX.equals(qx)) {
                     ts = zsyzShqxPzHong.getKgshqx();
-                }else if(CommonConstants.TCLRQX.equals(qx)){
+                } else if (CommonConstants.TCLRQX.equals(qx)) {
                     ts = zsyzShqxPzHong.getTclrqx();
-                }else if(CommonConstants.TCSHQX.equals(qx)){
+                } else if (CommonConstants.TCSHQX.equals(qx)) {
                     ts = zsyzShqxPzHong.getTcshqx();
                 }
 
@@ -583,27 +581,27 @@ public class Task {
         } else {
             String endTime = DateUtils.getDate();
             //计算strTime和endTime之间的工作日
-            int count = DateUtils.calc(strTime, endTime,lawHolidays,extraWorkdays);
+            int count = DateUtils.calc(strTime, endTime, lawHolidays, extraWorkdays);
             //如果超过时间并且督办中不存在则录入督办
 
             String ts = "";
-            if(CommonConstants.STSHQX.equals(qx)){
+            if (CommonConstants.STSHQX.equals(qx)) {
                 ts = zsyzShqxPzHong.getStshqx();
-            }else if(CommonConstants.YSBMSHQX.equals(qx)){
+            } else if (CommonConstants.YSBMSHQX.equals(qx)) {
                 ts = zsyzShqxPzHong.getYsbmshqx();
-            }else if(CommonConstants.CJDCJQX.equals(qx)){
+            } else if (CommonConstants.CJDCJQX.equals(qx)) {
                 ts = zsyzShqxPzHong.getCjdcjqx();
-            }else if(CommonConstants.QYLRQX.equals(qx)){
+            } else if (CommonConstants.QYLRQX.equals(qx)) {
                 ts = zsyzShqxPzHong.getQylrqx();
-            }else if(CommonConstants.QYSHQX.equals(qx)){
+            } else if (CommonConstants.QYSHQX.equals(qx)) {
                 ts = zsyzShqxPzHong.getQyshqx();
-            }else if(CommonConstants.KGLRQX.equals(qx)){
+            } else if (CommonConstants.KGLRQX.equals(qx)) {
                 ts = zsyzShqxPzHong.getKglrqx();
-            }else if(CommonConstants.KGSHQX.equals(qx)){
+            } else if (CommonConstants.KGSHQX.equals(qx)) {
                 ts = zsyzShqxPzHong.getKgshqx();
-            }else if(CommonConstants.TCLRQX.equals(qx)){
+            } else if (CommonConstants.TCLRQX.equals(qx)) {
                 ts = zsyzShqxPzHong.getTclrqx();
-            }else if(CommonConstants.TCSHQX.equals(qx)){
+            } else if (CommonConstants.TCSHQX.equals(qx)) {
                 ts = zsyzShqxPzHong.getTcshqx();
             }
 
@@ -657,9 +655,9 @@ public class Task {
      * @param extraWorkdays 由于放假需要额外工作的周末
      * @throws Exception
      */
-    public void judgmentHuangP(List<ZsyzShqxXm>zsyzShqxXms,String strTime,List<ZsyzDbd> zsyzDbdList,ZsyzLcjl zsyzLcjl,
-                               List<ZsyzDbd> zsyzDbds,String qx,ZsyzShqxPz zsyzShqxPzHuang,Long deptId,String deptName,List<String> lawHolidays,
-                               List<String> extraWorkdays ) throws Exception {
+    public void judgmentHuangP(List<ZsyzShqxXm> zsyzShqxXms, String strTime, List<ZsyzDbd> zsyzDbdList, ZsyzLcjl zsyzLcjl,
+                               List<ZsyzDbd> zsyzDbds, String qx, ZsyzShqxPz zsyzShqxPzHuang, Long deptId, String deptName, List<String> lawHolidays,
+                               List<String> extraWorkdays) throws Exception {
         //黄牌
         if (zsyzShqxXms != null && zsyzShqxXms.size() > 0) {
             Boolean bls = true;
@@ -667,26 +665,26 @@ public class Task {
                 if ("1".equals(zsyzShqxXm.getType())) {
                     String endTime = DateUtils.getDate();
                     //计算strTime和endTime之间的工作日
-                    int count = DateUtils.calc(strTime, endTime,lawHolidays,extraWorkdays);
+                    int count = DateUtils.calc(strTime, endTime, lawHolidays, extraWorkdays);
                     //如果超过时间并且督办中不存在则录入督办
                     String ts = "";
-                    if(CommonConstants.STSHQX.equals(qx)){
+                    if (CommonConstants.STSHQX.equals(qx)) {
                         ts = zsyzShqxXm.getStshqx();
-                    }else if(CommonConstants.YSBMSHQX.equals(qx)){
+                    } else if (CommonConstants.YSBMSHQX.equals(qx)) {
                         ts = zsyzShqxXm.getYsbmshqx();
-                    }else if(CommonConstants.CJDCJQX.equals(qx)){
+                    } else if (CommonConstants.CJDCJQX.equals(qx)) {
                         ts = zsyzShqxXm.getCjdcjqx();
-                    }else if(CommonConstants.QYLRQX.equals(qx)){
+                    } else if (CommonConstants.QYLRQX.equals(qx)) {
                         ts = zsyzShqxXm.getQylrqx();
-                    }else if(CommonConstants.QYSHQX.equals(qx)){
+                    } else if (CommonConstants.QYSHQX.equals(qx)) {
                         ts = zsyzShqxXm.getQyshqx();
-                    }else if(CommonConstants.KGLRQX.equals(qx)){
+                    } else if (CommonConstants.KGLRQX.equals(qx)) {
                         ts = zsyzShqxXm.getKglrqx();
-                    }else if(CommonConstants.KGSHQX.equals(qx)){
+                    } else if (CommonConstants.KGSHQX.equals(qx)) {
                         ts = zsyzShqxXm.getKgshqx();
-                    }else if(CommonConstants.TCLRQX.equals(qx)){
+                    } else if (CommonConstants.TCLRQX.equals(qx)) {
                         ts = zsyzShqxXm.getTclrqx();
-                    }else if(CommonConstants.TCSHQX.equals(qx)){
+                    } else if (CommonConstants.TCSHQX.equals(qx)) {
                         ts = zsyzShqxXm.getTcshqx();
                     }
 
@@ -725,30 +723,30 @@ public class Task {
                     bls = false;
                 }
             }
-            if(bls){
+            if (bls) {
                 String endTime = DateUtils.getDate();
                 //计算strTime和endTime之间的工作日
-                int count = DateUtils.calc(strTime, endTime,lawHolidays,extraWorkdays);
+                int count = DateUtils.calc(strTime, endTime, lawHolidays, extraWorkdays);
                 //如果超过时间并且督办中不存在则录入督办
 
                 String ts = "";
-                if(CommonConstants.STSHQX.equals(qx)){
+                if (CommonConstants.STSHQX.equals(qx)) {
                     ts = zsyzShqxPzHuang.getStshqx();
-                }else if(CommonConstants.YSBMSHQX.equals(qx)){
+                } else if (CommonConstants.YSBMSHQX.equals(qx)) {
                     ts = zsyzShqxPzHuang.getYsbmshqx();
-                }else if(CommonConstants.CJDCJQX.equals(qx)){
+                } else if (CommonConstants.CJDCJQX.equals(qx)) {
                     ts = zsyzShqxPzHuang.getCjdcjqx();
-                }else if(CommonConstants.QYLRQX.equals(qx)){
+                } else if (CommonConstants.QYLRQX.equals(qx)) {
                     ts = zsyzShqxPzHuang.getQylrqx();
-                }else if(CommonConstants.QYSHQX.equals(qx)){
+                } else if (CommonConstants.QYSHQX.equals(qx)) {
                     ts = zsyzShqxPzHuang.getQyshqx();
-                }else if(CommonConstants.KGLRQX.equals(qx)){
+                } else if (CommonConstants.KGLRQX.equals(qx)) {
                     ts = zsyzShqxPzHuang.getKglrqx();
-                }else if(CommonConstants.KGSHQX.equals(qx)){
+                } else if (CommonConstants.KGSHQX.equals(qx)) {
                     ts = zsyzShqxPzHuang.getKgshqx();
-                }else if(CommonConstants.TCLRQX.equals(qx)){
+                } else if (CommonConstants.TCLRQX.equals(qx)) {
                     ts = zsyzShqxPzHuang.getTclrqx();
-                }else if(CommonConstants.TCSHQX.equals(qx)){
+                } else if (CommonConstants.TCSHQX.equals(qx)) {
                     ts = zsyzShqxPzHuang.getTcshqx();
                 }
 
@@ -789,27 +787,27 @@ public class Task {
         } else {
             String endTime = DateUtils.getDate();
             //计算strTime和endTime之间的工作日
-            int count = DateUtils.calc(strTime, endTime,lawHolidays,extraWorkdays);
+            int count = DateUtils.calc(strTime, endTime, lawHolidays, extraWorkdays);
             //如果超过时间并且督办中不存在则录入督办
 
             String ts = "";
-            if(CommonConstants.STSHQX.equals(qx)){
+            if (CommonConstants.STSHQX.equals(qx)) {
                 ts = zsyzShqxPzHuang.getStshqx();
-            }else if(CommonConstants.YSBMSHQX.equals(qx)){
+            } else if (CommonConstants.YSBMSHQX.equals(qx)) {
                 ts = zsyzShqxPzHuang.getYsbmshqx();
-            }else if(CommonConstants.CJDCJQX.equals(qx)){
+            } else if (CommonConstants.CJDCJQX.equals(qx)) {
                 ts = zsyzShqxPzHuang.getCjdcjqx();
-            }else if(CommonConstants.QYLRQX.equals(qx)){
+            } else if (CommonConstants.QYLRQX.equals(qx)) {
                 ts = zsyzShqxPzHuang.getQylrqx();
-            }else if(CommonConstants.QYSHQX.equals(qx)){
+            } else if (CommonConstants.QYSHQX.equals(qx)) {
                 ts = zsyzShqxPzHuang.getQyshqx();
-            }else if(CommonConstants.KGLRQX.equals(qx)){
+            } else if (CommonConstants.KGLRQX.equals(qx)) {
                 ts = zsyzShqxPzHuang.getKglrqx();
-            }else if(CommonConstants.KGSHQX.equals(qx)){
+            } else if (CommonConstants.KGSHQX.equals(qx)) {
                 ts = zsyzShqxPzHuang.getKgshqx();
-            }else if(CommonConstants.TCLRQX.equals(qx)){
+            } else if (CommonConstants.TCLRQX.equals(qx)) {
                 ts = zsyzShqxPzHuang.getTclrqx();
-            }else if(CommonConstants.TCSHQX.equals(qx)){
+            } else if (CommonConstants.TCSHQX.equals(qx)) {
                 ts = zsyzShqxPzHuang.getTcshqx();
             }
 
@@ -872,54 +870,66 @@ public class Task {
         List<ZsyzSbbzb> zsyzSbbzbList = zsyzSbbzbMapper.selectZsyzSbbzbList(zsyzSbbzb);
         //停留在该状态时间超过15天的弹窗
         for (ZsyzSbbzb sbbzb : zsyzSbbzbList) {
-            if(sbbzb.getUpdateTime()==null){
+            if (sbbzb.getUpdateTime() == null) {
                 continue;
             }
             String strTime = DateFormatUtils.format(sbbzb.getUpdateTime(), "yyyy-MM-dd");
-            int i = DateUtils.daysBetween(strTime,endTime);
-            if(i>15){
-                ZsyzJzqkTs zsyzJzqkTs = new ZsyzJzqkTs();
-                zsyzJzqkTs.setXmId(sbbzb.getId());
-                zsyzJzqkTs.setXmbh(sbbzb.getXmbh());
-                zsyzJzqkTs.setXmmc(sbbzb.getXmxsmc());
-                zsyzJzqkTs.setDeptId(sbbzb.getCjdId());
-                zsyzJzqkTs.setDeptName(sbbzb.getCjdName());
-                zsyzJzqkTs.setDetails("已超过15天未填写签约信息，请补充当前项目进展情况。");
-                zsyzJzqkTs.setIsDel("N");
-                zsyzJzqkTs.setCreateTime(DateUtils.getNowDate());
-                zsyzJzqkTs.setUpdateTime(DateUtils.getNowDate());
-                zsyzJzqkTsMapper.insertZsyzJzqkTs(zsyzJzqkTs);
-
-                //发送短信
-                /*List<SendSmsConfig> sendSmsConfigs = new ArrayList<>();
-                List<SysUser> sysUsers = sysUserService.selectUserByDeptId(sbbzb.getCjdId());
-                if (sysUsers != null) {
-
-                    //发极光推送
-                    String notificationTitle = "消息通知";
-                    String msgTitle = "督办";
-                    String msgContent = "您有一条督办信息，请及时处理！";
-                    String jPushVO = "";
-                    List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
-                    listS.removeAll(Collections.singleton(null));
-                    if(listS!=null && listS.size()>0){
-                        String[]  registrationId = listS.toArray(new String[listS.size()]);
-                        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
-                    }
+            int i = DateUtils.daysBetween(strTime, endTime);
+            if (i < 15) {
+                continue;
+            }
+            //查询是否已在数据库存在
+            ZsyzJzqkTs zsyzJzqkTsOld = new ZsyzJzqkTs();
+            zsyzJzqkTsOld.setXmId(sbbzb.getId());
+            zsyzJzqkTsOld.setIsDel("Y");
+            List<ZsyzJzqkTs> zsyzJzqkTsList = zsyzJzqkTsMapper.selectZsyzJzqkTsList(zsyzJzqkTsOld);
+            if (zsyzJzqkTsList != null && zsyzJzqkTsList.size() > 0) {
+                String strTimez = DateFormatUtils.format(zsyzJzqkTsList.get(0).getUpdateTime(), "yyyy-MM-dd");
+                int n = DateUtils.daysBetween(strTimez, endTime);
+                if (n < 15) {
+                    continue;
+                }
+            }
+            ZsyzJzqkTs zsyzJzqkTs = new ZsyzJzqkTs();
+            zsyzJzqkTs.setXmId(sbbzb.getId());
+            zsyzJzqkTs.setXmbh(sbbzb.getXmbh());
+            zsyzJzqkTs.setXmmc(sbbzb.getXmxsmc());
+            zsyzJzqkTs.setDeptId(sbbzb.getCjdId());
+            zsyzJzqkTs.setDeptName(sbbzb.getCjdName());
+            zsyzJzqkTs.setDetails("已超过15天未填写签约信息，请补充当前项目进展情况。");
+            zsyzJzqkTs.setIsDel("N");
+            zsyzJzqkTs.setCreateTime(DateUtils.getNowDate());
+            zsyzJzqkTs.setUpdateTime(DateUtils.getNowDate());
+            zsyzJzqkTsMapper.insertZsyzJzqkTs(zsyzJzqkTs);
 
-                    for (SysUser sysUser : sysUsers) {
-                        if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
-                            SendSmsConfig sendSmsConfig = new SendSmsConfig();
-                            sendSmsConfig.setPhone(sysUser.getPhonenumber());
-                            sendSmsConfigs.add(sendSmsConfig);
-                        }
-                    }
-                    if (sendSmsConfigs.size() > 0) {
-                        AsyncManager.me().execute(AsyncFactory.sendSms(sendSmsConfigs, "SMS_272615944"));
-                    }
-                }*/
+            //发送短信
+            List<SendSmsConfig> sendSmsConfigs = new ArrayList<>();
+            List<SysUser> sysUsers = sysUserService.selectUserByDeptId(sbbzb.getCjdId());
+            if (sysUsers != null) {
+                //发极光推送
+                String notificationTitle = "消息通知";
+                String msgTitle = "督办";
+                String msgContent = "您有一条督办信息，请及时处理！";
+                String jPushVO = "";
+                List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+                listS.removeAll(Collections.singleton(null));
+                if (listS != null && listS.size() > 0) {
+                    String[] registrationId = listS.toArray(new String[listS.size()]);
+                    JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, registrationId);
+                }
 
+                for (SysUser sysUser : sysUsers) {
+                    if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
+                        SendSmsConfig sendSmsConfig = new SendSmsConfig();
+                        sendSmsConfig.setPhone(sysUser.getPhonenumber());
+                        sendSmsConfigs.add(sendSmsConfig);
+                    }
+                }
+                if (sendSmsConfigs.size() > 0) {
+                    AsyncManager.me().execute(AsyncFactory.sendSms(sendSmsConfigs, "SMS_272615944"));
+                }
             }
+
         }
     }
 
@@ -944,7 +954,7 @@ public class Task {
         List<FgwXmsb> fgwXmsbList = new ArrayList<>();
         List<FgwJdapDw> fgwJdapDwList = new ArrayList<>();
         FgwXmsb fgwXmsb = new FgwXmsb();
-        if (fgwJdapList!=null && fgwJdapList.size() > 0) {
+        if (fgwJdapList != null && fgwJdapList.size() > 0) {
             List<Long> xmidList = fgwJdapList.stream().map(FgwJdap::getXmId).collect(Collectors.toList());
             fgwXmsb.setIdList(xmidList);
             fgwXmsbList = fgwXmsbMapper.selectFgwXmsbList(fgwXmsb);
@@ -955,7 +965,7 @@ public class Task {
 
         }
 
-        if (fgwXmsbList!=null && fgwXmsbList.size() > 0) {
+        if (fgwXmsbList != null && fgwXmsbList.size() > 0) {
 
             for (FgwXmsb xmsb : fgwXmsbList) {
                 SysUser sysUse = userMapper.selectUserById(xmsb.getUserId());
@@ -964,7 +974,7 @@ public class Task {
 
         }
 
-        if (fgwJdapDwList!=null && fgwJdapDwList.size() > 0) {
+        if (fgwJdapDwList != null && fgwJdapDwList.size() > 0) {
             List<Long> deptIdList = fgwJdapDwList.stream().map(FgwJdapDw::getDeptId).collect(Collectors.toList());
             List<SysUser> sysUsers = userMapper.selectUserByDeptIdList(deptIdList);
             sysUserList.addAll(sysUsers);
@@ -977,9 +987,9 @@ public class Task {
             String jPushVO = "";
             List<String> listS = sysUserList.stream().map(SysUser::getJgId).collect(Collectors.toList());
             listS.removeAll(Collections.singleton(null));
-            if(listS!=null && listS.size()>0){
-                String[]  registrationId = listS.toArray(new String[listS.size()]);
-                JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+            if (listS != null && listS.size() > 0) {
+                String[] registrationId = listS.toArray(new String[listS.size()]);
+                JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, registrationId);
             }
 
             for (SysUser sysUser : sysUserList) {

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/XmProjectInvestor.java

@@ -30,28 +30,28 @@ public class XmProjectInvestor extends BaseEntity
     @Excel(name = "项目名称")
     private String xmmc;
 
-    /** 是否删除(0未删除、1已删除)* */
-    @Excel(name = "是否删除(0未删除、1已删除)*")
+    /** 是否删除(0未删除、1已删除) */
+    //@Excel(name = "是否删除",readConverterExp ="0=否,1=是")
     private Long isDel;
 
     /** 企业名称* */
-    @Excel(name = "企业名称*")
+    @Excel(name = "企业名称")
     private String companyName;
 
     /** 企业所在地* */
-    @Excel(name = "企业所在地*")
+    @Excel(name = "企业所在地")
     private String companyAddress;
 
     /** 企业法人* */
-    @Excel(name = "企业法人*")
+    @Excel(name = "企业法人")
     private String companyLegal;
 
     /** 统一社会信用代码* */
-    @Excel(name = "统一社会信用代码*")
+    @Excel(name = "统一社会信用代码")
     private String companyCode;
 
     /** 联系方式* */
-    @Excel(name = "联系方式*")
+    @Excel(name = "联系方式")
     private String phone;
 
     public void setId(Long id) 

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/XmProjectPersion.java

@@ -31,23 +31,23 @@ public class XmProjectPersion extends BaseEntity
     private String xmmc;
 
     /** 是否删除(0未删除、1已删除)* */
-    @Excel(name = "是否删除(0未删除、1已删除)*")
+    //@Excel(name = "是否删除",readConverterExp ="0=未删除,1=已删除")
     private Long isDel;
 
     /** 姓名* */
-    @Excel(name = "姓名*")
+    @Excel(name = "姓名")
     private String name;
 
     /** 所在地* */
-    @Excel(name = "所在地*")
+    @Excel(name = "所在地")
     private String address;
 
     /** 身份证号码* */
-    @Excel(name = "身份证号码*")
+    @Excel(name = "身份证号码")
     private String idcode;
 
     /** 联系方式* */
-    @Excel(name = "联系方式*")
+    @Excel(name = "联系方式")
     private String phone;
 
     public void setId(Long id) 

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzJzqkTsMapper.xml

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="details != null  and details != ''"> and details = #{details}</if>
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
         </where>
+        order by update_time desc
     </select>
     
     <select id="selectZsyzJzqkTsById" parameterType="Long" resultMap="ZsyzJzqkTsResult">

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzKgxxMapper.xml

@@ -106,7 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sscrq != null">sscrq = #{sscrq},</if>
             <if test="ntcsj != null">ntcsj = #{ntcsj},</if>
             <if test="rtsj != null">rtsj = #{rtsj},</if>
+            <if test="rtsj == null">rtsj = null,</if>
             <if test="nrtsj != null">nrtsj = #{nrtsj},</if>
+            <if test="nrtsj == null">nrtsj = null,</if>
             <if test="kggjrsjh != null and kggjrsjh != ''">kggjrsjh = #{kggjrsjh},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzQyxxMapper.xml

@@ -139,8 +139,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="xmId != null">#{xmId},</if>
             <if test="xmbh != null">#{xmbh},</if>
-            <if test="xmxsmc != null and xmxsmc != ''">#{xmxsmc},</if>
             <if test="xmmc != null and xmmc != ''">#{xmmc},</if>
+            <if test="xmxsmc != null and xmxsmc != ''">#{xmxsmc},</if>
             <if test="dfqyr != null and dfqyr != ''">#{dfqyr},</if>
             <if test="wfqyr != null and wfqyr != ''">#{wfqyr},</if>
             <if test="tbrq != null">#{tbrq},</if>