From d977214a56e33f75a021fec75e9917b25c34c744 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 1 Dec 2021 11:25:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IWarningDateService.java | 8 ++++ .../Impl/EarlyWarningEOServiceImpl.java | 4 -- .../service/Impl/WarningDateServiceImpl.java | 11 +++++ .../impl/SarStandardsInfoServiceImpl.java | 13 ++++-- .../sarStandWarning/EarlyWraningEOMapper.xml | 42 ++++++------------- 5 files changed, 40 insertions(+), 38 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/IWarningDateService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/WarningDateServiceImpl.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/IWarningDateService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/IWarningDateService.java new file mode 100644 index 00000000..6e206854 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/IWarningDateService.java @@ -0,0 +1,8 @@ +package com.adc.da.slrs.sarStandWarning.service; + +import com.adc.da.slrs.sarStandWarning.entity.WarningDate; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface IWarningDateService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index 7ddabbbc..fa113ac5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -1,12 +1,10 @@ package com.adc.da.slrs.sarStandWarning.service.Impl; -import com.adc.da.scheduled.entity.DataDTO; import com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService; -import com.adc.da.sys.util.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,9 +14,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; @Service("EarlyWarningEOService") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/WarningDateServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/WarningDateServiceImpl.java new file mode 100644 index 00000000..e8dd0771 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/WarningDateServiceImpl.java @@ -0,0 +1,11 @@ +package com.adc.da.slrs.sarStandWarning.service.Impl; + +import com.adc.da.slrs.sarStandWarning.dao.WarningDateDao; +import com.adc.da.slrs.sarStandWarning.entity.WarningDate; +import com.adc.da.slrs.sarStandWarning.service.IWarningDateService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service +public class WarningDateServiceImpl extends ServiceImpl implements IWarningDateService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index fd3084ff..8984d362 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarPosition.entity.TsPosition; import com.adc.da.slrs.sarPosition.service.ITsPositionService; import com.adc.da.slrs.sarStandWarning.dao.WarningDateDao; import com.adc.da.slrs.sarStandWarning.entity.WarningDate; +import com.adc.da.slrs.sarStandWarning.service.Impl.WarningDateServiceImpl; import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.att.vo.AttFileVo; @@ -125,6 +126,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl multiTimeMap) throws Exception { @@ -1052,8 +1055,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl0){ - warningDateDao.deleteById(standId); - //TODO 实施日期存表 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("law_id",standId); + warningDateService.remove(wrapper); + warningDateService.saveBatch(warningDateList); } } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index 82229446..387b731c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -51,7 +51,7 @@ AND ( - DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') >= DATE_FORMAT( + DATE_FORMAT(sarInfo.PUT_TIME, '%Y-%m-%d') >= DATE_FORMAT( #{waringEO.endPutTime}, '%Y-%m-%d' ) @@ -65,16 +65,10 @@ AND ( - DATE_FORMAT( attr.SSRQ, '%Y-%m-%d') >= DATE_FORMAT( - #{waringEO.startSSRQ}, - '%Y-%m-%d' - ) - + sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') >= DATE_FORMAT(#{waringEO.startSSRQ}, '%Y-%m-%d') AND - DATE_FORMAT( attr.SSRQ, '%Y-%m-%d') <= DATE_FORMAT( - #{waringEO.endSSRQ}, - '%Y-%m-%d' - ) + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') <= DATE_FORMAT(#{waringEO.endSSRQ}, '%Y-%m-%d') AND t.time_name = 'SSRQ' ) ) @@ -98,37 +92,25 @@ LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID POWER = '1' - + AND (MARK = 'stand') AND attr.CLLX LIKE CONCAT('%', #{waringEO.applyType},'%') AND ( - DATE_FORMAT( attr.XCXSSRQ, '%Y-%m-%d') >= DATE_FORMAT( - #{waringEO.startXCXSSRQ}, - '%Y-%m-%d' - ) - + sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') >= DATE_FORMAT(#{waringEO.startXCXSSRQ}, '%Y-%m-%d') AND - DATE_FORMAT( attr.XCXSSRQ, '%Y-%m-%d') <= DATE_FORMAT( - #{waringEO.endXCXSSRQ}, - '%Y-%m-%d' - ) + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') <= DATE_FORMAT(#{waringEO.endXCXSSRQ}, '%Y-%m-%d') AND t.time_name = 'XCXSSRQ' ) ) AND ( - DATE_FORMAT( attr.ZCCSSRQ, '%Y-%m-%d') >= DATE_FORMAT( - #{waringEO.startZCCSSRQ}, - '%Y-%m-%d' - ) - + sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') >= DATE_FORMAT(#{waringEO.startZCCSSRQ}, '%Y-%m-%d') AND - DATE_FORMAT( attr.ZCCSSRQ, '%Y-%m-%d') <= DATE_FORMAT( - #{waringEO.endZCCSSRQ}, - '%Y-%m-%d' - ) + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') <= DATE_FORMAT(#{waringEO.startZCCSSRQ}, '%Y-%m-%d') AND t.time_name = 'ZCCSSRQ' ) ) @@ -156,7 +138,7 @@ LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID POWER = '1' - + AND (MARK = 'item') AND items.APPLY_ARCTIC LIKE CONCAT('%', #{waringEO.applyType},'%')