Merge branch 'develop_master' into 'FOTON'

Develop master

See merge request LiuChao/foton-slrs-system-rest!259

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<List<Map<String,String>>> isPresent(String ids){
+        List<Map<String, String>> maps = issueTrackService.idIsPresentIssueTrack(Arrays.asList(ids.split(",")));
+        return Result.success(maps);
+    }
 }

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<IssueTrack> getIssueTrack(IssueTrackVo objVo);
 
     public boolean updateIssueTrack(IssueTrack obj);
+
+
+    public List<Map<String,String>> idIsPresentIssueTrack(List<String> idList);
 }

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.*;
-import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Service
 public class IssueTrackServiceImpl extends ServiceImpl<IssueTrackDao, IssueTrack> implements IIssueTrackService {
@@ -71,4 +72,28 @@ public class IssueTrackServiceImpl extends ServiceImpl<IssueTrackDao, IssueTrack
         }
     }
 
+    @Override
+    public List<Map<String,String>> idIsPresentIssueTrack(List<String> idList){
+
+        QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
+
+        wrapper.select("law_id")
+                .in("law_id",idList);
+        List<IssueTrack> issueTracks = issueTrackDao.selectList(wrapper);
+        Set<String> lawIdSet = issueTracks.stream()
+                .map(item -> item.getLawId()).collect(Collectors.toSet());
+
+       return idList.stream()
+                .map(item -> {
+                    HashMap<String, String> resultMap = new HashMap<>();
+                    if (lawIdSet.contains(item)) {
+                        resultMap.put(item, "1");
+                    } else {
+                        resultMap.put(item, "0");
+                    }
+                    return resultMap;
+                }).collect(Collectors.toList());
+
+    }
+
 }

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<WarningDate> {
+}

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;
+}

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<SarStandardsInfoDao
         return Pattern.matches(verifyType,str);
     }
 
+    @Autowired
+    WarningDateDao  warningDateDao;
+
+
     public void createStandPutTime(String standId, Map<String, String> multiTimeMap) throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         if (multiTimeMap != null && multiTimeMap.size() > 0) {
             List<SarStandPutTime> standTimeList = new ArrayList<>();
+            List<WarningDate> warningDateList = new ArrayList<>();
+
             for (Map.Entry<String, String> entry : multiTimeMap.entrySet()) {
                 String value = entry.getValue();
                 String field = entry.getKey();
@@ -1025,6 +1033,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                             sarStandPutTimeEO.setPutTime(date);
                             standTimeList.add(sarStandPutTimeEO);
                         }
+
+
+                        if ("SSRQ".equals(field) || "XCXSSRQ".equals(field) || "ZCCSSRQ".equals(field)){
+                            WarningDate warningDate = new WarningDate();
+                            warningDate.setId(UUIDUtils.randomUUID20());
+                            warningDate.setLawId(standId);
+                            warningDate.setSSRQ(val);
+                            warningDate.setTimeName(field);
+                            warningDateList.add(warningDate);
+                        }
                     }
                 }
             }
@@ -1032,6 +1050,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             if (standTimeList != null && !standTimeList.isEmpty()) {
                 sarStandPutTimeEODao.insertForeach(standTimeList);
             }
+
+            if (warningDateList != null && warningDateList.size()>0){
+                warningDateDao.deleteById(standId);
+                //TODO 实施日期存表
+            }
         }
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java

@@ -52,8 +52,12 @@ public class SarVppsTreeServiceImpl extends ServiceImpl<SarVppsTreeDao, SarVppsT
         sarMenuQueryWrapper.orderByAsc("SORT");
 
         sarMenuQueryWrapper.eq("LEVEL", parent.getLevel()+1)
-                .eq("TYPE",parent.getType())
+                .eq("TYPE",parent.getType());
-                .like("VPPS_CODE",parent.getId());
+
+
+        if(parent.getLevel()!=0){
+            sarMenuQueryWrapper.like("VPPS_CODE",parent.getId());
+        }
         List<SarVppsTree> children=this.baseMapper.selectList(sarMenuQueryWrapper);
 
         children.forEach(item->{