From 0753963ff7965000f71522ade862fbadd0641d0c Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 31 Jul 2024 18:21:25 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E5=88=A0=E9=99=A4=E9=87=8D=E6=B1=BD?= =?UTF-8?q?=E7=9A=84=E6=A0=87=E5=87=86=E6=9B=BF=E4=BB=A3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 19 ++----------------- .../standard/job/UpdateStandardStatusJob.java | 6 +++++- .../service/ILawsReplacedStandardService.java | 2 +- .../impl/LawsReplacedStandardServiceImpl.java | 11 +++-------- 4 files changed, 11 insertions(+), 27 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 29fcf6d2..fef95034 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -25,7 +25,6 @@ import com.jero.common.util.IntekeyUtils; import com.jero.common.util.MessageUtils; import com.jero.common.util.oConvertUtils; import com.jero.common.util.obs.ObsBootUtil; -import com.jero.modules.activiti.process.common.enums.StandardStateEnum; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.mapper.LawsCommonMapper; import com.jero.modules.laws.common.service.ILawsCommonService; @@ -957,25 +956,11 @@ public class LawsCommonServiceImpl implements ILawsCommonService { String replacedStandard = (String) parameterMap.get(FieldCommon.REPLACED_STANDARD); // 获取标准状态 String standardState = (String) parameterMap.get(FieldCommon.STANDARD_STATE); - // 如果标准状态不是现行有效则不处理代替标准 - boolean replaceFlag = false; - if (StringUtils.isNotBlank(standardState)) { - // 企标需要自动拼装标准号 - if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) { - if (standardState.equals(StandardStateEnum.CURRENTLY_EFFECTIVE.getStateValue())) { - replaceFlag = true; - } - } else { - if (standardState.equals(OutStandardStateEnum.CURRENTLY_EFFECTIVE.getStateValue())) { - replaceFlag = true; - } - } - } // 先删除已经存储的关联 lawsReplacedStandardService.removeRelation(standardNumber, 1); if (StringUtils.isNotBlank(replacedStandard)) { // 再添加新的关联 - lawsReplacedStandardService.addRelationWithReplaceFlag(replacedStandard, standardNumber, 1, replaceFlag); + lawsReplacedStandardService.addRelationWithReplaceFlag(replacedStandard, standardNumber, 1); } // 引用标准 String referenceStandard = (String) parameterMap.get(FieldCommon.REFERENCE_STANDARD); @@ -983,7 +968,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { lawsReplacedStandardService.removeRelation(standardNumber, 2); if (StringUtils.isNotBlank(referenceStandard)) { // 再添加新的关联 - lawsReplacedStandardService.addRelationWithReplaceFlag(referenceStandard, standardNumber, 2, replaceFlag); + lawsReplacedStandardService.addRelationWithReplaceFlag(referenceStandard, standardNumber, 2); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/job/UpdateStandardStatusJob.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/job/UpdateStandardStatusJob.java index 29af6346..a6117d67 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/job/UpdateStandardStatusJob.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/job/UpdateStandardStatusJob.java @@ -31,7 +31,7 @@ public class UpdateStandardStatusJob implements Job { @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { this.updateGbStandardState(); - this.updateEsStandardState(); +// this.updateEsStandardState(); } private void updateEsStandardState() { @@ -54,6 +54,10 @@ public class UpdateStandardStatusJob implements Job { } private void updateGbStandardState(){ + // 新版本标准到达新认证车实施日期，被代替标准选择了自动更新逻辑，到期变成废止状态；选择不执行自动更新逻辑，到期不变废止状态 + + + // 国内标准状态更新 List needUpdateGbList = new ArrayList<>(); LambdaQueryWrapper gbWrapper = new LambdaQueryWrapper<>(); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsReplacedStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsReplacedStandardService.java index f6d4a347..7dce8909 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsReplacedStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsReplacedStandardService.java @@ -23,7 +23,7 @@ public interface ILawsReplacedStandardService extends IService