From 25d8f1bdf7e126d913873eba7c43fa8084ceeaa8 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 30 Nov 2021 20:26:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E6=96=B0=E5=A2=9E=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IssueTrackController.java | 10 +++++++ .../service/IIssueTrackService.java | 4 +++ .../service/impl/IssueTrackServiceImpl.java | 29 +++++++++++++++++-- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java index 6d748a48..51d19690 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; +import java.util.Map; @Controller @RestController @@ -65,4 +66,13 @@ public class IssueTrackController { return Result.error("100","数据不能相同", false); } } + + + + @GetMapping("/isPresent") + @ApiOperation("查询国内外标准和政策是否存在重点跟踪清单中") + public ResponseMessage>> isPresent(String ids){ + List> maps = issueTrackService.idIsPresentIssueTrack(Arrays.asList(ids.split(","))); + return Result.success(maps); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java index 54ad466c..9324cbee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarIssueTrack.entity.IssueTrackVo; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; +import java.util.Map; public interface IIssueTrackService { @@ -15,4 +16,7 @@ public interface IIssueTrackService { public IPage getIssueTrack(IssueTrackVo objVo); public boolean updateIssueTrack(IssueTrack obj); + + + public List> idIsPresentIssueTrack(List idList); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java index ab7ddd23..bca0fb71 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java @@ -12,8 +12,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; @Service public class IssueTrackServiceImpl extends ServiceImpl implements IIssueTrackService { @@ -71,4 +72,28 @@ public class IssueTrackServiceImpl extends ServiceImpl> idIsPresentIssueTrack(List idList){ + + QueryWrapper wrapper = new QueryWrapper<>(); + + wrapper.select("law_id") + .in("law_id",idList); + List issueTracks = issueTrackDao.selectList(wrapper); + Set lawIdSet = issueTracks.stream() + .map(item -> item.getLawId()).collect(Collectors.toSet()); + + return idList.stream() + .map(item -> { + HashMap resultMap = new HashMap<>(); + if (lawIdSet.contains(item)) { + resultMap.put(item, "1"); + } else { + resultMap.put(item, "0"); + } + return resultMap; + }).collect(Collectors.toList()); + + } + } From b43cc664e2a430123ba94f12c860e504bfc0883b Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 30 Nov 2021 20:27:54 +0800 Subject: [PATCH 2/3] //todo --- .../sarStandWarning/dao/WarningDateDao.java | 7 ++++++ .../sarStandWarning/entity/WarningDate.java | 22 ++++++++++++++++++ .../impl/SarStandardsInfoServiceImpl.java | 23 +++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/WarningDateDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/WarningDateDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/WarningDateDao.java new file mode 100644 index 00000000..88b46af8 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/WarningDateDao.java @@ -0,0 +1,7 @@ +package com.adc.da.slrs.sarStandWarning.dao; + +import com.adc.da.slrs.sarStandWarning.entity.WarningDate; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +public interface WarningDateDao extends BaseMapper { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java new file mode 100644 index 00000000..13ea497b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java @@ -0,0 +1,22 @@ +package com.adc.da.slrs.sarStandWarning.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("warning_date") +public class WarningDate { + + @TableField("id") + private String id; + + @TableField("law_id") + private String lawId; + + @TableField("SSRQ") + private String SSRQ; + + @TableField("time_Name") + private String timeName; +} 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 608b3ed3..fd3084ff 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 @@ -3,6 +3,8 @@ package com.adc.da.slrs.sarStandardsInfo.service.impl; import com.adc.da.att.entity.AttFileEO; 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.sarUser.entity.TsUser; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.att.vo.AttFileVo; @@ -1001,10 +1003,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl multiTimeMap) throws Exception { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (multiTimeMap != null && multiTimeMap.size() > 0) { List standTimeList = new ArrayList<>(); + List warningDateList = new ArrayList<>(); + for (Map.Entry entry : multiTimeMap.entrySet()) { String value = entry.getValue(); String field = entry.getKey(); @@ -1025,6 +1033,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl0){ + warningDateDao.deleteById(standId); + //TODO 实施日期存表 + } } } From cd86b4a30c59d22dcc2977e34946782dcb7eced2 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 30 Nov 2021 21:08:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?vpps=E6=9F=A5=E8=AF=A2=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E5=B1=82=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarVppsTree/service/impl/SarVppsTreeServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java index f5986c6d..c43411d3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java @@ -52,8 +52,12 @@ public class SarVppsTreeServiceImpl extends ServiceImpl children=this.baseMapper.selectList(sarMenuQueryWrapper); children.forEach(item->{