From 016e7e90034e895ebc046a6c166352f6c7644250 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 27 Aug 2021 11:29:15 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/ScheduledJob.java | 8 ++++---- .../main/java/com/adc/da/scheduled/entity/DataDTO.java | 4 ++-- 2 files changed, 6 insertions(+), 6 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 3261df90..c984a930 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 @@ -79,10 +79,10 @@ public class ScheduledJob { 2：在产车条款预警 */ System.out.println("开始执行预警!!!"); - //预警期限 - DataDTO term = new DataDTO(); - LinkedList warningList = new LinkedList<>(); + DataDTO term = new DataDTO(); //预警期限(当前日期至3个月后) + + LinkedList warningList = new LinkedList<>();//需预警的标准和条款列表集合 //分解单(条款) 新车型 mark=1 List itemForXCXSSRQ = sarStandardItemDao.select(term, "XCXSSRQ"); for (WarningEO warningEO : itemForXCXSSRQ) { @@ -126,7 +126,7 @@ public class ScheduledJob { //持久化至预警表 忽略标准id和标志位都一样的数据 if (warningList.size()!=0){ - //此表的STAND_CODE和MARK字段需建立唯一性约束 + //此表的STAND_ID和MARK字段以及ITEMS_ID和MARK字段需两个建立唯一性约束 int count = sarStandardWarningDao.ignoreInsert(warningList); System.out.println("已预警 " + count + " 条标准或条款!!"); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java index 16c3c424..65db1b69 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java @@ -21,7 +21,7 @@ public class DataDTO { // private String str; public DataDTO() { - this.startDate =LocalDate.now().plusDays(1); //系统日期的下一天 - this.endDate = LocalDate.now().plusMonths(3).plusDays(1);//系统日期3个月后 + this.startDate =LocalDate.now(); //系统当前日期 + this.endDate = LocalDate.now().plusMonths(3);//系统当前日期3个月后 } } From c22db5b0637e11d8f7e56324d5a05f475f112842 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 27 Aug 2021 15:24:32 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/scheduled/ImplementScheduledJob.java | 32 +++++++++++++++++++ ...duledJob.java => WarningScheduledJob.java} | 10 +++--- .../da/scheduled/dao/SarStandardInfoDao.java | 2 +- .../da/scheduled/dao/SarStandardItemDao.java | 2 +- .../sarStandWarning/SarStandardInfo.xml | 2 +- .../sarStandWarning/SarStandardItem.xml | 2 +- 6 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/scheduled/ImplementScheduledJob.java rename adc-da-slrs/src/main/java/com/adc/da/scheduled/{ScheduledJob.java => WarningScheduledJob.java} (96%) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ImplementScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ImplementScheduledJob.java new file mode 100644 index 00000000..a42afeaf --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ImplementScheduledJob.java @@ -0,0 +1,32 @@ +package com.adc.da.scheduled; + +import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +@EnableScheduling +@Component +@Slf4j +public class ImplementScheduledJob { + + @Autowired + private SarStandardsInfoDao sarStandardsInfoDao; + + + @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 +// @Scheduled(cron="*/5 * * * * ?") + @Async + public void schedulingTasks() { + QueryWrapper wrapper = new QueryWrapper<>(); + + + } + + +} 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/WarningScheduledJob.java similarity index 96% rename from adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java rename to adc-da-slrs/src/main/java/com/adc/da/scheduled/WarningScheduledJob.java index c984a930..d46769ca 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/WarningScheduledJob.java @@ -21,7 +21,7 @@ import java.util.List; @EnableScheduling @Component @Slf4j -public class ScheduledJob { +public class WarningScheduledJob { /** * 根据配置文件设置是否开启定时器 @@ -84,7 +84,7 @@ public class ScheduledJob { LinkedList warningList = new LinkedList<>();//需预警的标准和条款列表集合 //分解单(条款) 新车型 mark=1 - List itemForXCXSSRQ = sarStandardItemDao.select(term, "XCXSSRQ"); + List itemForXCXSSRQ = sarStandardItemDao.selectWithinTerm(term, "XCXSSRQ"); for (WarningEO warningEO : itemForXCXSSRQ) { warningEO.setId(UUIDUtils.randomUUID20()) .setPower("1") @@ -94,7 +94,7 @@ public class ScheduledJob { warningList.addAll(itemForXCXSSRQ); //分解单(条款) 在产车型 mark=2 - List itemForZCCSSRQ = sarStandardItemDao.select(term, "ZCCSSRQ"); + List itemForZCCSSRQ = sarStandardItemDao.selectWithinTerm(term, "ZCCSSRQ"); for (WarningEO warningEO : itemForZCCSSRQ) { warningEO.setId(UUIDUtils.randomUUID20()) .setPower("1") @@ -104,7 +104,7 @@ public class ScheduledJob { warningList.addAll(itemForZCCSSRQ); //标准 新车型 预警 mark=3 - List standInfoXCXSSRQ = sarStandardInfoDao.select(term, "XCXSSRQ"); + List standInfoXCXSSRQ = sarStandardInfoDao.selectWithinTerm(term, "XCXSSRQ"); for (WarningEO warningEO : standInfoXCXSSRQ) { warningEO.setId(UUIDUtils.randomUUID20()) .setPower("1") @@ -115,7 +115,7 @@ public class ScheduledJob { //标准 在产车型 mark=4 - List standInfoZCCSSRQ = sarStandardInfoDao.select(term, "ZCCSSRQ"); + List standInfoZCCSSRQ = sarStandardInfoDao.selectWithinTerm(term, "ZCCSSRQ"); for (WarningEO warningEO : standInfoZCCSSRQ) { warningEO.setId(UUIDUtils.randomUUID20()) .setPower("1") 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 f2679cbc..9203db20 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 @@ -12,6 +12,6 @@ import java.util.List; @Repository public interface SarStandardInfoDao{ - public List select(DataDTO date, String str); + public List selectWithinTerm(DataDTO date, String str); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java index 401c9fa4..b21f0af8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java @@ -12,6 +12,6 @@ import java.util.List; @Repository public interface SarStandardItemDao extends BaseMapper{ - public List select(DataDTO date, String str); + public List selectWithinTerm(DataDTO date, String str); } 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 518aa911..53e0582a 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 @@ -15,7 +15,7 @@ - SELECT info.ID, info.STAND_NUMBER, diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml index 01a5167a..d05e821b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml @@ -17,7 +17,7 @@ - SELECT items.ID, STAND_ID, From 3070ec5e59dddef4cd0f22c7ecae31c2fa53f554 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 25 Aug 2021 15:17:55 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandardsInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 421bf4f0..3528e41d 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 @@ -2174,7 +2174,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Wed, 25 Aug 2021 17:02:59 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E9=A1=B9=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E5=8A=A0standType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarStandUnqualifiedDao.java | 5 ++ .../entity/SarStandUnqualified.java | 4 ++ .../impl/SarStandUnqualifiedServiceImpl.java | 54 ++++++++++--------- .../impl/SarFileSplitItemsEOServiceImpl.java | 13 +++++ .../SarStandUnqualifiedMapper.xml | 46 ++++++++++++++++ 5 files changed, 96 insertions(+), 26 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java index 5d7791d0..c456d737 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** *

* Mapper 接口 @@ -20,5 +22,8 @@ import org.apache.ibatis.annotations.Mapper; public interface SarStandUnqualifiedDao extends BaseMapper { IPage getAllDatasByPage(Page page,@Param("sar") SarStandUnqualifiedPage sarStandUnqualified); + List getSarStandUnqualifiedPage(@Param("start")Integer start, @Param("end")Integer end, @Param("sar") SarStandUnqualifiedPage sarStandUnqualified); + + Integer getSarStandUnqualifiedCount(@Param("sar") SarStandUnqualifiedPage sarStandUnqualified); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index d6e29253..9f5e772e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -166,5 +166,9 @@ public class SarStandUnqualified extends BaseEntity { @TableField(exist=false) private String dutyEngineerName; + @ApiModelProperty(value = "国内OR海外") + @TableField(exist=false) + private String standType; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index 599e5517..aaaff4f2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -47,7 +47,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { QueryWrapper wrapper1 = new QueryWrapper<>(); - wrapper1.select("STAND_NUMBER","STAND_SORT","STAND_YEAR"); + wrapper1.select("STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_TYPE"); wrapper1.last("INNER JOIN sar_stand_unqualified r ON r.STAND_ID = sar_standards_info.ID WHERE sar_standards_info.ID='"+sarStandUnqualifiedPage.getStandId()+"'"); Page page1 = new Page<>(); IPage userIPage1 = sarStandardsInfoDao.selectPage(page1,wrapper1); @@ -66,33 +66,35 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); - if(sarStandUnqualifiedPage.getStandId()!=null){ - sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()); - } - //仅查询未关闭的 - sarStandUnqualifiedQueryWrapper.eq("close_state",1); - //根据 项目名称 进行查询 - if(sarStandUnqualifiedPage.getProductName()!=null){ - sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName()); - } - //根据 责任部门 进行查询 - if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ - sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); - } - //根据 标准号/标准名称 进行查询 - if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){ -// sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName()); - sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" + - "\t\tOR stand_name LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%')"); - } +// QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); +// if(sarStandUnqualifiedPage.getStandId()!=null){ +// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()); +// } +// //仅查询未关闭的 +// sarStandUnqualifiedQueryWrapper.eq("close_state",1); +// //根据 项目名称 进行查询 +// if(sarStandUnqualifiedPage.getProductName()!=null){ +// sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName()); +// } +// //根据 责任部门 进行查询 +// if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ +// sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); +// } +// //根据 标准号/标准名称 进行查询 +// if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){ +//// sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName()); +// sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" + +// "\t\tOR stand_name LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%')"); +// } Page standUnqualifiedPage=new Page<>(); //判断前端是否提供页码和每页条数 - if(sarStandUnqualifiedPage.getCurrent()!=null - && sarStandUnqualifiedPage.getSize()!=null){ - standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); - } - return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper); + List sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage); + Integer total=sarStandUnqualifiedDao.getSarStandUnqualifiedCount(sarStandUnqualifiedPage); + standUnqualifiedPage.setRecords(sarStandUnqualifieds); + standUnqualifiedPage.setTotal(total); + standUnqualifiedPage.setCurrent(sarStandUnqualifiedPage.getCurrent()); + standUnqualifiedPage.setSize(sarStandUnqualifiedPage.getSize()); + return standUnqualifiedPage; } /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java index 06d92dfa..8080938d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -74,23 +74,36 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic @Override public Map getByPage(SarFileSplitItemsEOPage page) { + //ValidFlag为0的意思是有效，设置这个文件分解清单的有效性为有效 page.setValidFlag("0"); + //把SAR_FILE_SPLIT_MENU表里的数据按照display_seq的从小到大的正序进行排列 page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); + //如果SAR_FILE_SPLIT_ITEMS表里的拆分目录ID即MenuId不为空 if (com.adc.da.util.utils.StringUtils.isNotEmpty(page.getMenuId())) { + //把根据条件查询SAR_FILE_SPLIT_MENU表查出来的数据放到sarFileSplitMenuEOList里 List sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage()); + //把这个sarFileSplitMenuEOList转换成树的形式 Tree tree = new Tree<>(sarFileSplitMenuEOList); + //treeNode就是树的子节点中的SAR_FILE_SPLIT_ITEMS表中的menuId TreeNode treeNode = tree.getTreeNode(page.getMenuId()); List menuIds = new ArrayList<>(); + //然后把刚刚的treeNode的nodeId放到menuIds数组里 menuIds.add(treeNode.getNodeId()); for (TreeNode node : treeNode.getAllChildren()) { + //把所有的treeNode的nodeId放到menuIds数组里 menuIds.add(node.getNodeId()); } + //把它放到MenuIdList里 page.setMenuIdList(menuIds); } + //数出SAR_FILE_SPLIT_ITEMS这个表里MENU_ID不为空或id不为空的记录一共有几条（基本上就是数出这个表一共有几条数据） int count = dao.queryByCount(page); + //把page里的值当做条件一顿左联查询了SAR_FILE_SPLIT_ITEMS这个表 List rows = dao.queryByPage(page); + //如果查询出来的结果不为空 if (rows != null && !rows.isEmpty()) { + //遍历rows for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { //查询svpps String svppsShow = sysInfoEOService.getSvppsNamesByIds(sarFileSplitItemsEO.getSvpps()); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index da1eb9a9..117b6e2c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -29,4 +29,50 @@ and a.stand_id = #{standId} + + + + + From baa674136b7eea0767f7042af40604373ea93b9e Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 25 Aug 2021 15:16:14 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E6=94=B9~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/common/TableToExcel.java | 75 ++++++++++++------- 1 file changed, 50 insertions(+), 25 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java index ad240f40..2229e53e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java @@ -30,43 +30,68 @@ public class TableToExcel { Set keys=columnMap.keySet(); //第一行（标题行）合并并设置标题 - - - //创建表头行 - Row headRow=sheet.createRow(0); + //创建表头行(合并单元格) + Row headRow = sheet.createRow(0); + Row neckRow = sheet.createRow(1); + sheet.addMergedRegion(new CellRangeAddress(0,1,0,0)); + sheet.addMergedRegion(new CellRangeAddress(0,1,1,1)); + sheet.addMergedRegion(new CellRangeAddress(0,0,2,4)); + sheet.addMergedRegion(new CellRangeAddress(0,1,5,5)); + sheet.addMergedRegion(new CellRangeAddress(0,1,6,6)); + sheet.addMergedRegion(new CellRangeAddress(0,1,7,7)); //生成表头行 int j=0; + for(String key:keys) { Cell hCell=headRow.createCell(j++); - hCell.setCellValue(columnMap.get(key)); + if (j<3) + hCell.setCellValue(columnMap.get(key)); } - //从第二行开始填充数据 - int c=1; + Cell hCellh = headRow.createCell(2); + hCellh.setCellValue("修改意见内容"); + Cell hCell = headRow.createCell(5); + hCell.setCellValue("提出部门"); + Cell hCell1 = headRow.createCell(6); + hCell1.setCellValue("提出人"); + Cell hCell2 = headRow.createCell(7); + hCell2.setCellValue("处理意见"); + Cell nCell = neckRow.createCell(2); + nCell.setCellValue("修改前"); + Cell nCell1 = neckRow.createCell(3); + nCell1.setCellValue("修改后"); + Cell nCell2 = neckRow.createCell(4); + nCell2.setCellValue("修改理由"); + + + //从第三行开始填充数据 + int c=2; for(int k=i*sheetRow;k Date: Thu, 26 Aug 2021 13:54:24 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=80=92=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/FeignClient/workFlowFeignClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index ccd200f7..9774715e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -13,8 +13,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -@FeignClient(value = "bat-wkflow") -//@FeignClient(value = "shan6") +//@FeignClient(value = "bat-wkflow") +@FeignClient(value = "shan6") public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET) From 59f77d802ca03334b8e65b3bce65d649d3eb423c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 26 Aug 2021 13:55:21 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java index c5064cbb..43d3696d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java @@ -50,7 +50,8 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl page = new Page<>(p,size); IPage userIPage = sarPublicIdeaDao.selectPage(page, list); System.out.println("总条数"+userIPage.getTotal()); From 653fd06d5067faf0a12d262513a93257a91f3d25 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 26 Aug 2021 13:56:12 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/FeignClient/workFlowFeignClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 9774715e..ccd200f7 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -13,8 +13,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -//@FeignClient(value = "bat-wkflow") -@FeignClient(value = "shan6") +@FeignClient(value = "bat-wkflow") +//@FeignClient(value = "shan6") public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET) From 9b9ebabe6bf0f335be34bf6154efefa8faae56da Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 26 Aug 2021 14:25:12 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java index 43d3696d..ccf77fd3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java @@ -51,7 +51,7 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl page = new Page<>(p,size); IPage userIPage = sarPublicIdeaDao.selectPage(page, list); System.out.println("总条数"+userIPage.getTotal()); From 349fa7e499178763375a72ddad29f4d52d89d81c Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 26 Aug 2021 20:44:51 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?= =?UTF-8?q?=E7=9A=84=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E4=B8=8E=E7=BC=96?= =?UTF-8?q?=E8=BE=91~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandItems/entity/SarStandItems.java | 3 ++ .../SarFileSplitItemsEOController.java | 4 +- .../dao/SarFileSplitItemsEODao.java | 5 ++ .../entity/SarFileSplitItemsEO.java | 10 ++++ .../entity/SarFileSplitItemsEOPage.java | 9 ++++ .../standardSplit/entity/SarStandItemsEO.java | 9 ++++ .../service/SarFileSplitItemsEOService.java | 2 +- .../impl/SarFileSplitInfoEOServiceImpl.java | 5 +- .../impl/SarFileSplitItemsEOServiceImpl.java | 18 +++++-- .../SarFileSplitItemsEOMapper.xml | 53 +++++++++++++++++-- 10 files changed, 106 insertions(+), 12 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java index d9d268cb..06cd41a3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java @@ -193,5 +193,8 @@ public class SarStandItems extends BaseEntity { @TableField("read_content") private String readContent; + @ApiModelProperty(value = "编辑关联标识") + @TableField("edit_flag") + private String editFlag; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java index fc593344..98287330 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java @@ -133,9 +133,9 @@ public class SarFileSplitItemsEOController extends BaseController 0) { return Result.success("0","删除成功",null); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java index 71442b26..722ae9d0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java @@ -4,6 +4,7 @@ import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.standardSplit.dto.FileSplitItemsExportDto; import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEOPage; +import com.adc.da.slrs.standardSplit.entity.SarStandItemsEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -32,6 +33,8 @@ public interface SarFileSplitItemsEODao extends BaseMapper int deleteByItemsIdList(@Param("idList") List idList); + int deleteByItemsIdList1(@Param("idList") List idList); + List queryItemsByMenuId(@Param("menuId") String menuId); List queryByItemsIds(@Param("idList") List idList); @@ -52,6 +55,8 @@ public interface SarFileSplitItemsEODao extends BaseMapper int updateByPrimaryKeySelective(SarFileSplitItemsEO page); + int updateByPrimaryKeySelective1(SarFileSplitItemsEO page); + int deleteByPrimaryKey(String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java index ebcad944..99ef3e91 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java @@ -64,6 +64,8 @@ public class SarFileSplitItemsEO extends BaseEntity { private String responsibleUnit;//责任部门 private String responsibleUnitShow; + + private String editFlag; /** * java字段名转换为原始数据库列名。如果不存在则返回null
*

字段列表：

@@ -520,4 +522,12 @@ public class SarFileSplitItemsEO extends BaseEntity { public void setResponsibleUnitShow(String responsibleUnitShow) { this.responsibleUnitShow = responsibleUnitShow; } + + public String getEditFlag() { + return editFlag; + } + + public void setEditFlag(String editFlag) { + this.editFlag = editFlag; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEOPage.java index b6d6d46c..d7a9e58c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEOPage.java @@ -61,10 +61,19 @@ public class SarFileSplitItemsEOPage extends BasePage { private String sMenuId; private List idList; private List menuIdList; + private String edirFlag; private int tableIndex = 1; private int imgIndex = 1; + public String getEdirFlag() { + return edirFlag; + } + + public void setEdirFlag(String edirFlag) { + this.edirFlag = edirFlag; + } + public String getId() { return this.id; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsEO.java index 5d924914..2c481568 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsEO.java @@ -58,6 +58,7 @@ public class SarStandItemsEO extends BaseEntity { private SarCompStatusInfoEO pgForm; private String menuId; + private String editFlag; /** * java字段名转换为原始数据库列名。如果不存在则返回null
*

字段列表：

@@ -483,4 +484,12 @@ public class SarStandItemsEO extends BaseEntity { public void setMenuId(String menuId) { this.menuId = menuId; } + + public String getEditFlag() { + return editFlag; + } + + public void setEditFlag(String editFlag) { + this.editFlag = editFlag; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java index bad1b3d0..be30efc7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java @@ -28,7 +28,7 @@ public interface SarFileSplitItemsEOService { int deleteByPrimaryKey(String id); - int batchDeleteItems(String ids); + int batchDeleteItems(String ids,String editFlag); boolean judgeContaintChilds(String ids); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index fa1d0986..c274f36c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -345,7 +345,9 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService .setStandId(sarFileSplitInfoEO.getStandId()) .setItemsNum(item.getItemsNum()) .setItemsName(item.getItemsName()) - .setTermsConditions(item.getItermsConditions()); + .setTermsConditions(item.getItermsConditions()) + .setEditFlag(item.getEditFlag()); + standList.add(standItems1); }); sarFileSplitItemsEODao.insertStandSplitForeach(standList); @@ -370,6 +372,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId()); sarFileSplitItemsEO.setModifyTime(new Date()); sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId()); + sarFileSplitItemsEO.setEditFlag(UUIDUtils.randomUUID(32)); return sarFileSplitItemsEO; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java index 8080938d..5ec05134 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -150,6 +150,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic String itemConditions = ""; String userId = UserUtils.getUserId(); int resultCount = 0; + int resultCount1 = 0; //修改特殊参数要求信息 updateParamsContent(sarFileSplitItemsEO); //修改条款要求内容 @@ -213,13 +214,18 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic } sarFileSplitItemsEO.setItermsConditions(itemConditions); resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); + resultCount1 = dao.updateByPrimaryKeySelective1(sarFileSplitItemsEO); } else { sarFileSplitItemsEO.setItermsConditions(""); resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); + resultCount1 = dao.updateByPrimaryKeySelective1(sarFileSplitItemsEO); // 删除val表全部信息 sarFileSplitItemsValEODao.deleteByitemId(sarFileSplitItemsEO.getId()); } - return resultCount; + Map resultCountMap = new HashMap(); + resultCountMap.put("拆分",resultCount); + resultCountMap.put("标准分解单",resultCount1); + return resultCountMap.size(); } /** @@ -253,9 +259,11 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic } @Override - public int batchDeleteItems(String ids) { + public int batchDeleteItems(String ids,String editFlag) { String[] itemIds = ids.split(","); + String[] itemIds1 = editFlag.split(","); List idList = Arrays.asList(itemIds); + List idList1 = Arrays.asList(itemIds1); // 查到对应menu List getMenuList = dao.queryByItemsIds(idList); List getAllItemList = new ArrayList<>(); @@ -293,6 +301,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic //删除file表数据 // sarFileSplitItemsFileEODao.deleteByItemIds(allItemIdList); result = dao.deleteByItemsIdList(allItemIdList); + dao.deleteByItemsIdList1(idList1); }else if(!idList.isEmpty()){//菜单被删掉了，数据当时被保留下来的 allItemIdList.clear(); allItemIdList.addAll(idList); @@ -303,9 +312,12 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic //删除特殊参数要求params表数据 sarFileSplitItemsParamsEODao.deleteByItemIds(allItemIdList); result = dao.deleteByItemsIdList(allItemIdList); + dao.deleteByItemsIdList1(idList1); } } - return result; + Map resultMap = new HashMap(); + resultMap.put("拆分单删除",result); + return resultMap.size(); } @Override diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml index b44506a8..2d13da5e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml @@ -71,6 +71,17 @@ dutyEngineerShow,tsFo.NAME as foShow + + SAR_FILE_SPLIT_ITEMS.id, SAR_FILE_SPLIT_ITEMS.info_id, SAR_FILE_SPLIT_ITEMS.items_num, items_name, iterms_conditions, + newcar_put_time, product_put_time, menu_id, svpps, apply_arctic, reference_stand, special_request, relevance_file, + SAR_FILE_SPLIT_ITEMS.remarks, SAR_FILE_SPLIT_ITEMS.valid_flag, SAR_FILE_SPLIT_ITEMS.creation_user, + SAR_FILE_SPLIT_ITEMS.creation_time, SAR_FILE_SPLIT_ITEMS.modify_time, SAR_FILE_SPLIT_ITEMS.modify_user, + SAR_FILE_SPLIT_ITEMS.fo,SAR_FILE_SPLIT_ITEMS.duty_engineer, SAR_FILE_SPLIT_ITEMS.claim_type, + SAR_FILE_SPLIT_ITEMS.bus_stand_cover,SAR_FILE_SPLIT_ITEMS.file_type,SAR_FILE_SPLIT_ITEMS.responsible_unit, + TS_ORG.org_name as responsibleUnitShow, dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.NAME as + dutyEngineerShow,tsFo.NAME as foShow, SAR_FILE_SPLIT_ITEMS.edit_flag + + where 1=1 @@ -343,6 +354,28 @@ where id = #{id} + + update SAR_STAND_ITEMS + + + items_num = #{itemsNum}, + + + + items_name = #{itemsName}, + + + + TERMS_CONDITIONS = #{itermsConditions}, + + + + valid_flag = #{validFlag}, + + + where edit_flag = #{editFlag} + + select * from (select tmp_tb.* from - (select from SAR_FILE_SPLIT_ITEMS left join SAR_FILE_SPLIT_MENU on SAR_FILE_SPLIT_ITEMS.MENU_ID = SAR_FILE_SPLIT_MENU.id + (select from SAR_FILE_SPLIT_ITEMS left join SAR_FILE_SPLIT_MENU on SAR_FILE_SPLIT_ITEMS.MENU_ID = SAR_FILE_SPLIT_MENU.id left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_FILE_SPLIT_ITEMS.claim_type and dicClaimType.dic_id is not null and dicClaimType.valid_flag = 0) left join TS_ORG on (SAR_FILE_SPLIT_ITEMS.responsible_unit =TS_ORG.id) @@ -454,7 +487,7 @@ insert into SAR_FILE_SPLIT_ITEMS (id, info_id, items_num, items_name, newcar_put_time, product_put_time, menu_id, svpps, apply_arctic, reference_stand, special_request, relevance_file, remarks, valid_flag, creation_user, creation_time, modify_time, - modify_user, iterms_conditions) + modify_user, iterms_conditions, edit_flag) values ( @@ -466,7 +499,8 @@ #{item.relevanceFile, jdbcType=VARCHAR}, #{item.remarks, jdbcType=VARCHAR}, #{item.validFlag, jdbcType=INTEGER}, #{item.creationUser, jdbcType=VARCHAR}, #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, - #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB} + #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB}, + #{item.editFlag, jdbcType=VARCHAR} ) @@ -474,13 +508,14 @@ insert into SAR_STAND_ITEMS - (id, STAND_ID, items_num, items_name, TERMS_CONDITIONS,FILE_TYPE) + (id, STAND_ID, items_num, items_name,TERMS_CONDITIONS,FILE_TYPE,edit_flag) values ( #{item.id, jdbcType=VARCHAR}, #{item.standId, jdbcType=VARCHAR}, #{item.itemsNum, jdbcType=VARCHAR}, #{item.itemsName, jdbcType=VARCHAR}, #{item.termsConditions, jdbcType=CLOB}, - #{item.fileType, jdbcType=VARCHAR} + #{item.fileType, jdbcType=VARCHAR}, + #{item.editFlag, jdbcType=VARCHAR} ) @@ -550,6 +585,14 @@ + + delete from SAR_STAND_ITEMS + where edit_flag in + + #{item} + + + + + update sar_standards_info + set TEXT_STATUS=#{textStatus} + where ID=#{id} + From f53cdd885b441f77a09776ce78adf3a3b2b4a7dc Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 30 Aug 2021 10:03:03 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/ScheduledJob.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 da05c85f..8f4cb872 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 @@ -54,8 +54,8 @@ public class ScheduledJob { -// @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 - @Scheduled(cron="*/5 * * * * ?") + @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 +// @Scheduled(cron="*/5 * * * * ?") @Async public void WarningSchedulingTasks() { @@ -143,8 +143,8 @@ public class ScheduledJob { - @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 -// @Scheduled(cron="*/5 * * * * ?") +// @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 + @Scheduled(cron="*/5 * * * * ?") @Async public void TextStatusSchedulingTasks() { QueryWrapper wrapper = new QueryWrapper<>();