天气调整

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

@@ -527,7 +527,7 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 		// 提交流程任务
 		vars.put(exp, "yes".equals(flag) ? true : false);
 		vars.put("passs", true);
-		workActivityProcessService.updateProcessRegular(workActivityProcess,workActivityMenu,key,taskCount,workRegularApply.getProcessInstanceId(),taskDefKey,"modifyApply",flag,comment, activities);
+		workActivityProcessService.updateProcess(workActivityProcess,workActivityMenu,key,taskCount,workRegularApply.getProcessInstanceId(),taskDefKey,"modifyApply",flag,comment, activities);
 		// 提交流程任务
 		actTaskService.complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 		boolean state = actTaskService.isProcessEnd(act.getProcInsId());
@@ -623,7 +623,7 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 											str,
 											"66",
 											"0",
-											"待审批",
+											"重新申请",
 											notifyRole));
 					users.add(zzrUser);
 				} else {
@@ -668,7 +668,7 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 												str,
 												"66",
 												"0",
-												"待审批",
+												"重新申请",
 												notifyRole));
 					}
 				}