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

waring

dev
luotaiqian 2026-07-23 17:37:09 +08:00
parent 32f5a2ff78
commit 72f450a68b
6 changed files with 4 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalInternalReviewController.java
View File

@ -4,12 +4,10 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.qinan.safetyeval.client.api.institution.EvalInternalReviewApi;
import org.qinan.safetyeval.client.co.institution.EvalInternalReviewCO;
import org.qinan.safetyeval.client.co.institution.EvalInternalReviewDetailCO;
import org.qinan.safetyeval.client.dto.SingleResponse;
import org.qinan.safetyeval.client.dto.institution.EvalInternalReviewAssignCmd;
import org.qinan.safetyeval.client.dto.institution.EvalInternalReviewConfirmCmd;
import org.qinan.safetyeval.client.dto.institution.EvalInternalReviewSaveCmd;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -23,11 +21,6 @@ public class EvalInternalReviewController {
@Resource
private EvalInternalReviewApi evalInternalReviewApi;
/* @ApiOperation("按项目获取或保存")
@PostMapping("/get-or-save")
public SingleResponse<EvalInternalReviewCO> getOrSave(@Validated @RequestBody EvalInternalReviewSaveCmd cmd) {
return evalInternalReviewApi.getOrSave(cmd);
}*/
@ApiOperation("内审确认")
@PostMapping("/confirm")
@ -41,11 +34,6 @@ public class EvalInternalReviewController {
return evalInternalReviewApi.assign(cmd);
}
/*@ApiOperation("按项目查询")
@GetMapping("/get")
public SingleResponse<EvalInternalReviewCO> get(@ApiParam("项目ID") @RequestParam Long projectId) {
return evalInternalReviewApi.getByProject(projectId);
}*/
@ApiOperation("按项目查询详情（内审人成员+审核项）")
@GetMapping("/detail")

13
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalTechReviewController.java
View File

@ -4,12 +4,10 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.qinan.safetyeval.client.api.institution.EvalTechReviewApi;
import org.qinan.safetyeval.client.co.institution.EvalTechReviewCO;
import org.qinan.safetyeval.client.co.institution.EvalTechReviewDetailCO;
import org.qinan.safetyeval.client.dto.SingleResponse;
import org.qinan.safetyeval.client.dto.institution.EvalTechReviewAssignCmd;
import org.qinan.safetyeval.client.dto.institution.EvalTechReviewConfirmCmd;
import org.qinan.safetyeval.client.dto.institution.EvalTechReviewSaveCmd;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -23,17 +21,6 @@ public class EvalTechReviewController {
@Resource
private EvalTechReviewApi evalTechReviewApi;
/* @ApiOperation("按项目获取或保存")
@PostMapping("/get-or-save")
public SingleResponse<EvalTechReviewCO> getOrSave(@Validated @RequestBody EvalTechReviewSaveCmd cmd) {
return evalTechReviewApi.getOrSave(cmd);
}
@ApiOperation("按项目查询")
@GetMapping("/get")
public SingleResponse<EvalTechReviewCO> get(@ApiParam("项目ID") @RequestParam String projectId) {
return evalTechReviewApi.getByProject(projectId);
} */
@ApiOperation("技审确认")
@PostMapping("/confirm")

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

@ -145,6 +145,8 @@ public class EvalTechReviewExecutor implements EvalTechReviewApi {
EvalReviewItemE itemE = evalReviewItemCmdConvertor.convertCmdToE(itemCmd);
itemE.setBizId(entity.getId());
itemE.setBizType(bizType);
itemE.setDeleteEnum(BooleanQAEnum.FALSE.getValue());
itemE.setOrgId(project.getOrgId());
evalReviewItemGateway.add(itemE);
}
return SingleResponse.success();

3
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewConfirmCmd.java
View File

@ -19,9 +19,6 @@ public class EvalInternalReviewConfirmCmd {
@ApiModelProperty("项目id")
private Long projectId;
@ApiModelProperty(value = "节点状态编码：1未开始 2进行中 3已完成 4退回", example = "2")
private Integer statusCode;
@ApiModelProperty(value = "审核结果 passed 通过，not_passed 未通过", example = "passed")
private String resultCode;

5
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessControlConfirmCmd.java
View File

@ -19,16 +19,13 @@ public class EvalProcessControlConfirmCmd {
@ApiModelProperty("项目id")
private Long projectId;
@ApiModelProperty(value = "节点状态编码：1未开始 2进行中 3已完成 4退回", example = "2")
private Integer statusCode;
@ApiModelProperty(value = "过程控制负责人人员id")
private Long controllerPersonnelId;
@ApiModelProperty(value = "过程控制负责人姓名")
private String controllerName;
@ApiModelProperty(value = "过程控制结论编码：1通过 2退回", example = "1")
@ApiModelProperty(value = "审核结果 passed 通过，not_passed 未通过", example = "passed")
private Integer resultCode;
@ApiModelProperty(value = "总体过程控制意见")

14
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalTechReviewConfirmCmd.java
View File

@ -19,19 +19,7 @@ public class EvalTechReviewConfirmCmd {
@ApiModelProperty("项目id")
private Long projectId;
@ApiModelProperty(value = "节点状态编码：1未开始 2进行中 3已完成 4退回", example = "2")
private Integer statusCode;
@ApiModelProperty(value = "技审人人员id")
private Long reviewerPersonnelId;
@ApiModelProperty(value = "技审人姓名", example = "2")
private String reviewerName;
@ApiModelProperty(value = "审核签字任务状态 dispatched 下发，non_dispatched 未下发，completed 已完成", example = "non_dispatched")
private String reviewerSignatureTaskStatus;
@ApiModelProperty(value = "审核结果编码：1通过 2退回修改", example = "1")
@ApiModelProperty(value = "审核结果 passed 通过，not_passed 未通过", example = "1")
private Integer resultCode;
@ApiModelProperty(value = "总体审核意见")