11

src/main/java/com/jeeplus/modules/workchangejob/service/WorkChangeJobService.java

@@ -179,7 +179,7 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 				createBy = UserUtils.getUser();
 				workChangeJob.setCreateBy(createBy);
 			}
-			workChangeJob.setNumber(serialNumTplService.genSerialNum(createBy.getCompany(),"21"));
+			workChangeJob.setNumber(serialNumTplService.genSerialNum(createBy.getCompany(),"20"));
 		}
 		this.save(workChangeJob);
 		return this.startAudit(workChangeJob,workChangeJob.getProcessInstanceId());
@@ -258,6 +258,8 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 					this.save(workChangeJob);
 					return "流程审批人不能为空,,请联系管理员！";
 				}
+				variables.put("bmzrList", rlzybzrList);
+				variables.put("bmzrCount",rlzybzrList.size());
 				processType = "changeJob";
 				users.addAll(rlzybzrList);
 			}
@@ -423,7 +425,8 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 					exp = "pass";
 					if ("yes".equals(flag)) {
 						workActivityProcessService.insertAuditsByType(auditUsers,workChangeJob.getProcessInstanceId(),2,1);
-
+						vars.put("fgldList", auditUsers);
+						vars.put("fgldCount",auditUsers.size());
 						notifyRole = "分管领导审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "fgld";
@@ -439,7 +442,8 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 					exp = "pass";
 					if ("yes".equals(flag)) {
 						workActivityProcessService.insertAuditsByType(auditUsers,workChangeJob.getProcessInstanceId(),3,1);
-
+						vars.put("zjlList", auditUsers);
+						vars.put("zjlCount",auditUsers.size());
 						notifyRole = "总经理审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "zjl";

src/main/java/com/jeeplus/modules/workofficechange/service/WorkOfficeChangeService.java

@@ -303,11 +303,13 @@ public class WorkOfficeChangeService extends CrudService<WorkOfficeChangeDao, Wo
 				}
 				workProjectNotify.setId("");
 			} else {
+				variables.put("bmzrList", bmzrList);
 				if (bmzrList.size()==0 ){
 					workOfficeChange.setState("1");
 					this.save(workOfficeChange);
 					return "流程审批人不能为空,请联系管理员！";
 				}
+				variables.put("bmzrCount",bmzrList.size());
 				processType = "workOfficeChange";
 				users.addAll(bmzrList);
 			}
@@ -472,8 +474,9 @@ public class WorkOfficeChangeService extends CrudService<WorkOfficeChangeDao, Wo
 					taskCount = "1";
 					exp = "pass";
 					if ("yes".equals(flag)) {
+						vars.put("fgldList", auditUsers);
+						vars.put("fgldCount",auditUsers.size());
 						workActivityProcessService.insertAuditsByType(auditUsers,workOfficeChange.getProcessInstanceId(),2,1);
-
 						notifyRole = "分管领导审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "fgld";
@@ -488,8 +491,9 @@ public class WorkOfficeChangeService extends CrudService<WorkOfficeChangeDao, Wo
 					taskCount = "2";
 					exp = "pass";
 					if ("yes".equals(flag)) {
+						vars.put("zjlList", auditUsers);
+						vars.put("zjlCount",auditUsers.size());
 						workActivityProcessService.insertAuditsByType(auditUsers,workOfficeChange.getProcessInstanceId(),3,1);
-
 						notifyRole = "总经理审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "zjl";

src/main/java/com/jeeplus/modules/workregularapply/service/WorkRegularApplyService.java

@@ -462,12 +462,13 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 					workActivityProcess.setId("");
 				}
 				// 审核环节
-				if ("zzr".equals(taskDefKey)) {
+				if ("zzr".equals(taskDefKey) && count.contains("1")) {
 					taskCount = "1";
 					exp = "pass";
 					if ("yes".equals(flag)) {
 						workActivityProcessService.insertAuditsByType(auditUsers,workRegularApply.getProcessInstanceId(),2,1);
-
+						vars.put("ywbfzrList", auditUsers);
+						vars.put("ywbfzrCount",auditUsers.size());
 						notifyRole = "部门主任审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "bmzr";
@@ -483,7 +484,8 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 					exp = "pass";
 					if ("yes".equals(flag)) {
 						workActivityProcessService.insertAuditsByType(auditUsers,workRegularApply.getProcessInstanceId(),3,1);
-
+						vars.put("fgldList", auditUsers);
+						vars.put("fgldCount",auditUsers.size());
 						notifyRole = "分管领导审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "fgld";
@@ -497,7 +499,8 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 					exp = "pass";
 					if ("yes".equals(flag)) {
 						workActivityProcessService.insertAuditsByType(auditUsers,workRegularApply.getProcessInstanceId(),4,1);
-
+						vars.put("zjlList", auditUsers);
+						vars.put("zjlCount",auditUsers.size());
 						notifyRole = "总经理审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "zjl";
@@ -511,7 +514,8 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 					exp = "pass";
 					if ("yes".equals(flag)) {
 						workActivityProcessService.insertAuditsByType(auditUsers,workRegularApply.getProcessInstanceId(),5,1);
-
+						vars.put("rlzyList", auditUsers);
+						vars.put("rlzyCount",auditUsers.size());
 						notifyRole = "人力专员审核";
 						workActivityProcess.setIsApproval("1");
 						enname = "rlzy";

src/main/java/com/jeeplus/modules/workregularapply/web/WorkRegularApplyController.java

@@ -293,7 +293,7 @@ public class WorkRegularApplyController extends BaseController {
 	@RequestMapping(value = "saveAudit")
 	public String saveAudit(WorkRegularApply workRegularApply, Model model,
 							RedirectAttributes redirectAttributes) {
-		try {
+//		try {
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = workRegularApply.getAct().getTaskDefKey();
 			User user=userDao.get(workRegularApply.getUserId());
@@ -330,10 +330,10 @@ public class WorkRegularApplyController extends BaseController {
 				String str = workRegularApplyService.auditSave(workRegularApply,users);
 				addMessage(redirectAttributes, str);
 			}
-		}catch (Exception e){
-			logger.info("Exception e:"+e);
-			addMessage(redirectAttributes, "审批失败");
-		}
+//		}catch (Exception e){
+//			logger.info("Exception e:"+e);
+//			addMessage(redirectAttributes, "审批失败");
+//		}
 		if (StringUtils.isNotBlank(workRegularApply.getHome()) && "home".equals(workRegularApply.getHome())) {
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
 		} else {