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 76418dd..3385ec7 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 @@ -44,6 +44,37 @@ public class QualFilingController { return qualFilingApi.modify(cmd); } + @ApiOperation("创建资质备案草稿") + @PostMapping("/draft") + public SingleResponse draft( + @ApiParam("申请类型编码(1资质备案申请3已备案资质管理)") @RequestParam(required = false) Integer applyTypeCode) { + return qualFilingApi.draft(applyTypeCode); + } + + @ApiOperation("暂存资质备案基本信息") + @PostMapping("/save-draft") + public SingleResponse saveDraft(@Validated @RequestBody QualFilingModifyCmd cmd) { + return qualFilingApi.saveDraft(cmd); + } + + @ApiOperation("创建已备案资质管理草稿") + @PostMapping("/filed/draft") + public SingleResponse filedDraft() { + return qualFilingApi.filedDraft(); + } + + @ApiOperation("提交资质备案申请") + @PostMapping("/submit") + public SingleResponse submit(@ApiParam("主键ID") @RequestParam String id) { + return qualFilingApi.submit(Long.parseLong(id)); + } + + @ApiOperation("上传备案主附件") + @PostMapping("/upload-attachment") + public SingleResponse uploadAttachment(@Validated @RequestBody QualFilingAttachmentUploadCmd cmd) { + return qualFilingApi.uploadAttachment(cmd); + } + /////////////////////////////////////聚合接口 @ApiOperation("聚合新增or编辑资质备案申请") diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java index 3ceccd5..5672d8a 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java @@ -208,6 +208,8 @@ public class QualFilingOrchestrator { } domainQuery.setFilingNo(query.getFilingNo()); domainQuery.setFilingUnitName(query.getFilingUnitName()); + domainQuery.setFilingUnitTypeName(query.getFilingUnitTypeName()); + domainQuery.setBusinessScope(query.getBusinessScope()); domainQuery.setFilingStatusCode(query.getFilingStatusCode()); domainQuery.setApplyTypeCode(query.getApplyTypeCode()); domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode()); @@ -548,6 +550,13 @@ public class QualFilingOrchestrator { if (cmd.getFilingTerritoryName() != null) { entity.setFilingTerritoryName(cmd.getFilingTerritoryName()); } + if (!StringUtils.hasText(entity.getFilingTerritoryCode()) + && StringUtils.hasText(entity.getFilingTerritoryName())) { + entity.setFilingTerritoryCode(entity.getFilingTerritoryName()); + } else if (StringUtils.hasText(entity.getFilingTerritoryCode()) + && !StringUtils.hasText(entity.getFilingTerritoryName())) { + entity.setFilingTerritoryName(entity.getFilingTerritoryCode()); + } if (cmd.getFilingUnitName() != null) { entity.setFilingUnitName(cmd.getFilingUnitName()); } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPageQuery.java index d36cdee..a4873e1 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPageQuery.java @@ -24,6 +24,12 @@ public class QualFilingPageQuery extends BasePageQuery { @ApiModelProperty(value = "备案单位") private String filingUnitName; + @ApiModelProperty(value = "备案单位类型名称") + private String filingUnitTypeName; + + @ApiModelProperty(value = "安全评价业务范围") + private String businessScope; + @ApiModelProperty(value = "备案状态编码(1已备案2审核中3已打回4变更审核中5暂存)") private Integer filingStatusCode; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingQuery.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingQuery.java index eaf43f2..12351a6 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingQuery.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingQuery.java @@ -31,6 +31,12 @@ public class QualFilingQuery { /** 备案单位 */ private String filingUnitName; + /** 备案单位类型名称 */ + private String filingUnitTypeName; + + /** 安全评价业务范围 */ + private String businessScope; + /** 备案状态 */ private Integer filingStatusCode; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java index 7426a4a..fd8f297 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java @@ -113,8 +113,19 @@ public class QualFilingGatewayImpl implements QualFilingGateway { if (StringUtils.hasText(query.getFilingUnitName())) { wrapper.like(QualFilingDO::getFilingUnitName, query.getFilingUnitName()); } + if (StringUtils.hasText(query.getFilingUnitTypeName())) { + wrapper.like(QualFilingDO::getFilingUnitTypeName, query.getFilingUnitTypeName()); + } + if (StringUtils.hasText(query.getBusinessScope())) { + wrapper.like(QualFilingDO::getBusinessScope, query.getBusinessScope()); + } if (StringUtils.hasText(query.getFilingTerritoryCode())) { - wrapper.eq(QualFilingDO::getFilingTerritoryCode, query.getFilingTerritoryCode()); + String territory = query.getFilingTerritoryCode(); + wrapper.and(w -> w.eq(QualFilingDO::getFilingTerritoryCode, territory) + .or().eq(QualFilingDO::getFilingTerritoryName, territory)); + } + if (query.getFilingStatusCode() != null) { + wrapper.eq(QualFilingDO::getFilingStatusCode, query.getFilingStatusCode()); } if (Objects.nonNull(query.getApplyTypeCode())) { wrapper.eq(QualFilingDO::getApplyTypeCode, query.getApplyTypeCode());