|  | @@ -216,9 +216,9 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 | 
	
		
			
				|  |  |  					);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  			List<User> users = new ArrayList<>();
 | 
	
		
			
				|  |  | -			List<User> rlzybzrList = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"23",workChangeJob.getCreateBy());
 | 
	
		
			
				|  |  | -			List<User> fgldList = UserUtils.getByRoleActivityEnname("fgld",2,office.getId(),"23",workChangeJob.getCreateBy());
 | 
	
		
			
				|  |  | -			List<User> zjlList = UserUtils.getByRoleActivityEnname("zjl",3,office.getId(),"23",workChangeJob.getCreateBy());
 | 
	
		
			
				|  |  | +			List<User> rszrList = UserUtils.findRszrList(createUser);
 | 
	
		
			
				|  |  | +//			List<User> fgldList = UserUtils.getByRoleActivityEnname("fgld",2,office.getId(),"23",workChangeJob.getCreateBy());
 | 
	
		
			
				|  |  | +//			List<User> zjlList = UserUtils.getByRoleActivityEnname("zjl",3,office.getId(),"23",workChangeJob.getCreateBy());
 | 
	
		
			
				|  |  |  			if (StringUtils.isNotBlank(workActivityMenu.getId())) {
 | 
	
		
			
				|  |  |  				workProjectNotify.setNotifyRole("");
 | 
	
		
			
				|  |  |  				workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());
 | 
	
	
		
			
				|  | @@ -253,28 +253,28 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 | 
	
		
			
				|  |  |  				}
 | 
	
		
			
				|  |  |  				workProjectNotify.setId("");
 | 
	
		
			
				|  |  |  			} else {
 | 
	
		
			
				|  |  | -				if (rlzybzrList.size()==0 ){
 | 
	
		
			
				|  |  | +				if (rszrList.size()==0 ){
 | 
	
		
			
				|  |  |  					workChangeJob.setState("1");
 | 
	
		
			
				|  |  |  					this.save(workChangeJob);
 | 
	
		
			
				|  |  |  					return "流程审批人不能为空,,请联系管理员!";
 | 
	
		
			
				|  |  |  				}
 | 
	
		
			
				|  |  | -				variables.put("bmzrList", rlzybzrList);
 | 
	
		
			
				|  |  | -				variables.put("bmzrCount",rlzybzrList.size());
 | 
	
		
			
				|  |  | -				processType = "changeJob";
 | 
	
		
			
				|  |  | -				users.addAll(rlzybzrList);
 | 
	
		
			
				|  |  | +				variables.put("bmzrList", rszrList);
 | 
	
		
			
				|  |  | +				variables.put("bmzrCount",rszrList.size());
 | 
	
		
			
				|  |  | +				processType = "rankAdjust";
 | 
	
		
			
				|  |  | +				users.addAll(rszrList);
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  |  			List<String> userIds = new ArrayList<>(users.size());
 | 
	
		
			
				|  |  |  			for (User u : users){
 | 
	
		
			
				|  |  |  				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","7001");
 | 
	
		
			
				|  |  | -				extras.put("procDefKey","70");
 | 
	
		
			
				|  |  | -				extras.put("id",workProjectNotify.getId());
 | 
	
		
			
				|  |  | -				UserUtils.pushInfoToApp(titleStr, contentStr,extras,u.getId());
 | 
	
		
			
				|  |  | +//				Map<String,Object> extras = new HashMap<>();
 | 
	
		
			
				|  |  | +//				extras.put("type","7001");
 | 
	
		
			
				|  |  | +//				extras.put("procDefKey","70");
 | 
	
		
			
				|  |  | +//				extras.put("id",workProjectNotify.getId());
 | 
	
		
			
				|  |  | +//				UserUtils.pushInfoToApp(titleStr, contentStr,extras,u.getId());
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  |  			UserUtils.pushIm(userIds,contentStr);
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -298,13 +298,13 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 | 
	
		
			
				|  |  |  				workActivityProcess.setProcessInstanceId(processInstance.getId());
 | 
	
		
			
				|  |  |  				workActivityProcess.setIsApproval("0");
 | 
	
		
			
				|  |  |  				workActivityProcessService.insert(workActivityProcess);
 | 
	
		
			
				|  |  | -				workActivityProcess.setCount(2);
 | 
	
		
			
				|  |  | -				workActivityProcessService.insert(workActivityProcess);
 | 
	
		
			
				|  |  | -				workActivityProcess.setCount(3);
 | 
	
		
			
				|  |  | -				workActivityProcessService.insert(workActivityProcess);
 | 
	
		
			
				|  |  | -				workActivityProcessService.insertAuditsByType(rlzybzrList,processInstance.getId(),1,1);
 | 
	
		
			
				|  |  | -				workActivityProcessService.insertAuditsByType(fgldList,processInstance.getId(),2,0);
 | 
	
		
			
				|  |  | -				workActivityProcessService.insertAuditsByType(zjlList,processInstance.getId(),3,0);
 | 
	
		
			
				|  |  | +//				workActivityProcess.setCount(2);
 | 
	
		
			
				|  |  | +//				workActivityProcessService.insert(workActivityProcess);
 | 
	
		
			
				|  |  | +//				workActivityProcess.setCount(3);
 | 
	
		
			
				|  |  | +//				workActivityProcessService.insert(workActivityProcess);
 | 
	
		
			
				|  |  | +				workActivityProcessService.insertAuditsByType(rszrList,processInstance.getId(),1,1);
 | 
	
		
			
				|  |  | +//				workActivityProcessService.insertAuditsByType(fgldList,processInstance.getId(),2,0);
 | 
	
		
			
				|  |  | +//				workActivityProcessService.insertAuditsByType(zjlList,processInstance.getId(),3,0);
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  |  			workChangeJob.setProcessInstanceId(processInstance.getId());
 | 
	
		
			
				|  |  |  			workChangeJob.setState("2");
 | 
	
	
		
			
				|  | @@ -366,7 +366,7 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 | 
	
		
			
				|  |  |  		selectProcess.setProcessInstanceId(workChangeJob.getProcessInstanceId());
 | 
	
		
			
				|  |  |  		List<WorkActivityProcess> workActivityProcesses = workActivityProcessService.findList(selectProcess);
 | 
	
		
			
				|  |  |  		List<Activity> activities = workActivityMenu.getActivities();
 | 
	
		
			
				|  |  | -		if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("changeJob")) {
 | 
	
		
			
				|  |  | +		if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("rankAdjust")) {
 | 
	
		
			
				|  |  |  			key = 1;
 | 
	
		
			
				|  |  |  			for (int i = 0; i < workActivityProcesses.size(); i++) {
 | 
	
		
			
				|  |  |  				WorkActivityProcess activityProcess = workActivityProcesses.get(i);
 | 
	
	
		
			
				|  | @@ -411,7 +411,7 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 | 
	
		
			
				|  |  |  				}
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  |  		} else {
 | 
	
		
			
				|  |  | -			workActivityMenu.setProcessType("changeJob");
 | 
	
		
			
				|  |  | +			workActivityMenu.setProcessType("rankAdjust");
 | 
	
		
			
				|  |  |  			for (int i = 0; i < workActivityProcesses.size(); i++) {
 | 
	
		
			
				|  |  |  				WorkActivityProcess activityProcess = workActivityProcesses.get(i);
 | 
	
		
			
				|  |  |  				String count = activityProcess.getCount() + "";
 | 
	
	
		
			
				|  | @@ -420,42 +420,10 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 | 
	
		
			
				|  |  |  					workActivityProcess.setId("");
 | 
	
		
			
				|  |  |  				}
 | 
	
		
			
				|  |  |  				// 审核环节
 | 
	
		
			
				|  |  | -				if ("bmzr".equals(taskDefKey) && count.contains("1")) {
 | 
	
		
			
				|  |  | +				 if ("bmzr".equals(taskDefKey) && count.contains("1")) {
 | 
	
		
			
				|  |  |  					taskCount = "1";
 | 
	
		
			
				|  |  |  					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";
 | 
	
		
			
				|  |  | -					} else {
 | 
	
		
			
				|  |  | -						notifyRole = "调整申请";
 | 
	
		
			
				|  |  | -						workActivityProcess.setIsApproval("2");
 | 
	
		
			
				|  |  | -					}
 | 
	
		
			
				|  |  | -					break;
 | 
	
		
			
				|  |  | -				}
 | 
	
		
			
				|  |  | -				// 审核环节
 | 
	
		
			
				|  |  | -				else if ("fgld".equals(taskDefKey) && count.contains("2")) {
 | 
	
		
			
				|  |  | -					taskCount = "2";
 | 
	
		
			
				|  |  | -					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";
 | 
	
		
			
				|  |  | -					} else {
 | 
	
		
			
				|  |  | -						notifyRole = "调整申请";
 | 
	
		
			
				|  |  | -						workActivityProcess.setIsApproval("2");
 | 
	
		
			
				|  |  | -					}
 | 
	
		
			
				|  |  | -					break;
 | 
	
		
			
				|  |  | -				} else if ("zjl".equals(taskDefKey) && count.contains("3")) {
 | 
	
		
			
				|  |  | -					taskCount = "3";
 | 
	
		
			
				|  |  | -					exp = "pass";
 | 
	
		
			
				|  |  | -					if ("yes".equals(flag)) {
 | 
	
		
			
				|  |  |  						notifyRole = "审批通过";
 | 
	
		
			
				|  |  |  						//修改职级
 | 
	
		
			
				|  |  |  						if(workChangeJob.getWorkChangeJobUserList()!=null&&workChangeJob.getWorkChangeJobUserList().size()>0){
 | 
	
	
		
			
				|  | @@ -477,7 +445,7 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 | 
	
		
			
				|  |  |  					}
 | 
	
		
			
				|  |  |  					break;
 | 
	
		
			
				|  |  |  				}  else if ("modifyApply".equals(taskDefKey)&& count.contains("0")) {
 | 
	
		
			
				|  |  | -					notifyRole = "部门负责人审核";
 | 
	
		
			
				|  |  | +					notifyRole = "人事主任审核";
 | 
	
		
			
				|  |  |  					taskCount = "0";
 | 
	
		
			
				|  |  |  					exp = "pass";
 | 
	
		
			
				|  |  |  					workActivityProcess.setCount(0);
 | 
	
	
		
			
				|  | @@ -494,6 +462,7 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 | 
	
		
			
				|  |  |  		workChangeJob.preUpdate();
 | 
	
		
			
				|  |  |  		// 提交流程任务
 | 
	
		
			
				|  |  |  		vars.put(exp, "yes".equals(flag) ? true : false);
 | 
	
		
			
				|  |  | +		vars.put("passs", true);
 | 
	
		
			
				|  |  |  		workActivityProcessService.updateProcess(workActivityProcess,workActivityMenu,key,taskCount,workChangeJob.getProcessInstanceId(),taskDefKey,"modifyApply",flag,comment, activities);
 | 
	
		
			
				|  |  |  		// 提交流程任务
 | 
	
		
			
				|  |  |  		actTaskService.complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 | 
	
	
		
			
				|  | @@ -541,7 +510,7 @@ public class WorkChangeJobService extends CrudService<WorkChangeJobDao, WorkChan
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  |  			workActivityProcessService.deleteProcessIdAuditUsers(workChangeJob.getProcessInstanceId());
 | 
	
		
			
				|  |  |  		} else {
 | 
	
		
			
				|  |  | -			if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("changeJob")) {
 | 
	
		
			
				|  |  | +			if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("rankAdjust")) {
 | 
	
		
			
				|  |  |  				WorkProjectNotify notify = new WorkProjectNotify();
 | 
	
		
			
				|  |  |  				notify.setNotifyId(workChangeJob.getId());
 | 
	
		
			
				|  |  |  				userList = workProjectNotifyService.readByNotifyId(notify);
 |