From 0c19f54f5f30c3212e1477d1e0e021397dccd29b Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 2 Feb 2024 15:21:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2079828=20=E8=BD=A6=E5=9E=8B=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=E8=AF=A6=E6=83=85-=E8=B0=83=E5=8F=96?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=9C=A8=E4=BA=A7=E8=BD=A6?= =?UTF-8?q?=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E3=80=81=E6=96=B0=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsAsmsDomesticServiceImpl.java | 17 +++++++++++------ .../mapper/LawsDomesticStandardMapper.java | 12 ++++++++++++ .../mapper/LawsOverseasStandardMapper.java | 12 ++++++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsDomesticServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsDomesticServiceImpl.java index ef5b6812..7fb93050 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsDomesticServiceImpl.java +++ b/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 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 gblist = lawsDomesticStandardService.list(); - List fblist = lawsOverseasStandardService.list(); + // 先清理废止日期垃圾时间数据 + lawsDomesticStandardMapper.cleanAnnulmentDate(); + lawsOverseasStandardMapper.cleanAnnulmentDate(); + List gblist = lawsDomesticStandardMapper.listWithoutDelFlag(); + List fblist = lawsOverseasStandardMapper.listWithoutDelFlag(); // 遍历所有国标数据，清理新车型实施日期 在产车实施日期两个字段中的脏数据 for (LawsDomesticStandard standard : gblist) { String newModelImplementationDate = standard.getNewModelImplementationDate(); @@ -164,7 +169,7 @@ public class LawsAsmsDomesticServiceImpl extends ServiceImpl { + @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 listWithoutDelFlag(); + + @Select("UPDATE laws_domestic_standard SET annulment_date = null WHERE annulment_date = '0000-00-00'") + void cleanAnnulmentDate(); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsOverseasStandardMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsOverseasStandardMapper.java index 72c7d769..0efd0d74 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsOverseasStandardMapper.java +++ b/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 { + @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 listWithoutDelFlag(); + + @Select("UPDATE laws_overseas_standard SET annulment_date = null WHERE annulment_date = '0000-00-00'") + void cleanAnnulmentDate(); }