diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java index 978863f..bf0a2fd 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java @@ -1,12 +1,12 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import org.qinan.safetyeval.client.dto.*; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingChangeApi; import org.qinan.safetyeval.client.co.QualFilingChangeCO; import org.qinan.safetyeval.client.co.QualFilingChangeComplianceCheckResultCO; +import org.qinan.safetyeval.client.dto.*; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -98,4 +98,11 @@ public class QualFilingChangeController { public SingleResponse> complianceCheck(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingChangeApi.complianceCheck(id); } + + @ApiOperation("审核") + @PostMapping("/review") + public SingleResponse review(@Validated @RequestBody QualFilingChangeReviewAddCmd cmd) { + qualFilingChangeApi.review(cmd); + return SingleResponse.success(); + } } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingChangeCmdConvertor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingChangeCmdConvertor.java index c422d03..62ef942 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingChangeCmdConvertor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingChangeCmdConvertor.java @@ -1,8 +1,10 @@ package org.qinan.safetyeval.app.change.convertor; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; import org.qinan.safetyeval.client.dto.QualFilingChangeAddCmd; import org.qinan.safetyeval.domain.entity.QualFilingChangeEntity; +import org.qinan.safetyeval.domain.entity.QualFilingEntity; /** * 备案变更基本信息命令转换 @@ -19,4 +21,17 @@ public interface QualFilingChangeCmdConvertor { * @return */ QualFilingChangeEntity convertCmdToE(QualFilingChangeAddCmd qualFilingChangeAddCmd); + + /** + * 变更实体转备案实体 + * id 由调用方手动设置（使用 changeFilingId） + */ + @Mapping(target = "id", ignore = true) + @Mapping(target = "originFilingId", ignore = true) + @Mapping(target = "rejectReason", ignore = true) + @Mapping(target = "submitTime", ignore = true) + @Mapping(target = "approveTime", ignore = true) + @Mapping(target = "applyTypeCode", ignore = true) + @Mapping(target = "applyTypeName", ignore = true) + QualFilingEntity convertChangeEToEntity(QualFilingChangeEntity changeEntity); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingCommitmentChangeCmdConvertor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingCommitmentChangeCmdConvertor.java index f1aa58b..a67f4e3 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingCommitmentChangeCmdConvertor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingCommitmentChangeCmdConvertor.java @@ -5,6 +5,7 @@ import org.mapstruct.Mapping; import org.qinan.safetyeval.client.change.request.QualFilingCommitmentChangeAddCmd; import org.qinan.safetyeval.client.change.request.QualFilingCommitmentChangeUpdateCmd; import org.qinan.safetyeval.domain.change.model.QualFilingCommitmentChangeE; +import org.qinan.safetyeval.domain.entity.QualFilingCommitmentEntity; /** * 法定代人承诺书-变更转换 @@ -31,4 +32,13 @@ public interface QualFilingCommitmentChangeCmdConvertor { */ @Mapping(target = "qualFilingCommitmentChangeGateway", ignore = true) QualFilingCommitmentChangeE convertCmdToE(QualFilingCommitmentChangeUpdateCmd qualFilingCommitmentChangeUpdateCmd); + + /** + * 变更承诺书转承诺书实体 + */ + @Mapping(target = "id", ignore = true) + @Mapping(target = "filingId", ignore = true) + @Mapping(target = "tenantId", ignore = true) + @Mapping(target = "orgId", ignore = true) + QualFilingCommitmentEntity convertChangeEToEntity(QualFilingCommitmentChangeE changeE); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingEquipmentChangeCmdConvertor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingEquipmentChangeCmdConvertor.java index 538d693..e6a6156 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingEquipmentChangeCmdConvertor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingEquipmentChangeCmdConvertor.java @@ -5,6 +5,9 @@ import org.mapstruct.Mapping; import org.qinan.safetyeval.client.change.request.QualFilingEquipmentChangeAddCmd; import org.qinan.safetyeval.client.change.request.QualFilingEquipmentChangeUpdateCmd; import org.qinan.safetyeval.domain.change.model.QualFilingEquipmentChangeE; +import org.qinan.safetyeval.domain.entity.QualFilingEquipmentEntity; + +import java.util.List; /** * 备案申请装备-变更转换 @@ -31,4 +34,18 @@ public interface QualFilingEquipmentChangeCmdConvertor { */ @Mapping(target = "qualFilingEquipmentChangeGateway", ignore = true) QualFilingEquipmentChangeE convertCmdToE(QualFilingEquipmentChangeUpdateCmd qualFilingEquipmentChangeUpdateCmd); + + /** + * 变更装备转装备实体 + */ + @Mapping(target = "id", ignore = true) + @Mapping(target = "filingId", ignore = true) + @Mapping(target = "tenantId", ignore = true) + @Mapping(target = "orgId", ignore = true) + QualFilingEquipmentEntity convertChangeEToEntity(QualFilingEquipmentChangeE changeE); + + /** + * 批量转换 + */ + List convertChangeEListToEntityList(List changeEs); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingMaterialChangeCmdConvertor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingMaterialChangeCmdConvertor.java index cb213d7..139d00c 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingMaterialChangeCmdConvertor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingMaterialChangeCmdConvertor.java @@ -5,6 +5,9 @@ import org.mapstruct.Mapping; import org.qinan.safetyeval.client.change.request.QualFilingMaterialChangeAddCmd; import org.qinan.safetyeval.client.change.request.QualFilingMaterialChangeUpdateCmd; import org.qinan.safetyeval.domain.change.model.QualFilingMaterialChangeE; +import org.qinan.safetyeval.domain.entity.QualFilingMaterialEntity; + +import java.util.List; /** * 备案申请材料-变更转换 @@ -31,4 +34,18 @@ public interface QualFilingMaterialChangeCmdConvertor { */ @Mapping(target = "qualFilingMaterialChangeGateway", ignore = true) QualFilingMaterialChangeE convertCmdToE(QualFilingMaterialChangeUpdateCmd qualFilingMaterialChangeUpdateCmd); + + /** + * 变更材料转材料实体 + */ + @Mapping(target = "id", ignore = true) + @Mapping(target = "filingId", ignore = true) + @Mapping(target = "tenantId", ignore = true) + @Mapping(target = "orgId", ignore = true) + QualFilingMaterialEntity convertChangeEToEntity(QualFilingMaterialChangeE changeE); + + /** + * 批量转换 + */ + List convertChangeEListToEntityList(List changeEs); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingPersonnelCertChangeCmdConvertor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingPersonnelCertChangeCmdConvertor.java index 6782ffc..df4f6f9 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingPersonnelCertChangeCmdConvertor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingPersonnelCertChangeCmdConvertor.java @@ -5,6 +5,9 @@ import org.mapstruct.Mapping; import org.qinan.safetyeval.client.change.request.QualFilingPersonnelCertChangeAddCmd; import org.qinan.safetyeval.client.change.request.QualFilingPersonnelCertChangeUpdateCmd; import org.qinan.safetyeval.domain.change.model.QualFilingPersonnelCertChangeE; +import org.qinan.safetyeval.domain.entity.QualFilingPersonnelCertEntity; + +import java.util.List; /** * 备案申请人员证书转换 @@ -31,4 +34,18 @@ public interface QualFilingPersonnelCertChangeCmdConvertor { */ @Mapping(target = "qualFilingPersonnelCertChangeGateway", ignore = true) QualFilingPersonnelCertChangeE convertCmdToE(QualFilingPersonnelCertChangeUpdateCmd qualFilingPersonnelCertChangeUpdateCmd); + + /** + * 变更人员证书转人员证书实体 + */ + @Mapping(target = "id", ignore = true) + @Mapping(target = "filingId", ignore = true) + @Mapping(target = "tenantId", ignore = true) + @Mapping(target = "orgId", ignore = true) + QualFilingPersonnelCertEntity convertChangeEToEntity(QualFilingPersonnelCertChangeE changeE); + + /** + * 批量转换 + */ + List convertChangeEListToEntityList(List changeEs); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingPersonnelChangeCmdConvertor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingPersonnelChangeCmdConvertor.java index 2b9bde4..04b3405 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingPersonnelChangeCmdConvertor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/change/convertor/QualFilingPersonnelChangeCmdConvertor.java @@ -5,6 +5,9 @@ import org.mapstruct.Mapping; import org.qinan.safetyeval.client.change.request.QualFilingPersonnelChangeAddCmd; import org.qinan.safetyeval.client.change.request.QualFilingPersonnelChangeUpdateCmd; import org.qinan.safetyeval.domain.change.model.QualFilingPersonnelChangeE; +import org.qinan.safetyeval.domain.entity.QualFilingPersonnelEntity; + +import java.util.List; /** * 备案申请人员-变更转换 @@ -31,4 +34,18 @@ public interface QualFilingPersonnelChangeCmdConvertor { */ @Mapping(target = "qualFilingPersonnelChangeGateway", ignore = true) QualFilingPersonnelChangeE convertCmdToE(QualFilingPersonnelChangeUpdateCmd qualFilingPersonnelChangeUpdateCmd); + + /** + * 变更人员转人员实体 + */ + @Mapping(target = "id", ignore = true) + @Mapping(target = "filingId", ignore = true) + @Mapping(target = "tenantId", ignore = true) + @Mapping(target = "orgId", ignore = true) + QualFilingPersonnelEntity convertChangeEToEntity(QualFilingPersonnelChangeE changeE); + + /** + * 批量转换 + */ + List convertChangeEListToEntityList(List changeEs); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java index ea1919d..b9bf76c 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java @@ -10,18 +10,21 @@ import org.qinan.safetyeval.client.dto.*; import org.qinan.safetyeval.domain.change.gateway.*; import org.qinan.safetyeval.domain.change.model.*; import org.qinan.safetyeval.domain.constant.QualFilingFormStepEnum; +import org.qinan.safetyeval.domain.constant.QualFilingReviewResultEnum; import org.qinan.safetyeval.domain.constant.QualFilingStatusEnum; -import org.qinan.safetyeval.domain.entity.QualFilingChangeDetailEntity; -import org.qinan.safetyeval.domain.entity.QualFilingChangeEntity; +import org.qinan.safetyeval.domain.entity.*; import org.qinan.safetyeval.domain.exception.BizException; import org.qinan.safetyeval.domain.exception.ErrorCode; import org.qinan.safetyeval.domain.query.PageResult; import org.qinan.safetyeval.domain.query.QualFilingChangeQuery; import org.qinan.safetyeval.domain.service.QualFilingChangeDomainService; +import org.qinan.safetyeval.domain.service.QualFilingDomainService; +import org.qinan.safetyeval.domain.service.QualFilingReviewDomainService; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -41,6 +44,14 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { @Autowired(required = false) private QualFilingChangeDomainService qualFilingChangeDomainService; + @Lazy + @Autowired(required = false) + private QualFilingDomainService qualFilingDomainService; + + @Lazy + @Autowired(required = false) + private QualFilingReviewDomainService qualFilingReviewDomainService; + @Resource private QualFilingOrchestrator qualFilingOrchestrator; @Resource @@ -240,6 +251,80 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { return SingleResponse.success(co); } + @Override + @Transactional(rollbackFor = Exception.class) + public void review(QualFilingChangeReviewAddCmd cmd) { + Long changeFilingId = cmd.getChangeFilingId(); + + // 查询变更基本信息 + QualFilingChangeEntity changeEntity = qualFilingChangeDomainService.get(changeFilingId); + + if (changeEntity == null) { + throw new BizException(ErrorCode.QUAL_FILING_CHANGE_NOT_FOUND); + } + QualFilingChangeEntity updateE = qualFilingChangeDomainService.get(changeFilingId); + updateE.setId(changeFilingId); + + // 构建并保存审核记录 + QualFilingReviewEntity reviewEntity = new QualFilingReviewEntity(); + reviewEntity.setFilingId(changeEntity.getChangeFilingId()); + reviewEntity.setReviewResult(cmd.getReviewResult()); + reviewEntity.setFilingExpertId(cmd.getFilingExpertId()); + reviewEntity.setFilingExpertName(cmd.getFilingExpertName()); + reviewEntity.setReviewOpinion(cmd.getReviewOpinion()); + reviewEntity = qualFilingReviewDomainService.add(reviewEntity); + + // 更新变更记录的 filing_review_id 和 filing_status_code + updateE.setFilingReviewId(reviewEntity.getId()); + + // 审核通过：将变更数据同步到正式备案表 + if (QualFilingReviewResultEnum.PASS.getName().equals(cmd.getReviewResult())) { + updateE.setFilingStatusCode(QualFilingStatusEnum.FILED.getCode()); + updateE.setFilingStatusName(QualFilingStatusEnum.FILED.getName()); + + // 转换变更基本信息 → 备案实体 + QualFilingEntity entity = qualFilingChangeCmdConvertor.convertChangeEToEntity(changeEntity); + entity.setId(changeEntity.getChangeFilingId()); + + // 查询并转换承诺书 + QualFilingCommitmentChangeE commitmentChangeE = qualFilingCommitmentChangeGateway.getByFilingId(changeFilingId); + QualFilingCommitmentEntity commitmentEntity = null; + if (commitmentChangeE != null) { + commitmentEntity = qualFilingCommitmentChangeCmdConvertor.convertChangeEToEntity(commitmentChangeE); + commitmentEntity.setFilingId(changeEntity.getChangeFilingId()); + } + + // 查询并转换装备清单 + List equipmentChangeEs = qualFilingEquipmentChangeGateway.listByFilingId(changeFilingId); + List equipmentEntities = qualFilingEquipmentChangeCmdConvertor.convertChangeEListToEntityList(equipmentChangeEs); + equipmentEntities.forEach(e -> e.setFilingId(changeEntity.getChangeFilingId())); + + // 查询并转换材料清单 + List materialChangeEs = qualFilingMaterialChangeGateway.listByFilingId(changeFilingId); + List materialEntities = qualFilingMaterialChangeCmdConvertor.convertChangeEListToEntityList(materialChangeEs); + materialEntities.forEach(e -> e.setFilingId(changeEntity.getChangeFilingId())); + + // 查询并转换人员 + List personnelChangeEs = qualFilingPersonnelChangeGateway.listByFilingId(changeFilingId); + List personnelEntities = qualFilingPersonnelChangeCmdConvertor.convertChangeEListToEntityList(personnelChangeEs); + personnelEntities.forEach(e -> e.setFilingId(changeEntity.getChangeFilingId())); + + // 查询并转换人员证书 + List personnelCertChangeEs = qualFilingPersonnelCertChangeGateway.listByFilingId(changeFilingId); + List personnelCertEntities = qualFilingPersonnelCertChangeCmdConvertor.convertChangeEListToEntityList(personnelCertChangeEs); + personnelCertEntities.forEach(e -> e.setFilingId(changeEntity.getChangeFilingId())); + + // 调用聚合保存，将变更数据写入正式备案表 + qualFilingDomainService.aggregationSaveOrEdit(entity, commitmentEntity, equipmentEntities, materialEntities, personnelEntities, personnelCertEntities); + } else { + updateE.setFilingStatusCode(QualFilingStatusEnum.REJECTED.getCode()); + updateE.setFilingStatusName(QualFilingStatusEnum.REJECTED.getName()); + } + + // 更新变更记录 + qualFilingChangeDomainService.modify(updateE); + } + /** * 聚合保存或编辑前的状态校验 *
    diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingChangeApi.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingChangeApi.java index 63078ee..ab3f870 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingChangeApi.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingChangeApi.java @@ -9,6 +9,7 @@ import org.qinan.safetyeval.client.dto.SingleResponse; import org.qinan.safetyeval.client.dto.QualFilingChangeAddCmd; import org.qinan.safetyeval.client.dto.QualFilingChangeModifyCmd; import org.qinan.safetyeval.client.dto.QualFilingChangePageQuery; +import org.qinan.safetyeval.client.dto.QualFilingChangeReviewAddCmd; import org.qinan.safetyeval.client.dto.QualFilingChangeSubmitCmd; import org.qinan.safetyeval.client.dto.QualFilingRejectCmd; @@ -42,4 +43,6 @@ public interface QualFilingChangeApi { SingleResponse> complianceCheck(Long id); SingleResponse aggregationSaveOrEdit(AggregationSaveOrEditQualFilingChangeCmd cmd); + + void review(QualFilingChangeReviewAddCmd cmd); } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeCO.java index 8c2c608..a10bb5f 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeCO.java @@ -18,6 +18,9 @@ public class QualFilingChangeCO { @ApiModelProperty(value = "备案申请ID") private Long filingId; + @ApiModelProperty(value = "审核ID") + private Long filingReviewId; + @ApiModelProperty(value = "变更备案ID") private Long changeFilingId; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java index e4dfd8f..c9aeb06 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java @@ -1,9 +1,10 @@ package org.qinan.safetyeval.client.dto; import io.swagger.annotations.ApiModelProperty; -import java.math.BigDecimal; import lombok.Data; +import java.math.BigDecimal; + /** * 备案变更新增命令 * diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeReviewAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeReviewAddCmd.java new file mode 100644 index 0000000..58d2470 --- /dev/null +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeReviewAddCmd.java @@ -0,0 +1,37 @@ +package org.qinan.safetyeval.client.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.qinan.safetyeval.domain.constant.QualFilingReviewResultEnum; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 资质审核记录新增命令 + * + * @author safety-eval + */ +@Data +public class QualFilingChangeReviewAddCmd { + + @ApiModelProperty(value = "变更备案申请id") + @NotNull(message = "备案申请id 不能为空") + private Long changeFilingId; + + @ApiModelProperty(value = "备案审核id", hidden = true) + private Long filingReviewId; + + @ApiModelProperty(value = QualFilingReviewResultEnum.REMARKS) + @NotBlank(message = "审核结果 不能为空") + private String reviewResult; + + @ApiModelProperty(value = "专家id") + private Long filingExpertId; + + @ApiModelProperty(value = "专家名称") + private String filingExpertName; + + @ApiModelProperty(value = "综合审核意见") + private String reviewOpinion; +} diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/QualFilingReviewResultEnum.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/QualFilingReviewResultEnum.java index f70d434..83ccd3a 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/QualFilingReviewResultEnum.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/QualFilingReviewResultEnum.java @@ -14,6 +14,8 @@ public enum QualFilingReviewResultEnum { private final int code; private final String name; + public static final String REMARKS = "审核结果(1通过2待定3不通过)"; + QualFilingReviewResultEnum(int code, String name) { this.code = code; this.name = name; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingChangeEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingChangeEntity.java index 897de59..051f5de 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingChangeEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingChangeEntity.java @@ -27,6 +27,9 @@ public class QualFilingChangeEntity { /** 打回原因 */ private String rejectReason; + /** 审核ID */ + private Long filingReviewId; + /** 提交时间 */ private java.time.LocalDateTime submitTime; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingChangeDO.java index 96f144e..afb9b33 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingChangeDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingChangeDO.java @@ -21,6 +21,7 @@ public class QualFilingChangeDO { private Long changeFilingId; private String rejectReason; private LocalDateTime submitTime; + private Long filingReviewId; private String filingTerritoryCode; private String filingTerritoryName; private String filingUnitName; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java index ad92e50..59c644c 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java @@ -228,6 +228,7 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { dataObject.setFilingId(entity.getFilingId()); dataObject.setChangeFilingId(entity.getChangeFilingId()); dataObject.setRejectReason(entity.getRejectReason()); + dataObject.setFilingReviewId(entity.getFilingReviewId()); dataObject.setSubmitTime(entity.getSubmitTime()); dataObject.setFilingTerritoryCode(entity.getFilingTerritoryCode()); dataObject.setFilingTerritoryName(entity.getFilingTerritoryName()); @@ -265,6 +266,7 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { entity.setFilingId(dataObject.getFilingId()); entity.setChangeFilingId(dataObject.getChangeFilingId()); entity.setRejectReason(dataObject.getRejectReason()); + entity.setFilingReviewId(dataObject.getFilingReviewId()); entity.setSubmitTime(dataObject.getSubmitTime()); entity.setFilingTerritoryCode(dataObject.getFilingTerritoryCode()); entity.setFilingTerritoryName(dataObject.getFilingTerritoryName()); diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml index 82fe6dc..8c3217a 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml @@ -9,6 +9,7 @@ + @@ -48,7 +49,7 @@ - `id`, `org_id`, `filing_id`, `change_filing_id`, `reject_reason`, `submit_time`, `filing_territory_code`, `filing_territory_name`, `filing_unit_name`, `filing_unit_type_code`, `filing_unit_type_name`, `filing_no`, `business_scope`, `register_address`, `office_address`, `credit_code`, `qual_cert_no`, `legal_person_phone`, `contact_phone`, `info_disclosure_url`, `fixed_asset_amount`, `archive_room_area`, `fulltime_evaluator_count`, `registered_engineer_count`, `workplace_area`, `unit_intro`, `attachment_url`, `filing_status_code`, `filing_status_name`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env` + `id`, `org_id`, `filing_id`, `change_filing_id`, `filing_review_id`, `reject_reason`, `submit_time`, `filing_territory_code`, `filing_territory_name`, `filing_unit_name`, `filing_unit_type_code`, `filing_unit_type_name`, `filing_no`, `business_scope`, `register_address`, `office_address`, `credit_code`, `qual_cert_no`, `legal_person_phone`, `contact_phone`, `info_disclosure_url`, `fixed_asset_amount`, `archive_room_area`, `fulltime_evaluator_count`, `registered_engineer_count`, `workplace_area`, `unit_intro`, `attachment_url`, `filing_status_code`, `filing_status_name`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`