From ad2b29f072c630f1c20b10a2f3c99d2a420855f5 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Mon, 26 Jul 2021 17:57:44 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E6=B8=85=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListController.java | 5 +- .../entity/LawsDto.java | 2 + .../ISarLawsAttrDetailedListService.java | 2 +- .../SarLawsAttrDetailedListServiceImpl.java | 65 ++++++++++++++----- .../SarLawsDetailedListController.java | 1 - .../impl/SarLawsDetailedListServiceImpl.java | 19 ++++-- .../SarLawsAttrDetailedListMapper.xml | 11 +++- 7 files changed, 73 insertions(+), 32 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java index 75296465..c14be448 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java @@ -52,9 +52,6 @@ public class SarLawsAttrDetailedListController extends BaseController> map = iSarLawsAttrDetailedList.selectTimes(id); + Map> map = iSarLawsAttrDetailedList.selectTimes(id); return Result.success("200",map); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 381b50cb..391554f7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -45,6 +45,8 @@ public class LawsDto { private String standYear; @ExcelProperty(value = "标准类别", index = 6) private String standSortShow; + @ExcelProperty(value = "标准类别", index = 6) + private String issueTime; @ColumnWidth(16) @ExcelProperty(value = "标准实施日期", index = 7) @ApiModelProperty(value = "标准实施日期") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java index fa891d9a..0474c233 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java @@ -23,5 +23,5 @@ public interface ISarLawsAttrDetailedListService extends IService timeDtos); void exportExcel(HttpServletResponse response, StandExcelVo standExcelVo); int setTimes(SarLawsAttrDetailedList sarLawsAttrDetailedList); - Map> selectTimes(String id); + Map> selectTimes(String id); } 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 f6589b4e..0a8ac441 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 @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.service.impl; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; +import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; @@ -15,10 +16,7 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -225,25 +223,58 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> selectTimes(String id) { + public Map> selectTimes(String id) { List standRegionalTimeDto= sarLawsAttrDetailedListDao.selectTimes(id); - Map> mapList = new HashMap>(); - for (StandRegionalTimeDto s:standRegionalTimeDto){ - List list; - if (mapList.containsKey(s.getCountry())){ - list = mapList.get(s.getCountry()); + Map map = iDicTypeEOService.getDicTypeListCode(); + List> arr = (List>) map.get("COUNTRY"); + for (StandRegionalTimeDto list1 : standRegionalTimeDto) { + if (StringUtils.isNotBlank(list1.getCountry()) && list1.getCountry().contains(",")) { + String[] split = list1.getCountry().split(","); + StringBuilder builder = new StringBuilder(); + for (String s : split) { + for (Map map1 : arr) { + if (map1.get("value").equals(s)) { + s = map1.get("label"); + builder.append(s + ","); + break; + } + } + } + String completedString = builder.delete(builder.length() - 1, builder.length()).toString(); + list1.setCountry(completedString); }else { - list = new ArrayList<>(); + for (Map map1:arr) { + if (map1.get("value").equals(list1.getCountry())){ + list1.setCountry(map1.get("label")); + break; + } + } } - StandTimeDto standTimeDto = new StandTimeDto(); - standTimeDto.setPutTime(s.getPutTime()); - standTimeDto.setXcxssrq(s.getXcxssrq()); - standTimeDto.setZccssrq(s.getZccssrq()); - list.add(standTimeDto); - mapList.put(s.getCountry(),list); + } + LinkedHashMap> mapList = new LinkedHashMap>(); + List putTime = new ArrayList<>(); + List xcx = new ArrayList<>(); + List zcc= new ArrayList<>(); + for (StandRegionalTimeDto s:standRegionalTimeDto){ + if (mapList.containsKey("实施日期("+s.getCountry()+")")||mapList.containsKey("新车型实施日期("+s.getCountry()+")")||mapList.containsKey("在产车实施日期("+s.getCountry()+")")){ + putTime = mapList.get("实施日期("+s.getCountry()+")"); + xcx = mapList.get("新车型实施日期("+s.getCountry()+")"); + zcc = mapList.get("在产车实施日期("+s.getCountry()+")"); + + } + dateTime(mapList, putTime, xcx, zcc, s); } return mapList; } + private void dateTime(LinkedHashMap> mapList, List putTime, List xcx, List zcc, StandRegionalTimeDto s) { + putTime.add(s.getPutTime()) ; + xcx.add(s.getXcxssrq()); + zcc.add(s.getZccssrq()); + mapList.put("实施日期("+s.getCountry()+")",putTime); + mapList.put("新车型实施日期("+s.getCountry()+")",xcx); + mapList.put("在产车实施日期("+s.getCountry()+")",zcc); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index 0cc027c2..ce42e9cb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -149,7 +149,6 @@ public class SarLawsDetailedListController extends BaseController timeDto = new ArrayList<>(); - if (detailedUpDto.getInforlist().indexOf(",") >= 0) { + if ("1".equals(detailedUpDto.getSortKey()) && detailedUpDto.getInforlist().contains(",")) { String[] id = detailedUpDto.getInforlist().split(","); String[] putTime = detailedUpDto.getInforlist1().split(","); String[] zcc = detailedUpDto.getInforlist2().split(","); @@ -302,13 +305,17 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl SELECT a.ID,a.STAND_NUMBER,a.STAND_NAME,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQGJ,b.ZCCSSRQGJ,b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN, - b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow ,a.STAND_YEAR as standYear + b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow ,a.STAND_YEAR as standYear,ISSUE_TIME as issueTime FROM sar_standards_info a LEFT JOIN sar_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.STAND_NUMBER LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%') - or a.STAND_NAME LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%')) + or a.STAND_NAME LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%') + or a.STAND_YEAR LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%') + or dicstandSort.DIC_TYPE_NAME LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%') + ) and @@ -94,9 +97,11 @@ WHERE b.sort_key = 1 AND a.stand_id = #{standId} + AND (a.putTime is not NULL + AND a.xcxssrq is not NULL + AND a.zccssrq is not NULL) - INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ,putTime,xcxssrq,zccssrq) VALUES