From 419f519430317848ae202c32a0f2e41a62c03d5c Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 27 Nov 2021 14:14:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=85=B3=E8=81=94=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarModelTree/entity/SarModelTree.java | 7 +++++++ .../service/impl/SarModelTreeServiceImpl.java | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java index 0b68d34a..670b4fc7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java @@ -65,4 +65,11 @@ public class SarModelTree extends BaseEntity { @TableField(exist=false) private List childMenuIds; + @TableField("HAS_CHILDREN") + private String hasChildren; + + @TableField(exist = false) + private boolean leaf; + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java index 0635dd2d..faba2999 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java @@ -33,6 +33,14 @@ public class SarModelTreeServiceImpl extends ServiceImpl{ + switch (item.getHasChildren()){ + case "0": + item.setLeaf(true); + break; + case "1": + item.setLeaf(false); + break; + } item.setId(item.getName()); }); return list; @@ -55,6 +63,14 @@ public class SarModelTreeServiceImpl extends ServiceImpl{ + switch (item.getHasChildren()){ + case "0": + item.setLeaf(true); + break; + case "1": + item.setLeaf(false); + break; + } item.setId(item.getName()); }); return children; From 6a44415e85bc8a68acd721c9d803f634b9dbf4a0 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 28 Nov 2021 12:22:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/utils/util/FieldConvertUtil.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 921f9896..5323d86d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -2,6 +2,7 @@ package com.adc.da.utils.util; import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; +import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import java.io.BufferedReader; @@ -11,7 +12,10 @@ import java.sql.Clob; import java.sql.SQLException; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; /** * @Description: 处理各类型字段 @@ -99,11 +103,17 @@ public class FieldConvertUtil { * @Return: java.lang.String */ public static String changeTimeValue (String timeStr) { - if (StringUtils.isNotBlank(timeStr)) { - timeStr = "str_to_date('" + timeStr + "','%Y-%m-%d %H:%i:%s')"; - } else { - timeStr = "null"; - } + + if (StringUtils.isNotBlank(timeStr)) { + List timeList = Arrays.asList(timeStr.split(",")); + + List collect = timeList.stream() + .map(item -> "str_to_date('" + item + "','%Y-%m-%d %H:%i:%s')") + .collect(Collectors.toList()); + timeStr ="concat(" + String.join(", \',\' ,", collect) + ")"; + } else { + timeStr = "null"; + } return timeStr; } From 8753b1ab668a3cd043dda6d54ba36deacafee9c7 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 29 Nov 2021 14:15:01 +0800 Subject: [PATCH 3/6] @TableField("del_flag") --- .../da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java | 1 + .../adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java | 1 + 2 files changed, 2 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java index 905cb9ee..3f4d6a3b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java @@ -71,6 +71,7 @@ public class BusinessDeptIssue { @ExcelIgnore @TableLogic(value = "0",delval = "1") + @TableField("del_flag") private String delFlag; @ExcelProperty("责任部门") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java index f68f5d24..2acb71ee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java @@ -59,6 +59,7 @@ public class ProductDeptIssue { private String responseDept; @TableLogic(value = "0",delval = "1") + @TableField("del_flag") private String delFlag; @TableField("is_close") From 3117af535b6afe139201aefbe613b9189fe3ef63 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 29 Nov 2021 14:15:44 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=A0=87=E5=87=86?= =?UTF-8?q?=E9=A2=84=E8=AD=A6(=E4=B8=8D=E6=8E=A8=E9=80=81)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/scheduled/ScheduledJob.java | 248 +++++++++--------- .../da/scheduled/dao/SarStandardInfoDao.java | 3 +- .../scheduled/dao/SarStandardWarningDao.java | 2 +- .../sarStandWarning/SarStandardInfo.xml | 39 ++- 4 files changed, 148 insertions(+), 144 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index beb4b269..2f1b1283 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -4,17 +4,19 @@ import com.adc.da.scheduled.dao.SarStandardInfoDao; import com.adc.da.scheduled.dao.SarStandardItemDao; import com.adc.da.scheduled.dao.SarStandardWarningDao; import com.adc.da.scheduled.entity.DataDTO; -import com.adc.da.scheduled.entity.WarningEO; + import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; + import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.sun.corba.se.spi.ior.iiop.IIOPFactories; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; @@ -25,6 +27,7 @@ import org.springframework.stereotype.Component; import java.time.LocalDate; import java.util.*; import java.util.regex.Pattern; +import java.util.stream.Collectors; @EnableScheduling @@ -57,121 +60,130 @@ public class ScheduledJob { - @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 -// @Scheduled(cron="*/5 * * * * ?") - @Async - public void WarningSchedulingTasks() { - - - /** - * 1.查询标准属性字段表(sar_stand_attr_info) XCXSSEQ ZCCSSRQ ZRGCS - * 联接标准信息表sar_standards_info表的STAND_NAME - * 2.查询分解单(条款表) - * 3.查询预警表 - * 4.去掉预警表中已存在的的数据 - * 5.插入预警表 - */ - - /** - mark:标识预警的种类 - 3：新车标准预警 - 4：在产车标准预警 - 1：新车条款预警 - 2：在产车条款预警 - */ - - //删除不在预警范围的标准 - QueryWrapper earlyWarningEOQW = new QueryWrapper<>(); - earlyWarningEOQW.lt("PUT_TIME",LocalDate.now()); - int remove = sarStandardWarningDao.delete(earlyWarningEOQW); - System.out.println(remove); - - - System.out.println("开始执行预警!!!"); - - DataDTO term = new DataDTO(); //预警期限(当前日期至3个月后) - - LinkedList warningList = new LinkedList<>();//需预警的标准和条款列表集合 - //分解单(条款) 新车型 mark=1 - List itemForXCXSSRQ = sarStandardItemDao.selectWithinTerm(term, "XCXSSRQ"); - for (WarningEO warningEO : itemForXCXSSRQ) { - warningEO.setId(UUIDUtils.randomUUID20()) - .setPower("1") - .setMark("1") - .setPutTime(warningEO.getXCXSSRQ()) - .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); - } - warningList.addAll(itemForXCXSSRQ); - - //分解单(条款) 在产车型 mark=2 - List itemForZCCSSRQ = sarStandardItemDao.selectWithinTerm(term, "ZCCSSRQ"); - for (WarningEO warningEO : itemForZCCSSRQ) { - warningEO.setId(UUIDUtils.randomUUID20()) - .setPower("1") - .setMark("2") - .setPutTime(warningEO.getZCCSSRQ()) - .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); - - } - warningList.addAll(itemForZCCSSRQ); - - //标准 新车型 预警 mark=3 - List standInfoXCXSSRQ = sarStandardInfoDao.selectWithinTerm(term, "XCXSSRQ"); - for (WarningEO warningEO : standInfoXCXSSRQ) { - warningEO.setId(UUIDUtils.randomUUID20()) - /** - * //如果插入的值均为NULL，则根据索引的原理， - * 全NULL值不被记录在索引上，所以插入全NULL值时，可以有重复的 - * 则此处设为 '-1' - */ - .setItemsId("-1") - .setPower("1") - .setMark("3") - .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); - - - //实施日期达到预警时间,但在产车实施日期不在时间内 - /** - * 2021/9/9取消限制 - */ -// if (term.isTerm(warningEO.getXCXSSRQ())){ -// warningEO.setPutTime(warningEO.getXCXSSRQ()); -// } - warningEO.setPutTime(warningEO.getXCXSSRQ()); - - } - warningList.addAll(standInfoXCXSSRQ); - - - //标准 在产车型 mark=4 - List standInfoZCCSSRQ = sarStandardInfoDao.selectWithinTerm(term, "ZCCSSRQ"); - for (WarningEO warningEO : standInfoZCCSSRQ) { - warningEO.setId(UUIDUtils.randomUUID20()) - /** - * 同上 - */ - .setItemsId("-1") - .setPower("1") - .setMark("4") - .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); - //实施日期达到预警时间,但在产车实施日期不在时间内 - /** - * 2021/9/9取消限制 - */ -// if (term.isTerm(warningEO.getZCCSSRQ())){ -// warningEO.setPutTime(warningEO.getZCCSSRQ()); -// } - warningEO.setPutTime(warningEO.getZCCSSRQ()); - } - warningList.addAll(standInfoZCCSSRQ); - - //持久化至预警表 忽略标准id和标志位都一样的数据 - if (warningList.size()!=0){ - //此表的STAND_ID和MARK字段以及ITEMS_ID字段需个建立唯一性约束 - int count = sarStandardWarningDao.ignoreInsert(warningList); - System.out.println("已预警 " + count + " 条标准或条款!!"); - } - } +// @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 +//// @Scheduled(cron="*/5 * * * * ?") +// @Async +// public void WarningSchedulingTasks() { +// Logger logger = LoggerFactory.getLogger(ScheduledJob.class); +// +// /** +// * 1.查询标准属性字段表(sar_stand_attr_info) XCXSSEQ ZCCSSRQ ZRGCS +// * 联接标准信息表sar_standards_info表的STAND_NAME +// * 2.查询分解单(条款表) +// * 3.查询预警表 +// * 4.去掉预警表中已存在的的数据 +// * 5.插入预警表 +// */ +// +// /** +// mark:标识预警的种类 +// 3：新车标准预警 +// 4：在产车标准预警 +// 1：新车条款预警 +// 2：在产车条款预警 +// */ +// +// //删除不在预警范围的标准 +// QueryWrapper earlyWarningEOQW = new QueryWrapper<>(); +// earlyWarningEOQW.lt("PUT_TIME",LocalDate.now()); +// int remove = sarStandardWarningDao.delete(earlyWarningEOQW); +// System.out.println(remove); +// +// +// System.out.println("开始执行预警!!!"); +// +// DataDTO term = new DataDTO(); //预警期限(当前日期至3个月后) +// +// LinkedList warningList = new LinkedList<>();//需预警的标准和条款列表集合 +// //分解单(条款) 新车型 mark=1 +// List itemForXCXSSRQ = sarStandardItemDao.selectWithinTerm(term, "XCXSSRQ"); +// for (EarlyWarningEO warningEO : itemForXCXSSRQ) { +// warningEO.setId(UUIDUtils.randomUUID20()) +// .setPower("1") +// .setMark("1"); +//// .setPutTime(warningEO.getXCXSSRQ()); +//// .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); +// } +// warningList.addAll(itemForXCXSSRQ); +// +// //分解单(条款) 在产车型 mark=2 +// List itemForZCCSSRQ = sarStandardItemDao.selectWithinTerm(term, "ZCCSSRQ"); +// for (EarlyWarningEO warningEO : itemForZCCSSRQ) { +// warningEO.setId(UUIDUtils.randomUUID20()) +// .setPower("1") +// .setMark("2"); +//// .setPutTime(warningEO.getZCCSSRQ()); +//// .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); +// +// } +// warningList.addAll(itemForZCCSSRQ); +// +// //标准 新车型 预警 mark=3 +// List standInfoXCXSSRQ = sarStandardInfoDao.selectWithinTerm(term, "XCXSSRQ"); +// for (EarlyWarningEO warningEO : standInfoXCXSSRQ) { +// warningEO.setId(UUIDUtils.randomUUID20()) +// /** +// * //如果插入的值均为NULL，则根据索引的原理， +// * 全NULL值不被记录在索引上，所以插入全NULL值时，可以有重复的 +// * 则此处设为 '-1' +// */ +// .setItemsId("-1") +// .setPower("1") +// .setMark("3"); +//// .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); +// +// +// //实施日期达到预警时间,但在产车实施日期不在时间内 +// /** +// * 2021/9/9取消限制 +// */ +//// if (term.isTerm(warningEO.getXCXSSRQ())){ +//// warningEO.setPutTime(warningEO.getXCXSSRQ()); +//// } +//// warningEO.setPutTime(warningEO.getXCXSSRQ()); +// +// } +// warningList.addAll(standInfoXCXSSRQ); +// +// +// //标准 在产车型 mark=4 +// List standIdZCCSSRQ = sarStandardInfoDao.selectWithinTerm(term, "ZCCSSRQ"); +// +// List standInfoZCCSSRQ = standIdZCCSSRQ.stream() +// .map(id -> { +// EarlyWarningEO earlyWarningEO = new EarlyWarningEO(); +// earlyWarningEO.setStandId(id) +// .setItemsId("-1") +// .setPower("1") +// .setMark("4"); +// return earlyWarningEO; +// }).collect(Collectors.toList()); +// warningList.addAll(standInfoZCCSSRQ); +// +// +//// .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); +// //实施日期达到预警时间,但在产车实施日期不在时间内 +// /** +// * 2021/9/9取消限制 +// */ +//// if (term.isTerm(warningEO.getZCCSSRQ())){ +//// warningEO.setPutTime(warningEO.getZCCSSRQ()); +//// } +//// warningEO.setPutTime(warningEO.getZCCSSRQ()); +// +// +// //持久化至预警表 忽略标准id和标志位都一样的数据 +// if (warningList.size()!=0){ +// //此表的STAND_ID和MARK字段以及ITEMS_ID字段需个建立唯一性约束 +// int count = sarStandardWarningDao.ignoreInsert(warningList); +// logger.info("==================================预警结束======================================"); +// logger.info("==================================预警结束======================================"); +// logger.info("已预警"+ count+"条标准或条款!!"); +// logger.info("==================================预警结束======================================"); +// logger.info("==================================预警结束======================================"); +// +// } +// } diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java index 4b2fb0c2..e94e6d07 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java @@ -4,6 +4,7 @@ package com.adc.da.scheduled.dao; import com.adc.da.scheduled.entity.DataDTO; import com.adc.da.scheduled.entity.WarningEO; +import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +13,7 @@ import java.util.List; @Repository public interface SarStandardInfoDao{ - public List selectWithinTerm(DataDTO date, String str); + public List selectWithinTerm(DataDTO date, String str); public int updateStandardInfo(@Param("id")String id, @Param("textStatus") String textStatus); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java index 9e326220..004701e3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java @@ -13,5 +13,5 @@ import java.util.LinkedList; @Repository public interface SarStandardWarningDao extends BaseMapper { - public int ignoreInsert(@Param(value = "warningEOS") LinkedList warningEOS); + public int ignoreInsert(@Param(value = "warningEOS") LinkedList warningEOS); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml index 905fe1e1..a8bedcc1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml @@ -3,33 +3,24 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - SELECT - info.ID, - info.STAND_SORT, - info.STAND_YEAR, - info.STAND_NUMBER, - info.STAND_NAME, - info.STAND_TYPE, - attrInfo.CLLX, - attrInfo.ZRGCS, - attrInfo.SSRQ, - attrInfo.${str} + info.ID FROM sar_standards_info AS info JOIN sar_stand_attr_info AS attrInfo ON info.id = attrinfo.stand_id From 56c94ac3d6f910aa1d3fb133051fa21944b7a01a Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 29 Nov 2021 22:46:51 +0800 Subject: [PATCH 5/6] =?UTF-8?q?ssrq=E4=B8=BA=E7=A9=BA=E6=97=B6=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 565b499b..d8c46134 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -79,19 +79,19 @@ dicstandTextStatus.DIC_TYPE_NAME AS standTextStatusShow, ( CASE - WHEN SAR_STAND_ATTR_INFO.SSRQ ='' THEN '9999-01-01' + WHEN SAR_STAND_ATTR_INFO.SSRQ ='' THEN '' ELSE SAR_STAND_ATTR_INFO.SSRQ END ) AS SSRQ, ( CASE - WHEN SAR_STAND_ATTR_INFO.ZCCSSRQ ='' THEN '9999-01-01' + WHEN SAR_STAND_ATTR_INFO.ZCCSSRQ ='' THEN '' ELSE SAR_STAND_ATTR_INFO.ZCCSSRQ END ) AS ZCCSSRQ, ( CASE - WHEN SAR_STAND_ATTR_INFO.XCXSSRQ ='' THEN '9999-01-01' + WHEN SAR_STAND_ATTR_INFO.XCXSSRQ ='' THEN '' ELSE SAR_STAND_ATTR_INFO.XCXSSRQ END ) AS XCXSSRQ From da97a6071693f688f180227f35f4d8338a9ea012 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 30 Nov 2021 17:40:28 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListServiceImpl.java | 2 +- .../SarLawsAttrDetailedListMapper.xml | 80 +++++++++++++++++++ 2 files changed, 81 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 8c1e51c7..ea61ac36 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -43,7 +43,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl pageRes = new Page<>(sarFindDto.getPage(), sarFindDto.getSize()); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("detailed_list_id", sarFindDto.getId()); - IPage selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper); + IPage selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper); //?????? //查询标准id List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize(),sarFindDto); if (CollectionUtils.isEmpty(lawsIds)){ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 17fe6030..66bd900a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -44,6 +44,86 @@ #{item} + UNION ALL + + SELECT + a.ID, + a.STAND_CODE AS standNumber, + a.STAND_NAME AS standName, + a.STAND_EN_NAME, + b.NYLXCLASS, + null AS SSRQ, + null AS XCXSSRQGJ, + null AS ZCCSSRQGJ, + null as ZRBM, + null as SYCPX, + null as CYCVPPSBM, + null as CYCVPPSCN, + null as KCCVPPSBM, + null as KCCVPPSCN, + null as typeApplicable, + dicstandSort.DIC_TYPE_NAME AS standSortShow, + null as standYear, + null as issueTime, + null asstandType, + null AS textStatus + FROM + sar_bussioness_stand a + LEFT JOIN sar_buss_stand_attr_info b ON a.ID = b.STAND_ID + LEFT JOIN TS_DICTYPE dicstandSort ON ( + dicstandSort.dic_type_code = a.stand_sort + AND dicstandSort.dic_id IS NOT NULL + AND dicstandSort.valid_flag = 0 + AND dicstandSort.PARENT_ID IS NULL + ) + + a.ID IN + + #{item} + + + + UNION ALL + + SELECT + a.ID, + a.LAWS_NUMBER AS standNumber, + a.LAWS_NAME AS standName, + a.LAWS_EN_NAME as STAND_EN_NAME, + b.NYLXLAWS, + b.SSRQLAWS AS SSRQ, + b.XCXSSRQLAWS AS XCXSSRQGJ, + b.ZCXSSRQLAWS AS ZCCSSRQGJ, + b.ZRBMLAWS as ZRBM, + null as SYCPX, + null as CYCVPPSBM, + null as CYCVPPSCN, + null as KCCVPPSBM, + null as KCCVPPSCN, + null as typeApplicable, + dicstandSort.DIC_TYPE_NAME AS standSortShow, + a.LAWS_YEAR as standYear, + a.ISSUE_TIME as issueTime, + null asstandType, + null AS textStatus + FROM + sar_laws_stand_info a + LEFT JOIN sar_laws_attr_info b ON a.ID = b.LAWS_ID + LEFT JOIN TS_DICTYPE dicstandSort ON ( + dicstandSort.dic_type_code = a.LAWS_TYPE + AND dicstandSort.dic_id IS NOT NULL + AND dicstandSort.valid_flag = 0 + AND dicstandSort.PARENT_ID IS NULL + ) + + a.ID IN + + #{item} + + + + +