cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug

dev
luotaiqian 2026-07-31 14:03:05 +08:00
parent 4cf41dd005
commit ca6a702240
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java
View File

@ -609,7 +609,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
} }
/** /**
* 过程控制前置节点校验：除 PROCESS_CONTROL 节点外，其余节点 state 必须全部为 1（完成）。 * 过程控制前置节点校验：除 PROCESS_CONTROL、ARCHIVE 节点外，其余节点 state 必须全部为 1（完成）。
*/ */
private void assertPreNodesCompleted(EvalProjectEntity project) { private void assertPreNodesCompleted(EvalProjectEntity project) {
String projectNode = project.getProjectNode(); String projectNode = project.getProjectNode();
@ -621,7 +621,8 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
throw new BizException(ErrorCode.EVAL_PROCESS_PRE_NODES_INCOMPLETE); throw new BizException(ErrorCode.EVAL_PROCESS_PRE_NODES_INCOMPLETE);
} }
boolean allCompleted = nodes.stream() boolean allCompleted = nodes.stream()
.filter(n -> !ProjectStageEnum.PROCESS_CONTROL.getVal().equals(n.getType())) .filter(n -> !ProjectStageEnum.PROCESS_CONTROL.getVal().equals(n.getType())
&& !ProjectStageEnum.ARCHIVE.getVal().equals(n.getType()))
.allMatch(n -> n.getState() != null && n.getState() == 1); .allMatch(n -> n.getState() != null && n.getState() == 1);
if (!allCompleted) { if (!allCompleted) {
throw new BizException(ErrorCode.EVAL_PROCESS_PRE_NODES_INCOMPLETE); throw new BizException(ErrorCode.EVAL_PROCESS_PRE_NODES_INCOMPLETE);

7
safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/ProjectNodeCO.java
View File

@ -1,11 +1,13 @@
package org.qinan.safetyeval.client.co.institution; package org.qinan.safetyeval.client.co.institution;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
/** /**
* 项目节点完成进度中的单个节点对象 * 项目节点完成进度中的单个节点对象
*/ */
@Data @Data
@NoArgsConstructor
public class ProjectNodeCO { public class ProjectNodeCO {
/** /**
* @ProjectNode * @ProjectNode
@ -15,4 +17,9 @@ public class ProjectNodeCO {
* 0未完成 1完成 * 0未完成 1完成
*/ */
private Integer state; private Integer state;
public ProjectNodeCO(String type, Integer state) {
this.type = type;
this.state = state;
}
} }

13
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalProjectGatewayImpl.java
View File

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.qinan.safetyeval.client.co.institution.ProjectNodeCO; import org.qinan.safetyeval.client.co.institution.ProjectNodeCO;
import org.qinan.safetyeval.domain.constant.EvalProjectProgressStatEnum; import org.qinan.safetyeval.domain.constant.EvalProjectProgressStatEnum;
import org.qinan.safetyeval.domain.constant.ProjectStageEnum;
import org.qinan.safetyeval.domain.entity.EvalProjectEntity; import org.qinan.safetyeval.domain.entity.EvalProjectEntity;
import org.qinan.safetyeval.domain.gateway.EvalProjectGateway; import org.qinan.safetyeval.domain.gateway.EvalProjectGateway;
import org.qinan.safetyeval.domain.query.EvalProjectQuery; import org.qinan.safetyeval.domain.query.EvalProjectQuery;
@ -46,8 +47,6 @@ public class EvalProjectGatewayImpl implements EvalProjectGateway {
@Resource @Resource
private OrgContextResolver orgContextResolver; private OrgContextResolver orgContextResolver;
@Autowired @Autowired
private EvalSignTaskMapper evalSignTaskMapper;
@Autowired
private EvalSurveyMapper evalSurveyMapper; private EvalSurveyMapper evalSurveyMapper;
@Override @Override
@ -58,11 +57,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}" + List<ProjectNodeCO> projectNodes = new ArrayList<>();
",{\"type\":\"BUSINESS_CONTRACT\",\"state\":0},{\"type\":\"PROJECT_GROUP\",\"state\":0}," + for (ProjectStageEnum stage : ProjectStageEnum.values()) {
"{\"type\":\"SITE_SURVEY\",\"state\":0},{\"type\":\"REPORT_PREPARATION\",\"state\":0}" + projectNodes.add(new ProjectNodeCO(stage.getVal(), 0));
",{\"type\":\"INTERNAL_REVIEW\",\"state\":0},{\"type\":\"TECHNICAL_REVIEW\",\"state\":0}" + }
",{\"type\":\"PROCESS_CONTROL\",\"state\":0},{\"type\":\"ARCHIVE\",\"state\":0}]"); dataObject.setProjectNode(JSON.toJSONString(projectNodes));
evalProjectMapper.insert(dataObject); evalProjectMapper.insert(dataObject);
entity.setId(dataObject.getId()); entity.setId(dataObject.getId());
return entity; return entity;