新增报告流程修改

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

@@ -832,7 +832,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         selectProcess.setProcessInstanceId(projectReportData.getProcessInstanceId());
         List<WorkActivityProcess> workActivityProcesses = workActivityProcessService.findList(selectProcess);
         List<Activity> activities = workActivityMenu.getActivities();
-        if (com.jeeplus.common.utils.StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("newReportAudit")) {
+        if (com.jeeplus.common.utils.StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("newFirstReportAudit")) {
             key = 1;
             for (int i = 0; i < workActivityProcesses.size(); i++) {
                 WorkActivityProcess activityProcess = workActivityProcesses.get(i);
@@ -877,7 +877,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 }
             }
         } else {
-            workActivityMenu.setProcessType("newReportAudit");
+            workActivityMenu.setProcessType("newFirstReportAudit");
             for (int i = 0; i < workActivityProcesses.size(); i++) {
                 WorkActivityProcess activityProcess = workActivityProcesses.get(i);
                 String count = activityProcess.getCount() + "";
@@ -886,7 +886,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                     workActivityProcess.setId("");
                 }
                 // 审核环节
-                if ("bmzr".equals(taskDefKey) && count.contains("1")) {
+                /*if ("bmzr".equals(taskDefKey) && count.contains("1")) {
                     taskCount = "1";
                     exp = "pass";
                     if ("yes".equals(flag)) {
@@ -902,8 +902,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                         workActivityProcess.setIsApproval("2");
                     }
                     break;
-                }else if ("bzshb".equals(taskDefKey) && count.contains("2")) {
-                    taskCount = "2";
+                }else */if ("bzshb".equals(taskDefKey) && count.contains("1")) {
+                    taskCount = "1";
                     exp = "pass";
                     if ("yes".equals(flag)) {
                         projectReportData.setTechnicistDate(new Date());
@@ -943,7 +943,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                     }
                     break;
                 } else if ("modifyApply".equals(taskDefKey)&& count.contains("0")) {
-                    notifyRole = "负责人审批";
+                    notifyRole = "总审审批";
                     taskCount = "0";
                     exp = "pass";
                     workActivityProcess.setCount(0);
@@ -1011,7 +1011,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             }
             workActivityProcessService.deleteProcessIdAuditUsers(projectReportData.getProcessInstanceId());
         } else {
-            if (com.jeeplus.common.utils.StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("newReportAudit")) {
+            if (com.jeeplus.common.utils.StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("newFirstReportAudit")) {
                 WorkProjectNotify notify = new WorkProjectNotify();
                 notify.setNotifyId(projectReportData.getId());
                 userList = workProjectNotifyService.readByNotifyId(notify);
@@ -1634,17 +1634,19 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             }
             workProjectNotify.setId("");
         } else {
-            if (bmzrs.size()==0 ){
+            if (bzshbs.size()==0 ){
                 projectReportData.setStatus("1");
                 projectReportDataService.save(projectReportData);
             }
-            if (bmzrs.size()==0){
+            if (bzshbs.size()==0){
                 return "流程审批人不能为空,项目负责人下无用户,请联系管理员！";
             }
-            processType = "newReportAudit";
-            users.addAll(bmzrs);
-            variables.put("bmzrList", bmzrs);
-            variables.put("bmzrCount", bmzrs.size());
+            processType = "newFirstReportAudit";
+            users.addAll(bzshbs);
+            //variables.put("bmzrList", bmzrs);
+            //variables.put("bmzrCount", bmzrs.size());
+            variables.put("bzshbList", bzshbs);
+            variables.put("bzshbcount", bzshbs.size());
         }
         for (User u : users){
             workProjectNotify.setUser(u);
@@ -1686,12 +1688,13 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             workActivityProcess.setProcessInstanceId(processInstance.getId());
             workActivityProcess.setIsApproval("0");
             workActivityProcessService.insert(workActivityProcess);
-            workActivityProcess.setCount(2);
-            workActivityProcessService.insert(workActivityProcess);
+            /*workActivityProcess.setCount(2);
+            workActivityProcessService.insert(workActivityProcess);*/
             //workActivityProcess.setCount(3);
             //workActivityProcessService.insert(workActivityProcess);
-            workActivityProcessService.insertAuditsByType(bmzrs,processInstance.getId(),1,1);
-            workActivityProcessService.insertAuditsByType(bzshbs,processInstance.getId(),2,0);
+            //workActivityProcessService.insertAuditsByType(bmzrs,processInstance.getId(),1,1);
+            workActivityProcessService.insertAuditsByType(bzshbs,processInstance.getId(),1,1);
+            //workActivityProcessService.insertAuditsByType(bzshbs,processInstance.getId(),2,0);
             //workActivityProcessService.insertAuditsByType(gzrs,processInstance.getId(),3,0);
         }
         return "true";

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -835,7 +835,7 @@ public class RuralCostProjectMessageController extends BaseController {
         User auditUser = null;
         ProjectRecords projectRecord = projectRecordsServices.getRuralMasters(projectcontentinfo.getProject().getId());
         projectReportData.setProject(projectRecord);
-        if ("bmzr".equals(taskDefKey)){
+        /*if ("bmzr".equals(taskDefKey)){
             users = UserUtils.getByProssType(t.getProcessInstanceId(),2);
             if (users==null ) {
                 users = Lists.newArrayList();
@@ -844,7 +844,7 @@ public class RuralCostProjectMessageController extends BaseController {
                 users.add(auditUser);
             }
                 //users = UserUtils.getByRoleActivityEnname("bzshb",3,t.getOfficeId(),"12",t.getCreateBy());
-        }else if ("bzshb".equals(taskDefKey)){
+        }else */if ("bzshb".equals(taskDefKey)){
             users = UserUtils.getByProssType(t.getProcessInstanceId(),5);
             if (users==null ) {
                 users = Lists.newArrayList();

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -861,7 +861,7 @@ public class RuralProjectMessageController extends BaseController {
         User auditUser = null;
         ProjectRecords projectRecord = projectRecordsServices.getRuralMasters(projectcontentinfo.getProject().getId());
         projectReportData.setProject(projectRecord);
-        if ("bmzr".equals(taskDefKey)){
+        /*if ("bmzr".equals(taskDefKey)){
             users = UserUtils.getByProssType(t.getProcessInstanceId(),2);
             if (users==null ) {
                 users = Lists.newArrayList();
@@ -870,7 +870,7 @@ public class RuralProjectMessageController extends BaseController {
                 users.add(auditUser);
             }
                 //users = UserUtils.getByRoleActivityEnname("bzshb",3,t.getOfficeId(),"12",t.getCreateBy());
-        }else if ("bzshb".equals(taskDefKey)){
+        }else */if ("bzshb".equals(taskDefKey)){
             users = UserUtils.getByProssType(t.getProcessInstanceId(),5);
             if (users==null ) {
                 users = Lists.newArrayList();

src/main/resources/jeeplus.properties

@@ -152,9 +152,9 @@ endpoint=http://oss-cn-hangzhou.aliyuncs.com
 accessKeyId=LTAI5tQDWoM9c1WyJNPs86rX
 accessKeySecret=84dDIx4edT1n78KUOqqSmDZ35pchJv
 #\u5F00\u53D1\u73AF\u5883
-#bucketName=xgxm-test
+bucketName=xgxm-test
 #\u751F\u4EA7\u73AF\u5883
-bucketName=xg-ccpm
+#bucketName=xg-ccpm
 avatarDir=app-img/avatar/
 notifyDir=app-img/notify/
 reportDir=app-img/report/