From 19fefd01461580f3d0e33b34cd94e2ed040a3a0f Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Fri, 3 Jul 2026 15:54:52 +0800 Subject: [PATCH] BooleanQAEnum --- .../QualFilingChangeCmdConvertor.java | 8 +++++++ .../QualFilingMaterialChangeCmdConvertor.java | 2 -- .../executor/QualFilingChangeExecutor.java | 13 ++++------- .../QualFilingMaterialChangePageQry.java | 2 +- .../QualFilingMaterialChangeUpdateCmd.java | 2 +- .../response/QualFilingMaterialChangeCo.java | 2 +- .../co/QualFilingChangeAggregationCO.java | 2 +- .../model/QualFilingMaterialChangeE.java | 2 +- .../domain/constant/BooleanQAEnum.java | 22 +++++++++++++++++++ .../adapter/ThreadLocalUserInfoAdapter.java | 5 ++++- .../QualFilingMaterialChangeDO.java | 2 +- ...lFilingCommitmentChangeRepositoryImpl.java | 7 +++--- ...alFilingEquipmentChangeRepositoryImpl.java | 7 +++--- ...ualFilingMaterialChangeRepositoryImpl.java | 9 ++++---- ...lingPersonnelCertChangeRepositoryImpl.java | 7 +++--- ...alFilingPersonnelChangeRepositoryImpl.java | 13 ++++++----- 16 files changed, 68 insertions(+), 37 deletions(-) create mode 100644 safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/BooleanQAEnum.java 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 62ef942..bd32bc5 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 @@ -2,6 +2,7 @@ package org.qinan.safetyeval.app.change.convertor; import org.mapstruct.Mapper; import org.mapstruct.Mapping; +import org.qinan.safetyeval.client.co.QualFilingChangeAggregationCO; import org.qinan.safetyeval.client.dto.QualFilingChangeAddCmd; import org.qinan.safetyeval.domain.entity.QualFilingChangeEntity; import org.qinan.safetyeval.domain.entity.QualFilingEntity; @@ -34,4 +35,11 @@ public interface QualFilingChangeCmdConvertor { @Mapping(target = "applyTypeCode", ignore = true) @Mapping(target = "applyTypeName", ignore = true) QualFilingEntity convertChangeEToEntity(QualFilingChangeEntity changeEntity); + + /** + * + * @param changeEntity changeEntity + * @return QualFilingChangeAggregationCO + */ + QualFilingChangeAggregationCO convertChangeEToQualFilingChangeAggregationCO(QualFilingChangeEntity changeEntity); } 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 c9a9117..146c1d7 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 @@ -53,8 +53,6 @@ public interface QualFilingMaterialChangeCmdConvertor { /** * 变更材料转材料CO */ - @Mapping(source = "filingChangeId", target = "filingId") - @Mapping(target = "materialType", ignore = true) QualFilingMaterialCO convertChangeEToCO(QualFilingMaterialChangeE changeE); /** 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 314dce8..0dfec60 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 @@ -24,7 +24,6 @@ import org.qinan.safetyeval.domain.service.QualFilingDomainService; import org.qinan.safetyeval.domain.service.QualFilingReviewDomainService; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; import org.qinan.safetyeval.infrastructure.utils.RequestHandlerUtil; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -353,13 +352,9 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { throw new BizException(ErrorCode.QUAL_FILING_CHANGE_NOT_FOUND); } - QualFilingChangeAggregationCO detail = new QualFilingChangeAggregationCO(); - BeanUtils.copyProperties(toCO(changeEntity), detail); - - Long changeFilingId = changeEntity.getChangeFilingId(); - if (changeFilingId == null) { - return SingleResponse.success(detail); - } + QualFilingChangeAggregationCO detail = qualFilingChangeCmdConvertor + .convertChangeEToQualFilingChangeAggregationCO(changeEntity); + Long changeFilingId = changeEntity.getId(); // 承诺书 QualFilingCommitmentChangeE commitmentChangeE = qualFilingCommitmentChangeGateway.getByFilingId(changeFilingId); @@ -376,7 +371,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { // 材料清单 List materialChangeEs = qualFilingMaterialChangeGateway.listByFilingId(changeFilingId); if (!CollectionUtils.isEmpty(materialChangeEs)) { - detail.setMaterialList(qualFilingMaterialChangeCmdConvertor.convertChangeEListToCOList(materialChangeEs)); + detail.setMaterials(qualFilingMaterialChangeCmdConvertor.convertChangeEListToCOList(materialChangeEs)); } // 人员清单 diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangePageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangePageQry.java index 64c8fcb..9e08d3a 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangePageQry.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangePageQry.java @@ -23,7 +23,7 @@ public class QualFilingMaterialChangePageQry extends PageQuery { * 材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度 */ @ApiModelProperty(value = "材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度") - private String materialType; + private Integer materialType; /** * 材料内容 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeUpdateCmd.java index cd6fb06..0da8f86 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeUpdateCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeUpdateCmd.java @@ -30,7 +30,7 @@ public class QualFilingMaterialChangeUpdateCmd implements Serializable { */ @ApiModelProperty(value = "材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度", required = true) @NotBlank(message = "材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度不能为空") - private String materialType; + private Integer materialType; /** * 材料内容 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingMaterialChangeCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingMaterialChangeCo.java index 8e1eb46..c3d9f29 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingMaterialChangeCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingMaterialChangeCo.java @@ -25,7 +25,7 @@ public class QualFilingMaterialChangeCo extends ClientObject { * 材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度 */ @ApiModelProperty(value = "材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度") - private String materialType; + private Integer materialType; /** * 材料内容 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeAggregationCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeAggregationCO.java index 3af4db4..19f7f47 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeAggregationCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeAggregationCO.java @@ -22,7 +22,7 @@ public class QualFilingChangeAggregationCO extends QualFilingChangeCO { private List equipmentList; @ApiModelProperty(value = "变更材料列表") - private List materialList; + private List materials; @ApiModelProperty(value = "变更人员列表") private List personnelList; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingMaterialChangeE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingMaterialChangeE.java index f691575..d04c085 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingMaterialChangeE.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingMaterialChangeE.java @@ -27,7 +27,7 @@ public class QualFilingMaterialChangeE extends BaseE { /** * 材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度 */ - private String materialType; + private Integer materialType; /** * 材料内容 */ diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/BooleanQAEnum.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/BooleanQAEnum.java new file mode 100644 index 0000000..d551610 --- /dev/null +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/BooleanQAEnum.java @@ -0,0 +1,22 @@ +package org.qinan.safetyeval.domain.constant; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum BooleanQAEnum { + /** + * + */ + TRUE("true", "是"), + FALSE("false", "否"), + ; + + @JsonValue + @EnumValue + private final String value; + private final String label; +} diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/adapter/ThreadLocalUserInfoAdapter.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/adapter/ThreadLocalUserInfoAdapter.java index d9cfd01..d2a7405 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/adapter/ThreadLocalUserInfoAdapter.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/adapter/ThreadLocalUserInfoAdapter.java @@ -1,6 +1,9 @@ package org.qinan.safetyeval.infrastructure.adapter; +import org.qinan.safetyeval.infrastructure.utils.RequestHandlerUtil; +import org.springframework.web.context.request.RequestContextHolder; + /** * 基于 ThreadLocal 的用户信息适配器默认实现 *

@@ -15,7 +18,7 @@ public class ThreadLocalUserInfoAdapter { private static final ThreadLocal ORG_ID = new ThreadLocal<>(); public static Long get() { - return ORG_ID.get(); + return RequestHandlerUtil.getOrgId(); } /** diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingMaterialChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingMaterialChangeDO.java index 3747f1c..2cf55ab 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingMaterialChangeDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingMaterialChangeDO.java @@ -24,7 +24,7 @@ public class QualFilingMaterialChangeDO extends BaseDO { /** * 材料类型1,申请材料目录（原件）,2,申请书（原件）,3,法人证明（复印件）,4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书（原件）,6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度 */ - private String materialType; + private Integer materialType; /** * 材料内容 */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingCommitmentChangeRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingCommitmentChangeRepositoryImpl.java index 5be3fd4..0582617 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingCommitmentChangeRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingCommitmentChangeRepositoryImpl.java @@ -7,6 +7,7 @@ import com.jjb.saas.framework.enums.enums.BooleanEnum; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import lombok.AllArgsConstructor; import org.qinan.safetyeval.client.change.request.QualFilingCommitmentChangePageQry; +import org.qinan.safetyeval.domain.constant.BooleanQAEnum; import org.qinan.safetyeval.infrastructure.persistence.domainobject.QualFilingCommitmentChangeDO; import org.qinan.safetyeval.infrastructure.persistence.mapper.QualFilingCommitmentChangeMapper; import org.qinan.safetyeval.infrastructure.persistence.repository.QualFilingCommitmentChangeRepository; @@ -28,7 +29,7 @@ public class QualFilingCommitmentChangeRepositoryImpl extends BaseRepositoryImpl @Override public QualFilingCommitmentChangeDO getById(Long id) { - return super.lambdaQuery().eq(QualFilingCommitmentChangeDO::getId, id).eq(QualFilingCommitmentChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()).one(); + return super.lambdaQuery().eq(QualFilingCommitmentChangeDO::getId, id).eq(QualFilingCommitmentChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()).one(); } @Override @@ -55,7 +56,7 @@ public class QualFilingCommitmentChangeRepositoryImpl extends BaseRepositoryImpl if (ObjectUtil.isNotEmpty(qualFilingCommitmentChangePageQry.getEnv())) { qualFilingCommitmentChangeDoQueryWrapper.eq("env", qualFilingCommitmentChangePageQry.getEnv()); } - qualFilingCommitmentChangeDoQueryWrapper.eq("delete_enum", BooleanEnum.FALSE.getValue()); + qualFilingCommitmentChangeDoQueryWrapper.eq("delete_enum", BooleanQAEnum.FALSE.getValue()); return qualFilingCommitmentChangeMapper.selectPage(iPage, qualFilingCommitmentChangeDoQueryWrapper); } @@ -83,7 +84,7 @@ public class QualFilingCommitmentChangeRepositoryImpl extends BaseRepositoryImpl public QualFilingCommitmentChangeDO getByFilingId(Long filingId) { return super.lambdaQuery() .eq(QualFilingCommitmentChangeDO::getFilingChangeId, filingId) - .eq(QualFilingCommitmentChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) + .eq(QualFilingCommitmentChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()) .one(); } } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingEquipmentChangeRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingEquipmentChangeRepositoryImpl.java index d29af2a..7745a70 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingEquipmentChangeRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingEquipmentChangeRepositoryImpl.java @@ -7,6 +7,7 @@ import com.jjb.saas.framework.enums.enums.BooleanEnum; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import lombok.AllArgsConstructor; import org.qinan.safetyeval.client.change.request.QualFilingEquipmentChangePageQry; +import org.qinan.safetyeval.domain.constant.BooleanQAEnum; import org.qinan.safetyeval.infrastructure.persistence.domainobject.QualFilingEquipmentChangeDO; import org.qinan.safetyeval.infrastructure.persistence.mapper.QualFilingEquipmentChangeMapper; import org.qinan.safetyeval.infrastructure.persistence.repository.QualFilingEquipmentChangeRepository; @@ -29,7 +30,7 @@ public class QualFilingEquipmentChangeRepositoryImpl extends BaseRepositoryImpl< @Override public QualFilingEquipmentChangeDO getById(Long id) { - return super.lambdaQuery().eq(QualFilingEquipmentChangeDO::getId, id).eq(QualFilingEquipmentChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()).one(); + return super.lambdaQuery().eq(QualFilingEquipmentChangeDO::getId, id).eq(QualFilingEquipmentChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()).one(); } @Override @@ -92,7 +93,7 @@ public class QualFilingEquipmentChangeRepositoryImpl extends BaseRepositoryImpl< if (ObjectUtil.isNotEmpty(qualFilingEquipmentChangePageQry.getEnv())) { qualFilingEquipmentChangeDoQueryWrapper.eq("env", qualFilingEquipmentChangePageQry.getEnv()); } - qualFilingEquipmentChangeDoQueryWrapper.eq("delete_enum", BooleanEnum.FALSE.getValue()); + qualFilingEquipmentChangeDoQueryWrapper.eq("delete_enum", BooleanQAEnum.FALSE.getValue()); return qualFilingEquipmentChangeMapper.selectPage(iPage, qualFilingEquipmentChangeDoQueryWrapper); } @@ -120,7 +121,7 @@ public class QualFilingEquipmentChangeRepositoryImpl extends BaseRepositoryImpl< public List listByFilingId(Long filingId) { return super.lambdaQuery() .eq(QualFilingEquipmentChangeDO::getFilingChangeId, filingId) - .eq(QualFilingEquipmentChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) + .eq(QualFilingEquipmentChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()) .list(); } } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingMaterialChangeRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingMaterialChangeRepositoryImpl.java index 18091fe..e65f35e 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingMaterialChangeRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingMaterialChangeRepositoryImpl.java @@ -7,6 +7,7 @@ import com.jjb.saas.framework.enums.enums.BooleanEnum; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import lombok.AllArgsConstructor; import org.qinan.safetyeval.client.change.request.QualFilingMaterialChangePageQry; +import org.qinan.safetyeval.domain.constant.BooleanQAEnum; import org.qinan.safetyeval.infrastructure.persistence.domainobject.QualFilingMaterialChangeDO; import org.qinan.safetyeval.infrastructure.persistence.mapper.QualFilingMaterialChangeMapper; import org.qinan.safetyeval.infrastructure.persistence.repository.QualFilingMaterialChangeRepository; @@ -29,7 +30,7 @@ public class QualFilingMaterialChangeRepositoryImpl extends BaseRepositoryImpl listByFilingId(Long filingId) { return super.lambdaQuery() .eq(QualFilingMaterialChangeDO::getFilingChangeId, filingId) - .eq(QualFilingMaterialChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) + .eq(QualFilingMaterialChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()) .list(); } @@ -107,7 +108,7 @@ public class QualFilingMaterialChangeRepositoryImpl extends BaseRepositoryImpl listByFilingId(Long filingId) { return super.lambdaQuery() .eq(QualFilingPersonnelCertChangeDO::getFilingChangeId, filingId) - .eq(QualFilingPersonnelCertChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) + .eq(QualFilingPersonnelCertChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()) .list(); } } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java index ffe2cff..08aaca8 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java @@ -7,6 +7,7 @@ import com.jjb.saas.framework.enums.enums.BooleanEnum; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import lombok.AllArgsConstructor; import org.qinan.safetyeval.client.change.request.QualFilingPersonnelChangePageQry; +import org.qinan.safetyeval.domain.constant.BooleanQAEnum; import org.qinan.safetyeval.infrastructure.persistence.domainobject.QualFilingPersonnelChangeDO; import org.qinan.safetyeval.infrastructure.persistence.mapper.QualFilingPersonnelChangeMapper; import org.qinan.safetyeval.infrastructure.persistence.repository.QualFilingPersonnelChangeRepository; @@ -28,7 +29,7 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl< @Override public QualFilingPersonnelChangeDO getById(Long id) { - return super.lambdaQuery().eq(QualFilingPersonnelChangeDO::getId, id).eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()).one(); + return super.lambdaQuery().eq(QualFilingPersonnelChangeDO::getId, id).eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()).one(); } @Override @@ -112,7 +113,7 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl< if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getEnv())) { qualFilingPersonnelChangeDoQueryWrapper.eq("env", qualFilingPersonnelChangePageQry.getEnv()); } - qualFilingPersonnelChangeDoQueryWrapper.eq("delete_enum", BooleanEnum.FALSE.getValue()); + qualFilingPersonnelChangeDoQueryWrapper.eq("delete_enum", BooleanQAEnum.FALSE.getValue()); return qualFilingPersonnelChangeMapper.selectPage(iPage, qualFilingPersonnelChangeDoQueryWrapper); } @@ -140,7 +141,7 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl< public java.util.List listByFilingId(Long filingId) { return super.lambdaQuery() .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId) - .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) + .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()) .list(); } @@ -148,7 +149,7 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl< public int countByFilingId(Long filingId) { return super.lambdaQuery() .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId) - .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) + .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()) .count().intValue(); } @@ -156,7 +157,7 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl< public int countByFilingIdAndRegisterEngineerFlag(Long filingId, Integer registerEngineerFlag) { return super.lambdaQuery() .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId) - .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) + .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()) .eq(QualFilingPersonnelChangeDO::getRegisterEngineerFlag, registerEngineerFlag) .count().intValue(); } @@ -165,7 +166,7 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl< public int countByFilingIdAndJoinWorkDateAfter(Long filingId, java.time.LocalDate joinWorkDate) { return super.lambdaQuery() .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId) - .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) + .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()) .gt(QualFilingPersonnelChangeDO::getJoinWorkDate, joinWorkDate) .count().intValue(); }