fix: 79828 车型项目库详情-调取的数据，在产车实施日期、新车型实施日期没有正常回显

laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsDomesticServiceImpl.java

@@ -7,6 +7,8 @@ import com.jero.modules.docking.asms.mapper.LawsAsmsDomesticMapper;
 import com.jero.modules.docking.asms.service.ILawsAsmsDomesticService;
 import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
 import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
+import com.jero.modules.laws.standard.mapper.LawsDomesticStandardMapper;
+import com.jero.modules.laws.standard.mapper.LawsOverseasStandardMapper;
 import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
 import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
 import org.hibernate.validator.constraints.pl.REGON;
@@ -39,10 +41,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 public class LawsAsmsDomesticServiceImpl extends ServiceImpl<LawsAsmsDomesticMapper, LawsAsmsDomestic> implements ILawsAsmsDomesticService {
 
 	@Resource
-	private ILawsDomesticStandardService lawsDomesticStandardService;
+	private LawsDomesticStandardMapper lawsDomesticStandardMapper;
 
 	@Resource
-	private ILawsOverseasStandardService lawsOverseasStandardService;
+	private LawsOverseasStandardMapper lawsOverseasStandardMapper;
 
     /**
      * 分页查询
@@ -133,8 +135,11 @@ public class LawsAsmsDomesticServiceImpl extends ServiceImpl<LawsAsmsDomesticMap
 	 */
 	@Override
 	public void cleanData() {
-		List<LawsDomesticStandard> gblist = lawsDomesticStandardService.list();
+		// 先清理废止日期垃圾时间数据
-		List<LawsOverseasStandard> fblist = lawsOverseasStandardService.list();
+		lawsDomesticStandardMapper.cleanAnnulmentDate();
+		lawsOverseasStandardMapper.cleanAnnulmentDate();
+		List<LawsDomesticStandard> gblist = lawsDomesticStandardMapper.listWithoutDelFlag();
+		List<LawsOverseasStandard> fblist = lawsOverseasStandardMapper.listWithoutDelFlag();
 		// 遍历所有国标数据，清理新车型实施日期 在产车实施日期两个字段中的脏数据
 		for (LawsDomesticStandard standard : gblist) {
 			String newModelImplementationDate = standard.getNewModelImplementationDate();
@@ -164,7 +169,7 @@ public class LawsAsmsDomesticServiceImpl extends ServiceImpl<LawsAsmsDomesticMap
 							.distinct().collect(Collectors.joining(",")));
 				}
 			}
-			lawsDomesticStandardService.updateById(standard);
+			lawsDomesticStandardMapper.updateIgnoreDelFlag(standard);
 		}
 
 		for (LawsOverseasStandard standard : fblist) {
@@ -195,7 +200,7 @@ public class LawsAsmsDomesticServiceImpl extends ServiceImpl<LawsAsmsDomesticMap
 							.distinct().collect(Collectors.joining(",")));
 				}
 			}
-			lawsOverseasStandardService.updateById(standard);
+			lawsOverseasStandardMapper.updateIgnoreDelFlag(standard);
 		}
 	}
 }

laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsDomesticStandardMapper.java

@@ -2,6 +2,10 @@ package com.jero.modules.laws.standard.mapper;
 
 import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
 
 /**
  * @Description: 国内标准
@@ -11,4 +15,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface LawsDomesticStandardMapper extends BaseMapper<LawsDomesticStandard> {
 
+    @Update("UPDATE laws_domestic_standard SET new_model_implementation_date = #{newModelImplementationDate}, on_the_production_date = #{onTheProductionDate} WHERE id = #{id}")
+    void updateIgnoreDelFlag(LawsDomesticStandard standard);
+
+    @Select("SELECT * FROM laws_domestic_standard")
+    List<LawsDomesticStandard> listWithoutDelFlag();
+
+    @Select("UPDATE laws_domestic_standard SET annulment_date = null WHERE annulment_date = '0000-00-00'")
+    void cleanAnnulmentDate();
 }

laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsOverseasStandardMapper.java

@@ -2,6 +2,10 @@ package com.jero.modules.laws.standard.mapper;
 
 import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
 
 /**
  * @Description: 海外标准
@@ -11,4 +15,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface LawsOverseasStandardMapper extends BaseMapper<LawsOverseasStandard> {
 
+    @Update("UPDATE laws_overseas_standard SET new_model_implementation_date = #{newModelImplementationDate}, on_the_production_date = #{onTheProductionDate} WHERE id = #{id}")
+    void updateIgnoreDelFlag(LawsOverseasStandard standard);
+
+    @Select("SELECT * FROM laws_overseas_standard")
+    List<LawsOverseasStandard> listWithoutDelFlag();
+
+    @Select("UPDATE laws_overseas_standard SET annulment_date = null WHERE annulment_date = '0000-00-00'")
+    void cleanAnnulmentDate();
 }