diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java index 86793b2..e73c02e 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java @@ -127,4 +127,10 @@ public class QualFilingController { return qualFilingApi.qualificationMonitoringPageStatistics(); } + @ApiOperation("获取检查项") + @GetMapping("/check-item") + public SingleResponse> checkItem(@ApiParam("主键ID") @RequestParam Long id) { + return qualFilingApi.checkItem(id); + } + } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java index 9cdabfa..4d6da61 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java @@ -286,6 +286,33 @@ public class QualFilingExecutor implements QualFilingApi { return SingleResponse.success(co); } + @Override + public SingleResponse> checkItem(Long filingId) { + QualFilingDO qualFilingDO = qualFilingMapper.selectById(filingId); + + // 审核通过,需要新增资质变更记录 + AggregationSaveOrEditQualFilingCmd cmdSync = new AggregationSaveOrEditQualFilingCmd(); + + cmdSync.setQualFilingAddCmd(qualFilingChangeCmdConvertor.convertDOToCmd(qualFilingDO)); + // 备案承诺书 + QualFilingCommitmentDO qualFilingCommitmentDO = qualFilingCommitmentMapper.selectOne(new LambdaQueryWrapper() + .eq(QualFilingCommitmentDO::getFilingId, filingId)); + cmdSync.setQualFilingCommitmentAddCmd(qualFilingCommitmentChangeCmdConvertor.convertDOToCmd(qualFilingCommitmentDO)); + // 备案装备 + List qualFilingEquipmentDOs = qualFilingEquipmentMapper.selectList(new LambdaQueryWrapper() + .eq(QualFilingEquipmentDO::getFilingId, filingId)); + cmdSync.setQualFilingEquipmentAddCmds(qualFilingEquipmentChangeCmdConvertor.convertDOListToCmdList(qualFilingEquipmentDOs)); + // 备案材料清单 + List qualFilingMaterialDOs = qualFilingMaterialMapper.selectList(new LambdaQueryWrapper() + .eq(QualFilingMaterialDO::getFilingId, filingId)); + cmdSync.setQualFilingMaterialAddCmds(qualFilingMaterialChangeCmdConvertor.convertDOListToCmdList(qualFilingMaterialDOs)); + // 备案人员 + List qualFilingPersonnelDOs = qualFilingPersonnelMapper.selectList(new LambdaQueryWrapper() + .eq(QualFilingPersonnelDO::getFilingId, filingId)); + cmdSync.setQualFilingPersonnelAddCmds(qualFilingPersonnelChangeCmdConvertor.convertDOListToCmdList(qualFilingPersonnelDOs)); + return SingleResponse.success(ComplianceCheckUtil.complianceCheck(cmdSync,false)); + } + private QualFilingCO toLegacyCO(QualFilingEntity entity) { if (entity == null) { return null; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingApi.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingApi.java index 43f719c..c18ab52 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingApi.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingApi.java @@ -48,4 +48,6 @@ public interface QualFilingApi { PageResponse qualificationMonitoringPage(QualificationMonitoringQuery query); SingleResponse qualificationMonitoringPageStatistics(); + + SingleResponse> checkItem(Long id); }