|
@@ -787,6 +787,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
|
|
|
if ("yes".equals(projectRecords.getAct().getFlag())) {
|
|
|
workActivityProcess.setIsApproval("1");
|
|
|
vars.put("pass", true);
|
|
|
+ vars.put("passs", true);
|
|
|
notifyRole = "审批通过";
|
|
|
//审批通过则需要给该项目添加一个报告前缀信息
|
|
|
String num = serialNumTplService.genSerialNum(UserUtils.getUser().getCompany(), "92");
|
|
@@ -801,6 +802,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
|
|
|
} else {
|
|
|
workActivityProcess.setIsApproval("2");
|
|
|
vars.put("pass", false);
|
|
|
+ vars.put("passs",false);
|
|
|
user = createUser;
|
|
|
notifyRole = "调整项目";
|
|
|
}
|
|
@@ -813,10 +815,12 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
|
|
|
if("yes".equals(projectRecords.getAct().getFlag())){
|
|
|
workActivityProcess.setIsApproval("1");
|
|
|
vars.put("pass",true);
|
|
|
+ vars.put("passs",true);
|
|
|
}else{
|
|
|
workActivityProcess.setIsApproval("2");
|
|
|
projectRecords.setProjectStatus(ProjectStatusEnum.RECALL.getValue());
|
|
|
vars.put("pass",false);
|
|
|
+ vars.put("passs",false);
|
|
|
}
|
|
|
break;
|
|
|
}
|