From e8963f878f9a8da2712d4e90b75716ad629b0e1f Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 7 Jul 2026 17:31:07 +0800 Subject: [PATCH 1/3] fix bug orgId not send --- .../safetyeval/app/orchestrator/QualFilingOrchestrator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 225d297..3ceccd5 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 @@ -945,7 +945,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); } From c57c7bb83c5181ca8748ba187950a35b59f2031d Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 7 Jul 2026 17:51:18 +0800 Subject: [PATCH 2/3] fix bug orgId not send --- .../QualFilingCommitmentChangeDO.java | 1 + .../QualFilingEquipmentChangeDO.java | 7 +++++ .../QualFilingMaterialChangeDO.java | 1 + .../QualFilingPersonnelCertChangeDO.java | 7 +++++ .../QualFilingPersonnelChangeDO.java | 7 +++++ ...alFilingPersonnelChangeRepositoryImpl.java | 29 +++++++++---------- 6 files changed, 37 insertions(+), 15 deletions(-) diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingCommitmentChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingCommitmentChangeDO.java index 740cc99..76635d2 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingCommitmentChangeDO.java +++ b/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; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingEquipmentChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingEquipmentChangeDO.java index 2de8b6a..aa40ecf 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingEquipmentChangeDO.java +++ b/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 */ 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 2cf55ab..6395c01 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 @@ -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; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java index a9252d1..89c1c27 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java +++ b/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 */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java index 967aac1..0239453 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java +++ b/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 */ 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 08aaca8..b8c14c3 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 @@ -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,34 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl< @Override public java.util.List listByFilingId(Long filingId) { - return super.lambdaQuery() + return qualFilingPersonnelChangeMapper.selectList(new LambdaQueryWrapper() .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId) - .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()) - .list(); + .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue())); } @Override public int countByFilingId(Long filingId) { - return super.lambdaQuery() + return qualFilingPersonnelChangeMapper.selectCount(new LambdaQueryWrapper() .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId) - .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()) - .count().intValue(); + .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue())) + .intValue(); } @Override public int countByFilingIdAndRegisterEngineerFlag(Long filingId, Integer registerEngineerFlag) { - return super.lambdaQuery() - .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId) - .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()) - .eq(QualFilingPersonnelChangeDO::getRegisterEngineerFlag, registerEngineerFlag) - .count().intValue(); + return qualFilingPersonnelChangeMapper.selectCount(new LambdaQueryWrapper() + .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId) + .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()) + .eq(QualFilingPersonnelChangeDO::getRegisterEngineerFlag, registerEngineerFlag)) + .intValue(); } @Override public int countByFilingIdAndJoinWorkDateAfter(Long filingId, java.time.LocalDate joinWorkDate) { - return super.lambdaQuery() + return qualFilingPersonnelChangeMapper.selectCount(new LambdaQueryWrapper() .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId) .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()) - .gt(QualFilingPersonnelChangeDO::getJoinWorkDate, joinWorkDate) - .count().intValue(); + .gt(QualFilingPersonnelChangeDO::getJoinWorkDate, joinWorkDate)) + .intValue(); } } From 566fbe4965545e10574fd9c41d508a1a7333c88f Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 7 Jul 2026 17:57:48 +0800 Subject: [PATCH 3/3] fix bug orgId not send --- .../impl/QualFilingPersonnelChangeRepositoryImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 b8c14c3..f0ebcf4 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 @@ -166,7 +166,10 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl< return qualFilingPersonnelChangeMapper.selectCount(new LambdaQueryWrapper() .eq(QualFilingPersonnelChangeDO::getFilingChangeId, filingId) .eq(QualFilingPersonnelChangeDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue()) - .gt(QualFilingPersonnelChangeDO::getJoinWorkDate, joinWorkDate)) + .and(wrapper -> wrapper + .gt(QualFilingPersonnelChangeDO::getJoinWorkDate, joinWorkDate) + .or() + .isNull(QualFilingPersonnelChangeDO::getJoinWorkDate))) .intValue(); } }