Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectImplementEarlyService.java

@@ -401,7 +401,7 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
                 userIds.add(u.getId());
                 workProjectNotify.setUser(u);
                 workProjectNotify.setId("");
-                workProjectNotify.setNotifyRole("总工审批");
+                workProjectNotify.setNotifyRole("总审室审批");
                 workProjectNotifyService.save(workProjectNotify);
                 Map<String,Object> extras = new HashMap<>();
                 extras.put("type","7003");
@@ -577,7 +577,7 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
                     }
                     break;
                 } else if ("modifyApply".equals(taskDefKey) && "0".equals(count)) {
-                    notifyRole = "总工审批";
+                    notifyRole = "总审室审批";
                     taskCount = "0";
                     enname = "bmzr";
                     workActivityProcess.setCount(0);

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralPeojectRecordChooseCheckAllService.java

@@ -410,7 +410,7 @@ public class RuralPeojectRecordChooseCheckAllService extends CrudService<RuralPe
                 if ("master".equals(taskDefKey) && "1".equals(count)) {
                     taskCount = count;
                     if ("yes".equals(projectRecords.getAct().getFlag())) {
-                        notifyRole = "总工审批";
+                        notifyRole = "总审室审批";
                         workActivityProcess.setIsApproval("1");
                         enname = "bzshb";
                         vars.put("bzshbList", auditUsers);

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralPeojectRecordChooseCheckService.java

@@ -452,7 +452,7 @@ public class RuralPeojectRecordChooseCheckService extends CrudService<RuralPeoje
                     taskCount = count;
                     if ("yes".equals(projectRecords.getAct().getFlag())) {
                         projectRecords.setCheckStatus(ProjectStatusEnum.IN_APRL.getValue());
-                        notifyRole = "总工审批";
+                        notifyRole = "总审室审批";
                         workActivityProcess.setIsApproval("1");
                         enname = "bzshb";
                         vars.put("bzshbList", auditUsers);

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewService.java

@@ -1109,7 +1109,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                     }
                     break;
                 } else if ("modifyApply".equals(taskDefKey)&& count.contains("0")) {
-                    notifyRole = "总工审批";
+                    notifyRole = "总审室审批";
                     taskCount = "0";
                     exp = "pass";
                     workActivityProcess.setCount(0);
@@ -1678,7 +1678,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         }
         for (User u : users){
             workProjectNotify.setUser(u);
-            workProjectNotify.setNotifyRole("部门主任审批");
+            workProjectNotify.setNotifyRole("总审室审批");
             workProjectNotify.setId("");
             workProjectNotifyService
                     .save(workProjectNotify);
@@ -1826,7 +1826,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         }
         for (User u : users){
             workProjectNotify.setUser(u);
-            workProjectNotify.setNotifyRole("部门主任审批");
+            workProjectNotify.setNotifyRole("总审室审批");
             workProjectNotify.setId("");
             workProjectNotifyService
                     .save(workProjectNotify);

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewTwoService.java

@@ -792,7 +792,7 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
                     }
                     break;
                 } else if ("modifyApply".equals(taskDefKey)&& count.contains("0")) {
-                    notifyRole = "总工审批";
+                    notifyRole = "总审室审批";
                     taskCount = "0";
                     exp = "pass";
                     workActivityProcess.setCount(0);