Merge remote-tracking branch 'origin/dev' into dev

safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java

@@ -954,7 +954,7 @@ public class QualFilingOrchestrator {
      */
     private QualFilingChangeComplianceCheckResultCO checkMainQualificationChange(QualFilingChangeEntity change) {
         boolean pass = change.getFixedAssetAmount() != null
-                && change.getFixedAssetAmount() >= 1_000_000_000L;
+                && change.getFixedAssetAmount() >= 1_000L;
         return buildChangeResult(QualFilingComplianceCheckEnum.MAIN_QUALIFICATION,
                 pass ? QualFilingComplianceCheckEnum.STATUS_PASS : QualFilingComplianceCheckEnum.STATUS_FAIL);
     }

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingCommitmentChangeDO.java

@@ -1,6 +1,7 @@
 package org.qinan.safetyeval.infrastructure.persistence.domainobject;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
 import lombok.Data;

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingEquipmentChangeDO.java

@@ -1,5 +1,6 @@
 package org.qinan.safetyeval.infrastructure.persistence.domainobject;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
 import lombok.Data;
@@ -19,6 +20,12 @@ import java.math.BigDecimal;
 public class QualFilingEquipmentChangeDO extends BaseDO {
     private static final long serialVersionUID = 1L;
 
+    @TableLogic(
+            value = "false",
+            delval = "true"
+    )
+    protected String deleteEnum;
+
     /**
      * 备案变更id
      */

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingMaterialChangeDO.java

@@ -1,5 +1,6 @@
 package org.qinan.safetyeval.infrastructure.persistence.domainobject;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
 import lombok.Data;

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java

@@ -1,6 +1,7 @@
 package org.qinan.safetyeval.infrastructure.persistence.domainobject;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
 import lombok.Data;
@@ -20,6 +21,12 @@ import java.time.LocalDateTime;
 public class QualFilingPersonnelCertChangeDO extends BaseDO {
     private static final long serialVersionUID = 1L;
 
+    @TableLogic(
+            value = "false",
+            delval = "true"
+    )
+    protected String deleteEnum;
+
     /**
      * 备案变更id
      */

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java

@@ -1,6 +1,7 @@
 package org.qinan.safetyeval.infrastructure.persistence.domainobject;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
 import lombok.Data;
@@ -20,6 +21,12 @@ import java.time.LocalDateTime;
 public class QualFilingPersonnelChangeDO extends BaseDO {
     private static final long serialVersionUID = 1L;
 
+    @TableLogic(
+            value = "false",
+            delval = "true"
+    )
+    protected String deleteEnum;
+
     /**
      * 备案变更id
      */

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java

@@ -1,9 +1,9 @@
 package org.qinan.safetyeval.infrastructure.persistence.repository.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-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;
@@ -139,35 +139,37 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl<
 
     @Override
     public java.util.List<QualFilingPersonnelChangeDO> listByFilingId(Long filingId) {
-        return super.lambdaQuery()
+        return qualFilingPersonnelChangeMapper.selectList(new LambdaQueryWrapper<QualFilingPersonnelChangeDO>()
                 .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId)
-                .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue())
+                .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()));
-                .list();
     }
 
     @Override
     public int countByFilingId(Long filingId) {
-        return super.lambdaQuery()
+        return qualFilingPersonnelChangeMapper.selectCount(new LambdaQueryWrapper<QualFilingPersonnelChangeDO>()
                 .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId)
-                .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue())
+                .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()))
-                .count().intValue();
+                .intValue();
     }
 
     @Override
     public int countByFilingIdAndRegisterEngineerFlag(Long filingId, Integer registerEngineerFlag) {
-        return super.lambdaQuery()
+        return qualFilingPersonnelChangeMapper.selectCount(new LambdaQueryWrapper<QualFilingPersonnelChangeDO>()
                         .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId)
                         .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue())
-                .eq(QualFilingPersonnelChangeDO::getRegisterEngineerFlag, registerEngineerFlag)
+                        .eq(QualFilingPersonnelChangeDO::getRegisterEngineerFlag, registerEngineerFlag))
-                .count().intValue();
+                .intValue();
     }
 
     @Override
     public int countByFilingIdAndJoinWorkDateAfter(Long filingId, java.time.LocalDate joinWorkDate) {
-        return super.lambdaQuery()
+        return qualFilingPersonnelChangeMapper.selectCount(new LambdaQueryWrapper<QualFilingPersonnelChangeDO>()
                 .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId)
                 .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue())
+                .and(wrapper -> wrapper
                         .gt(QualFilingPersonnelChangeDO::getJoinWorkDate, joinWorkDate)
-                .count().intValue();
+                        .or()
+                        .isNull(QualFilingPersonnelChangeDO::getJoinWorkDate)))
+                .intValue();
     }
 }