报销流程修改

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -336,7 +336,7 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
         //财务主任
         List<User> cws = UserUtils.getByRoleActivityEnname("cwzg",3,office.getId(),"8",workReimbursement.getCreateBy());
         //总经理
-        List<User> zjls = UserUtils.getByRoleActivityEnname("zjl",3,office.getId(),"8",workReimbursement.getCreateBy());
+        //List<User> zjls = UserUtils.getByRoleActivityEnname("zjl",3,office.getId(),"8",workReimbursement.getCreateBy());
         //财务分管领导
         //List<User> cwzjs = UserUtils.getByRoleActivityEnname("cwfgld",3,office.getId(),"8",workReimbursement.getCreateBy());
         //出纳
@@ -476,9 +476,9 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
             workActivityProcessService.save(workActivityProcess);
             workActivityProcess.setCount(2);
             workActivityProcess.setId("");
-            workActivityProcessService.save(workActivityProcess);
+            /*workActivityProcessService.save(workActivityProcess);
             workActivityProcess.setCount(3);
-            workActivityProcess.setId("");
+            workActivityProcess.setId("");*/
             /*workActivityProcessService.save(workActivityProcess);
             workActivityProcess.setCount(4);
             workActivityProcess.setId("");
@@ -492,7 +492,7 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
             workActivityProcessService.insertAuditsByType(bmzrs,processInstance.getId(),1,1);
             //workActivityProcessService.insertAuditsByType(fglds,processInstance.getId(),2,0);
             workActivityProcessService.insertAuditsByType(cws,processInstance.getId(),2,0);
-            workActivityProcessService.insertAuditsByType(zjls,processInstance.getId(),3,0);
+            //workActivityProcessService.insertAuditsByType(zjls,processInstance.getId(),3,0);
             //workActivityProcessService.insertAuditsByType(cwzjs,processInstance.getId(),5,0);
             //workActivityProcessService.insertAuditsByType(cns,processInstance.getId(),6,0);
         }
@@ -823,6 +823,13 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                     taskCount = "2";
                     exp = "pass";
                     if ("yes".equals(workReimbursement.getAct().getFlag())) {
+                        notifyRole = "审批通过";
+                        workActivityProcess.setIsApproval("1");
+                    } else {
+                        notifyRole = "调整报销";
+                        workActivityProcess.setIsApproval("2");
+                    }
+                   /* if ("yes".equals(workReimbursement.getAct().getFlag())) {
                         workActivityProcessService.insertAuditsByType(auditUsers,workReimbursement.getProcessInstanceId(),4,1);
                         notifyRole = "总经理审核";
                         workActivityProcess.setIsApproval("1");
@@ -832,12 +839,12 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                     } else {
                         notifyRole = "调整报销";
                         workActivityProcess.setIsApproval("2");
-                    }
+                    }*/
                     break;
-                } else if ("zjl".equals(taskDefKey) && count.contains("3")) {
+                } /*else if ("zjl".equals(taskDefKey) && count.contains("3")) {
                     taskCount = "3";
                     exp = "pass";
-                    /*if ("yes".equals(workReimbursement.getAct().getFlag())) {
+                    *//*if ("yes".equals(workReimbursement.getAct().getFlag())) {
                         notifyRole = "财务分管领导审核";
                         workActivityProcessService.insertAuditsByType(auditUsers,workReimbursement.getProcessInstanceId(),5,1);
 
@@ -848,7 +855,7 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                     } else {
                         workActivityProcess.setIsApproval("2");
                         notifyRole = "调整报销";
-                    }*/
+                    }*//*
                     if ("yes".equals(workReimbursement.getAct().getFlag())) {
                         notifyRole = "审批通过";
                         workActivityProcess.setIsApproval("1");
@@ -857,7 +864,7 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                         workActivityProcess.setIsApproval("2");
                     }
                     break;
-                } /*else if ("cwzj".equals(taskDefKey) && count.contains("5")) {
+                }*/ /*else if ("cwzj".equals(taskDefKey) && count.contains("5")) {
                     taskCount = "5";
                     exp = "pass";
                     if ("yes".equals(workReimbursement.getAct().getFlag())) {

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementController.java

@@ -346,13 +346,14 @@ public class WorkReimbursementController extends BaseController {
 			}*/else  if ("cw".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);
 				if (users==null )
-				users = UserUtils.getByRoleActivityEnname("zjl",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
-			}else  if ("zjl".equals(taskDefKey)){
-				/*users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),5);
+					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
+				//users = UserUtils.getByRoleActivityEnname("zjl",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
+			}/*else  if ("zjl".equals(taskDefKey)){
+				*//*users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),5);
 				if (users==null )
-					users = UserUtils.getByRoleActivityEnname("cwfgld",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());*/
+					users = UserUtils.getByRoleActivityEnname("cwfgld",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());*//*
 				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
-			}/*else if ("cwzj".equals(taskDefKey)){
+			}*//*else if ("cwzj".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),6);
 				if (users==null )
 					users = UserUtils.getByRoleActivityEnname("cn",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());