|
@@ -988,8 +988,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
|
|
|
workActivityProcess.setIsApproval("0");
|
|
|
workActivityProcessService.save(workActivityProcess);
|
|
|
workActivityProcess.setCount(2);
|
|
|
- workActivityProcess.setId("");
|
|
|
- workActivityProcessService.save(workActivityProcess);
|
|
|
+ workActivityProcessService.insert(workActivityProcess);
|
|
|
workActivityProcessService.insertAuditsByType(bmzrs,processInstance.getId(),1,1);
|
|
|
workActivityProcessService.insertAuditsByType(zjls,processInstance.getId(),2,0);
|
|
|
// workActivityProcessService.insertAuditsByType(fglds,processInstance.getId(),3,0);
|
|
@@ -1616,6 +1615,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
|
|
|
notifyRole = "调整报告";
|
|
|
workActivityProcess.setIsApproval("2");
|
|
|
}
|
|
|
+ break;
|
|
|
} else if ("zjl".equals(taskDefKey) && count.contains("2")) {
|
|
|
taskCount = "2";
|
|
|
exp = "pass";
|