fix bug
parent
3feb9f9d43
commit
4cf41dd005
|
|
@ -174,13 +174,6 @@ public class EvalTechReviewExecutor implements EvalTechReviewApi {
|
||||||
EvalTechReviewEntity entity = evalTechReviewGateway.getByProjectId(projectId, project.getOrgId());
|
EvalTechReviewEntity entity = evalTechReviewGateway.getByProjectId(projectId, project.getOrgId());
|
||||||
if (entity == null) {
|
if (entity == null) {
|
||||||
throw new BizException(ErrorCode.EVAL_TECH_REVIEW_NOT_FOUND);
|
throw new BizException(ErrorCode.EVAL_TECH_REVIEW_NOT_FOUND);
|
||||||
// // 没有数据则新增,并下发签字任务
|
|
||||||
// entity = new EvalTechReviewEntity();
|
|
||||||
// entity.setOrgId(project.getOrgId());
|
|
||||||
// entity.setProjectId(projectId);
|
|
||||||
// entity.setStatusCode(1);
|
|
||||||
// entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode());
|
|
||||||
// evalTechReviewGateway.save(entity);
|
|
||||||
} else {
|
} else {
|
||||||
entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode());
|
entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode());
|
||||||
evalTechReviewGateway.modify(entity);
|
evalTechReviewGateway.modify(entity);
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,9 @@ public enum ProjectStageEnum {
|
||||||
REPORT_PREPARATION("REPORT_PREPARATION", "报告编制", "NODE_05"),
|
REPORT_PREPARATION("REPORT_PREPARATION", "报告编制", "NODE_05"),
|
||||||
INTERNAL_REVIEW("INTERNAL_REVIEW", "内部审核", "NODE_06"),
|
INTERNAL_REVIEW("INTERNAL_REVIEW", "内部审核", "NODE_06"),
|
||||||
TECHNICAL_REVIEW("TECHNICAL_REVIEW", "技术审核", "NODE_07"),
|
TECHNICAL_REVIEW("TECHNICAL_REVIEW", "技术审核", "NODE_07"),
|
||||||
PROCESS_CONTROL("PROCESS_CONTROL", "过程控制", "NODE_08");
|
PROCESS_CONTROL("PROCESS_CONTROL", "过程控制", "NODE_08"),
|
||||||
|
ARCHIVE("ARCHIVE", "归档", "NODE_09"),
|
||||||
|
;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
private final String val;
|
private final String val;
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,11 @@ public class EvalProjectGatewayImpl implements EvalProjectGateway {
|
||||||
dataObject.setArchiveFlag(0);
|
dataObject.setArchiveFlag(0);
|
||||||
}
|
}
|
||||||
InsertFieldDefaults.apply(dataObject);
|
InsertFieldDefaults.apply(dataObject);
|
||||||
dataObject.setProjectNode("[{\"type\":\"RISK_ANALYSIS\",\"state\":0},{\"type\":\"BUSINESS_CONTRACT\",\"state\":0},{\"type\":\"PROJECT_GROUP\",\"state\":0},{\"type\":\"SITE_SURVEY\",\"state\":0},{\"type\":\"REPORT_PREPARATION\",\"state\":0},{\"type\":\"INTERNAL_REVIEW\",\"state\":0},{\"type\":\"TECHNICAL_REVIEW\",\"state\":0},{\"type\":\"PROCESS_CONTROL\",\"state\":0}]");
|
dataObject.setProjectNode("[{\"type\":\"RISK_ANALYSIS\",\"state\":0}" +
|
||||||
|
",{\"type\":\"BUSINESS_CONTRACT\",\"state\":0},{\"type\":\"PROJECT_GROUP\",\"state\":0}," +
|
||||||
|
"{\"type\":\"SITE_SURVEY\",\"state\":0},{\"type\":\"REPORT_PREPARATION\",\"state\":0}" +
|
||||||
|
",{\"type\":\"INTERNAL_REVIEW\",\"state\":0},{\"type\":\"TECHNICAL_REVIEW\",\"state\":0}" +
|
||||||
|
",{\"type\":\"PROCESS_CONTROL\",\"state\":0},{\"type\":\"ARCHIVE\",\"state\":0}]");
|
||||||
evalProjectMapper.insert(dataObject);
|
evalProjectMapper.insert(dataObject);
|
||||||
entity.setId(dataObject.getId());
|
entity.setId(dataObject.getId());
|
||||||
return entity;
|
return entity;
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ public class EvalReportQueryServiceImpl implements EvalReportQueryService {
|
||||||
if (report.getFileUrl() != null) {
|
if (report.getFileUrl() != null) {
|
||||||
EvalProjectFileCO co = new EvalProjectFileCO();
|
EvalProjectFileCO co = new EvalProjectFileCO();
|
||||||
co.setProcessName(ProjectStageEnum.PROCESS_CONTROL.getMsg());
|
co.setProcessName(ProjectStageEnum.PROCESS_CONTROL.getMsg());
|
||||||
co.setItemName("归档报告");
|
co.setItemName(ProjectStageEnum.PROCESS_CONTROL.getMsg());
|
||||||
co.setProjectDocUrl(report.getFileUrl());
|
co.setProjectDocUrl(report.getFileUrl());
|
||||||
files.add(co);
|
files.add(co);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue