ci: 删除重汽的标准替代逻辑

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

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<LawsDomesticStandard> needUpdateGbList = new ArrayList<>();
         LambdaQueryWrapper<LawsDomesticStandard> gbWrapper = new LambdaQueryWrapper<>();

laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsReplacedStandardService.java

@@ -23,7 +23,7 @@ public interface ILawsReplacedStandardService extends IService<LawsReplacedStand
 	 * @Date: 2024/3/4 9:45
 	 * @Description: 添加代替标准关联（通过标识控制是否更改标准状态为废止）
 	 **/
-	void addRelationWithReplaceFlag(String replaced, String replacedBy, Integer type, boolean replaceFlag);
+	void addRelationWithReplaceFlag(String replaced, String replacedBy, Integer type);
 
 	/**
 	 * @Author: liao

laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsReplacedStandardServiceImpl.java

@@ -43,7 +43,7 @@ public class LawsReplacedStandardServiceImpl extends ServiceImpl<LawsReplacedSta
      **/
     @Override
     public void addRelation(String replaced, String replacedBy, Integer type) {
-        this.addRelationWithReplaceFlag(replaced, replacedBy, type, true);
+        this.addRelationWithReplaceFlag(replaced, replacedBy, type);
     }
 
     /**
@@ -52,7 +52,7 @@ public class LawsReplacedStandardServiceImpl extends ServiceImpl<LawsReplacedSta
      * @Description: 添加代替标准关联
      **/
     @Override
-    public void addRelationWithReplaceFlag(String replaced, String replacedBy, Integer type, boolean replaceFlag) {
+    public void addRelationWithReplaceFlag(String replaced, String replacedBy, Integer type) {
         // 如果代替的标准为空
         if (StringUtils.isBlank(replaced)) {
             return;
@@ -68,17 +68,12 @@ public class LawsReplacedStandardServiceImpl extends ServiceImpl<LawsReplacedSta
             replacedStandardList.add(replacedStandard);
         });
         saveBatch(replacedStandardList);
-
-        if (1 == type && replaceFlag) {
-            // 代替的标准号变成废止状态
-            lawsCommonService.updateToAbolish(replacedList);
-        }
     }
 
     @Override
     public void addRelationOldSystemSync(String replaced, String replacedBy, Integer type) {
         // 如果代替的标准为空
-        this.addRelationWithReplaceFlag(replaced, replacedBy, type, false);
+        this.addRelationWithReplaceFlag(replaced, replacedBy, type);
     }
 
     /**