waring
parent
f824dc5c1a
commit
1629e5d7a1
|
|
@ -12,6 +12,7 @@ import org.qinan.safetyeval.client.dto.institution.EvalInternalReviewConfirmCmd;
|
|||
import org.qinan.safetyeval.client.dto.institution.EvalInternalReviewSaveCmd;
|
||||
import org.qinan.safetyeval.client.item.request.EvalReviewItemAddCmd;
|
||||
import org.qinan.safetyeval.client.item.response.EvalReviewItemCo;
|
||||
import org.qinan.safetyeval.domain.constant.EvalReviewEnum;
|
||||
import org.qinan.safetyeval.domain.constant.ReviewDimensionEnum;
|
||||
import org.qinan.safetyeval.domain.entity.EvalInternalReviewEntity;
|
||||
import org.qinan.safetyeval.domain.entity.EvalProjectEntity;
|
||||
|
|
@ -22,6 +23,7 @@ import org.qinan.safetyeval.domain.gateway.EvalInternalReviewGateway;
|
|||
import org.qinan.safetyeval.domain.gateway.EvalProjectMemberGateway;
|
||||
import org.qinan.safetyeval.domain.item.gateway.EvalReviewItemGateway;
|
||||
import org.qinan.safetyeval.domain.item.model.EvalReviewItemE;
|
||||
import org.qinan.safetyeval.domain.service.ProjectStageSyncService;
|
||||
import org.qinan.safetyeval.domain.support.EvalNodeCodes;
|
||||
import org.qinan.safetyeval.infrastructure.convertor.EvalInternalReviewConvertor;
|
||||
import org.qinan.safetyeval.infrastructure.persistence.queryservice.EvalReviewItemQueryService;
|
||||
|
|
@ -50,6 +52,8 @@ public class EvalInternalReviewExecutor implements EvalInternalReviewApi {
|
|||
private EvalReviewItemGateway evalReviewItemGateway;
|
||||
@Resource
|
||||
private EvalReviewItemCmdConvertor evalReviewItemCmdConvertor;
|
||||
@Resource
|
||||
private ProjectStageSyncService projectStageSyncService;
|
||||
|
||||
@Override
|
||||
public SingleResponse<EvalInternalReviewCO> getOrSave(EvalInternalReviewSaveCmd cmd) {
|
||||
|
|
@ -99,6 +103,9 @@ public class EvalInternalReviewExecutor implements EvalInternalReviewApi {
|
|||
evalProjectNodeSupport.fillNodeStatus(entity.getStatusCode(), entity);
|
||||
entity = evalInternalReviewGateway.save(entity);
|
||||
}
|
||||
if (cmd.getResultCode().equals(EvalReviewEnum.PASSED.getCode())) {
|
||||
projectStageSyncService.onNodeCompleted(projectId, EvalNodeCodes.NODE_06);
|
||||
}
|
||||
|
||||
// 审核项:根据bizId和bizType先删后增
|
||||
String bizType = ReviewDimensionEnum.TypeEnum.EVAL_INTERNAL_REVIEW.getCode();
|
||||
|
|
|
|||
|
|
@ -63,9 +63,6 @@ public class EvalProjectNodeSupport {
|
|||
* 节点完成推进阶段。NODE_08 仅由 {@link ProjectStageSyncService#onArchived} 推进 ARCHIVED,此处不处理。
|
||||
*/
|
||||
public void afterNodeSaved(Long projectId, String nodeCode, Integer statusCode) {
|
||||
if (statusCode == null || EvalNodeCodes.NODE_08.equals(nodeCode)) {
|
||||
return;
|
||||
}
|
||||
// NODE_01:1暂存 2已完成;NODE_02:保存即完成(2);其余节点仍为 3已完成
|
||||
boolean completed = isDraftStyleNode(nodeCode) ? statusCode == 2 : statusCode == 3;
|
||||
if (completed) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
package org.qinan.safetyeval.domain.constant;
|
||||
|
||||
/**
|
||||
* 审核结果枚举
|
||||
*
|
||||
* @author safety-eval
|
||||
*/
|
||||
public enum EvalReviewEnum {
|
||||
|
||||
PASSED("passed", "通过"),
|
||||
NOT_PASSED("not_passed", "未通过");
|
||||
|
||||
private final String code;
|
||||
private final String name;
|
||||
|
||||
EvalReviewEnum(String code, String name) {
|
||||
this.code = code;
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public static EvalReviewEnum ofCode(String code) {
|
||||
if (code == null) {
|
||||
return null;
|
||||
}
|
||||
for (EvalReviewEnum item : values()) {
|
||||
if (item.code.equals(code)) {
|
||||
return item;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue