From 3689771c29cb607b0c7b7825035f223ceb69ff04 Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Tue, 23 Nov 2021 09:11:03 +0800 Subject: [PATCH 1/6] ~ --- .../controller/WgdZcbController.java | 23 +++++----- .../da/slrs/wgdCensusLeo/entity/WgdZcb.java | 5 +-- .../mapper/wgdCensusLeo/WgdZcbMapper.xml | 43 +++++++++---------- 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java index 49cbfd3d..f3f714ce 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java @@ -15,13 +15,13 @@ import com.adc.da.base.web.BaseController; import java.util.List; /** -*

- * 标准制修订补助资金收支统计支出表 前端控制器 - *

-* -* @author super_liu -* @since 2021-11-12 -*/ + *

+ * 标准制修订补助资金收支统计支出表 前端控制器 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ @RestController @Api(description = "|WgdZcb|") @RequestMapping("api/wgdCensusLeo/wgd-zcb") @@ -30,13 +30,14 @@ public class WgdZcbController extends BaseController { IWgdZcbService iWgdZcbService; @GetMapping("/getAllZcbs") - public ResponseMessage getAllWgdZcbs(){//查询所有 + public ResponseMessage getAllWgdZcbs() {//查询所有 return Result.success(iWgdZcbService.getAllWgdZcbs()); } + @ApiOperation("查询") @GetMapping("/queryAllZcbs") - public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询 + public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb) {//多条件查询 List wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb); PageInfo pageInfo = getPageInfo(wgdZcb.getPager(),wgdZcbs); return Result.success(pageInfo); @@ -60,13 +61,13 @@ public class WgdZcbController extends BaseController { } @PostMapping("/delZcb") - ResponseMessage deleteWgdZcb(String id){//删除 + ResponseMessage deleteWgdZcb(String id) {//删除 return Result.success(iWgdZcbService.deleteWgdZcb(id)); } @ApiOperation("删除") @PostMapping("/delZcbs") - ResponseMessage deleteWgdZcbs(String ids){//批量删除 + ResponseMessage deleteWgdZcbs(String ids) {//批量删除 return Result.success(iWgdZcbService.deleteWgdZcbs(ids)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java index a47c4c65..0ee8a508 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java @@ -35,10 +35,9 @@ public class WgdZcb extends BasePage { private String cost; @ApiModelProperty(value = "用途") - private String use; + private String purposes; @ApiModelProperty(value = "详细附件") - private String annex; - + private String annexs; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml index 51767b4d..d834b30d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml @@ -3,7 +3,7 @@ - id,name,cost,use,annex + id,name,cost,purposes,annexs @@ -12,18 +12,17 @@ and id = #{id} - and name like concat('%',#{name},'%') + and name = #{name} - and cost like concat('%',#{cost},'%') + and cost = #{cost} - - and use like concat('%',#{use},'%') + + and purposes = #{purposes} - - and annex = #{annex} + + and annexs = #{annexs} - - select count(sar_stand_unqualified.product_id) from sar_stand_unqualified - left join sar_stand_project_library on sar_stand_unqualified.product_id = sar_stand_project_library.project_number - LEFT JOIN ts_user on ts_user.USID = sar_stand_project_library.project_manager - where STAND_ID = #{product.standId} and CLOSE_STATE = '1' + select count(sar_stand_unqualified.product_id) + FROM + sar_stand_project_library + LEFT JOIN sar_stand_unqualified ON sar_stand_unqualified.product_id = sar_stand_project_library.project_number + LEFT JOIN ts_user ON ts_user.USID = sar_stand_project_library.project_manager + WHERE + sar_stand_project_library.project_number in (SELECT product_id FROM sar_standard_compliance_product_assess WHERE STAND_ID=#{product.standId}) + AND CLOSE_STATE = '1' group by PRODUCT_NAME, sar_stand_project_library.project_group, From a7206afc5d3e615caa8ef14dedf1d5a716c7bf64 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 2 Dec 2021 16:24:40 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=A2=84=E8=AD=A6=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=AD=90=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/scheduled/ScheduledJob.java | 15 +++++++-- .../scheduled/dao/SarStandardWarningDao.java | 4 +++ .../sarStandWarning/SarStandardWarningDao.xml | 31 +++++++++++++++++++ 3 files changed, 48 insertions(+), 2 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 7a01e536..256281d8 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 @@ -9,6 +9,8 @@ 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.sarStandWarning.entity.WarningDate; +import com.adc.da.slrs.sarStandWarning.service.IWarningDateService; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.util.UUIDUtils; @@ -25,6 +27,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.PostConstruct; import java.time.LocalDate; import java.util.*; import java.util.regex.Pattern; @@ -59,8 +62,10 @@ public class ScheduledJob { @Autowired private SarStandAttrInfoDao sarStandAttrInfoDao; //属性字段表 + @Autowired + private IWarningDateService iWarningDateService;// 预警日期 - +// @PostConstruct //程序启动时执行一次 @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 // @Scheduled(cron="*/5 * * * * ?") @Async @@ -98,8 +103,14 @@ public class ScheduledJob { TermDTO term = new TermDTO(); //预警期限(当前日期至3个月后) + List warningDateList = sarStandardWarningDao.getWarningDate(term); //查询符合预警期限的标准 多个 - List warningList = sarStandardWarningDao.getWarningId(term); + warningDateList.forEach(item->{ + item.setId(UUIDUtils.randomUUID20()); + }); + iWarningDateService.remove(null); //清空标准的日期子表 + iWarningDateService.saveBatch(warningDateList); // 保存进入标准的日期子表 保存标准的实施日期 新车型实施日期 在产车实施日期 多个 + List warningList = sarStandardWarningDao.getWarningId(term); //联接标准的日期子表 和分解单表 查询符合预警期限的标准和分解项 warningList.forEach(item->{ item.setId(UUIDUtils.randomUUID20()); 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 701d18d6..196b8046 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 @@ -2,6 +2,7 @@ package com.adc.da.scheduled.dao; import com.adc.da.scheduled.entity.TermDTO; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.WarningDate; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -19,4 +20,7 @@ public interface SarStandardWarningDao extends BaseMapper { public int autoCancelWarning(); public List getWarningId(TermDTO term); + + public List getWarningDate(TermDTO term); + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml index 9938db58..ded69c87 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml @@ -74,4 +74,35 @@ + + + From 235f81b35c7b686ff3efd411b42d79320ce49c60 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 2 Dec 2021 17:24:37 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A1=86=E5=8F=AF=E4=BB=A5=E6=90=9C=E7=B4=A2=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=90=8D=E7=A7=B0=20=E6=A0=87=E5=87=86=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=90=9C=E7=B4=A2=E6=A1=86=E5=8F=AF=E4=BB=A5=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A0=87=E5=87=86=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 d8c46134..a5215c4e 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 @@ -758,15 +758,15 @@ SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '') or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR = '') - or (stand_name like concat(concat('%',#{page.standNumber}),'%')) + ) and stand_name like concat(concat('%',#{page.standName}),'%') - or STAND_NUMBER like concat(concat('%',#{page.standName}),'%') - or STAND_YEAR like concat(concat('%',#{page.standName}),'%') - or STAND_SORT like concat(concat('%',#{page.standName}),'%') + + + and stand_en_name like concat(concat('%',#{page.standEnName}),'%')