BooleanQAEnum

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);
 }

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);
 
     /**

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();
+        QualFilingChangeAggregationCO detail = qualFilingChangeCmdConvertor
-        BeanUtils.copyProperties(toCO(changeEntity), detail);
+                .convertChangeEToQualFilingChangeAggregationCO(changeEntity);
-
+        Long changeFilingId = changeEntity.getId();
-        Long changeFilingId = changeEntity.getChangeFilingId();
-        if (changeFilingId == null) {
-            return SingleResponse.success(detail);
-        }
 
         // 承诺书
         QualFilingCommitmentChangeE commitmentChangeE = qualFilingCommitmentChangeGateway.getByFilingId(changeFilingId);
@@ -376,7 +371,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
         // 材料清单
         List<QualFilingMaterialChangeE> materialChangeEs = qualFilingMaterialChangeGateway.listByFilingId(changeFilingId);
         if (!CollectionUtils.isEmpty(materialChangeEs)) {
-            detail.setMaterialList(qualFilingMaterialChangeCmdConvertor.convertChangeEListToCOList(materialChangeEs));
+            detail.setMaterials(qualFilingMaterialChangeCmdConvertor.convertChangeEListToCOList(materialChangeEs));
         }
 
         // 人员清单

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;
     /**
      * 材料内容
      */

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;
     /**
      * 材料内容
      */

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;
     /**
      * 材料内容
      */

safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeAggregationCO.java

@@ -22,7 +22,7 @@ public class QualFilingChangeAggregationCO extends QualFilingChangeCO {
     private List<QualFilingEquipmentCO> equipmentList;
 
     @ApiModelProperty(value = "变更材料列表")
-    private List<QualFilingMaterialCO> materialList;
+    private List<QualFilingMaterialCO> materials;
 
     @ApiModelProperty(value = "变更人员列表")
     private List<QualFilingPersonnelCO> personnelList;

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;
     /**
      * 材料内容
      */

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;
+}

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 的用户信息适配器默认实现
  * <p>
@@ -15,7 +18,7 @@ public class ThreadLocalUserInfoAdapter {
     private static final ThreadLocal<Long> ORG_ID = new ThreadLocal<>();
 
     public static Long get() {
-        return ORG_ID.get();
+        return RequestHandlerUtil.getOrgId();
     }
 
     /**

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;
     /**
      * 材料内容
      */

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();
     }
 }

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<QualFilingEquipmentChangeDO> listByFilingId(Long filingId) {
         return super.lambdaQuery()
                 .eq(QualFilingEquipmentChangeDO::getFilingChangeId, filingId)
-                .eq(QualFilingEquipmentChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue())
+                .eq(QualFilingEquipmentChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue())
                 .list();
     }
 }

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<Q
 
     @Override
     public QualFilingMaterialChangeDO getById(Long id) {
-        return super.lambdaQuery().eq(QualFilingMaterialChangeDO::getId, id).eq(QualFilingMaterialChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()).one();
+        return super.lambdaQuery().eq(QualFilingMaterialChangeDO::getId, id).eq(QualFilingMaterialChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()).one();
     }
 
     @Override
@@ -71,7 +72,7 @@ public class QualFilingMaterialChangeRepositoryImpl extends BaseRepositoryImpl<Q
         if (ObjectUtil.isNotEmpty(qualFilingMaterialChangePageQry.getEnv())) {
             qualFilingMaterialChangeDoQueryWrapper.eq("env", qualFilingMaterialChangePageQry.getEnv());
         }
-        qualFilingMaterialChangeDoQueryWrapper.eq("delete_enum", BooleanEnum.FALSE.getValue());
+        qualFilingMaterialChangeDoQueryWrapper.eq("delete_enum", BooleanQAEnum.FALSE.getValue());
         return qualFilingMaterialChangeMapper.selectPage(iPage, qualFilingMaterialChangeDoQueryWrapper);
     }
 
@@ -99,7 +100,7 @@ public class QualFilingMaterialChangeRepositoryImpl extends BaseRepositoryImpl<Q
     public List<QualFilingMaterialChangeDO> 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<Q
     public int countByFilingIdAndUploadStatusCodeAndMaterialType(Long filingId, Integer uploadStatusCode, String materialType) {
         return super.lambdaQuery()
                 .eq(QualFilingMaterialChangeDO::getFilingChangeId, filingId)
-                .eq(QualFilingMaterialChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue())
+                .eq(QualFilingMaterialChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue())
                 .eq(QualFilingMaterialChangeDO::getUploadStatusCode, uploadStatusCode)
                 .eq(QualFilingMaterialChangeDO::getMaterialType, materialType)
                 .count().intValue();

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelCertChangeRepositoryImpl.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.QualFilingPersonnelCertChangePageQry;
+import org.qinan.safetyeval.domain.constant.BooleanQAEnum;
 import org.qinan.safetyeval.infrastructure.persistence.domainobject.QualFilingPersonnelCertChangeDO;
 import org.qinan.safetyeval.infrastructure.persistence.mapper.QualFilingPersonnelCertChangeMapper;
 import org.qinan.safetyeval.infrastructure.persistence.repository.QualFilingPersonnelCertChangeRepository;
@@ -29,7 +30,7 @@ public class QualFilingPersonnelCertChangeRepositoryImpl extends BaseRepositoryI
 
     @Override
     public QualFilingPersonnelCertChangeDO getById(Long id) {
-        return super.lambdaQuery().eq(QualFilingPersonnelCertChangeDO::getId, id).eq(QualFilingPersonnelCertChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue()).one();
+        return super.lambdaQuery().eq(QualFilingPersonnelCertChangeDO::getId, id).eq(QualFilingPersonnelCertChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()).one();
     }
 
     @Override
@@ -86,7 +87,7 @@ public class QualFilingPersonnelCertChangeRepositoryImpl extends BaseRepositoryI
         if (ObjectUtil.isNotEmpty(qualFilingPersonnelCertChangePageQry.getEnv())) {
             qualFilingPersonnelCertChangeDoQueryWrapper.eq("env", qualFilingPersonnelCertChangePageQry.getEnv());
         }
-        qualFilingPersonnelCertChangeDoQueryWrapper.eq("delete_enum", BooleanEnum.FALSE.getValue());
+        qualFilingPersonnelCertChangeDoQueryWrapper.eq("delete_enum", BooleanQAEnum.FALSE.getValue());
         return qualFilingPersonnelCertChangeMapper.selectPage(iPage, qualFilingPersonnelCertChangeDoQueryWrapper);
     }
 
@@ -114,7 +115,7 @@ public class QualFilingPersonnelCertChangeRepositoryImpl extends BaseRepositoryI
     public List<QualFilingPersonnelCertChangeDO> listByFilingId(Long filingId) {
         return super.lambdaQuery()
                 .eq(QualFilingPersonnelCertChangeDO::getFilingChangeId, filingId)
-                .eq(QualFilingPersonnelCertChangeDO::getDeleteEnum, BooleanEnum.FALSE.getValue())
+                .eq(QualFilingPersonnelCertChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue())
                 .list();
     }
 }

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<QualFilingPersonnelChangeDO> 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();
     }