From 35877cd9413f5b911a228b8510844a7d455e1083 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 17 Aug 2021 20:11:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=9B=BD=E5=AE=B6/=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=B8=AD=E7=9A=84=20=E6=AF=8F=E4=B8=AA?= =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E6=88=96=E8=80=85=E5=9C=B0=E5=8C=BA=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E5=BB=BA=E7=AB=8B=E4=B8=80=E6=AC=A1=E6=B8=85=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E5=81=9A=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsDetailedListServiceImpl.java | 484 ++++++++++++++---- 1 file changed, 377 insertions(+), 107 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 3d47af49..eb6eeb92 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -60,100 +60,370 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); - switch (addDetailedDto.getSortKey()) { - case "1": - sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea()); + //判断页面的国家地区是否和数据库里的字段长度相等 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("DISTINCT country_area"); + List sarLawsDetailedLists = sarLawsDetailedListDao.selectList(wrapper); + //多选是否可以添加的标识，true表示可以添加，false表示不许添加 + boolean multiAddFlag = true; + //单选是否可以添加的标识，true表示可以添加，false表示不许添加 + boolean singleAddFlag = true; +// System.out.println("数据库的值"+sarLawsDetailedLists); +// System.out.println("数据库里有多少条数据"+sarLawsDetailedLists.size()); +// System.out.println("数据库里第一条"+sarLawsDetailedLists.get(1)); + //如果页面字段国家为空，则为其他清单新增 + if (addDetailedDto.getCountryArea() == null) { + //下面放添加的具体方法 + try { + SarLawsDetailedList sarLawsDetailedList = SarLawsDetailedList.builder() + .id(UUIDUtils.randomUUID20()) + .sortKey(addDetailedDto.getSortKey()) + .detailedListName(addDetailedDto.getDetailedListName()) + .detailedListState("0") + .detailedListVision("v0") + .applicationScope(addDetailedDto.getApplicationScope()) + .updateTime(new Date()) + .updatePeople(addDetailedDto.getUpdatePeople()) + .remark(addDetailedDto.getRemark()) + .updatePeople(getUserName()) + .fileIds(addDetailedDto.getFileIds()) + .build(); + List timeDto = new ArrayList<>(); + switch (addDetailedDto.getSortKey()) { + case "1": + sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea()); - break; - case "2": - sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName()); + break; + case "2": + sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName()); - break; - case "3": - sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList()); + break; + case "3": + sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList()); - break; - default: - break; - } - if ("admin".equals(getUserName()))sarLawsDetailedList.setUpdatePeople("管理员"); - else {sarLawsDetailedList.setUpdatePeople(getUserName());} - sarLawsDetailedListDao.insert(sarLawsDetailedList); - if (addDetailedDto.getInforlist()!=null){ - if (addDetailedDto.getInforlist().contains(",")){ - String[] id = addDetailedDto.getInforlist().split(","); - String[] ssrq = addDetailedDto.getInforlist1().split(","); - String[] zcc = addDetailedDto.getInforlist2().split(","); - String[] xcx = addDetailedDto.getInforlist3().split(","); - for (int a =0;a< id.length;a++){ + break; + default: + break; + } + if ("admin".equals(getUserName())) sarLawsDetailedList.setUpdatePeople("管理员"); + else { + sarLawsDetailedList.setUpdatePeople(getUserName()); + } + sarLawsDetailedListDao.insert(sarLawsDetailedList); + if (addDetailedDto.getInforlist() != null) { + if (addDetailedDto.getInforlist().contains(",")) { + String[] id = addDetailedDto.getInforlist().split(","); + String[] putTime = addDetailedDto.getInforlist1().split(","); + String[] zcc = addDetailedDto.getInforlist2().split(","); + String[] xcx = addDetailedDto.getInforlist3().split(","); + for (int a = 0; a < id.length; a++) { + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if ("-".equals(putTime[a]) || null == putTime[a]) { + dto.setPutTime(null); + } else { + dto.setPutTime(putTime[a]); + } + if ("-".equals(putTime[a]) || null == xcx[a]) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if ("-".equals(putTime[a]) || null == zcc[a]) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } + } else { TimeDto dto = new TimeDto(); - dto.setStandId(id[a]); - if ("-".equals(ssrq[a]) || null==ssrq[a] ){ - dto.setSsrq(null); - }else { - dto.setSsrq(ssrq[a]); - } - if ("-".equals(ssrq[a]) || null == xcx[a]){ - dto.setXcxssrqgj(null); - }else { - dto.setXcxssrqgj(xcx[a]); - } - if ("-".equals(ssrq[a]) || null == zcc[a]){ - dto.setZccssrqgj(null); - }else { - dto.setZccssrqgj(zcc[a]); - } + dto.setStandId(addDetailedDto.getInforlist()); + dto.setPutTime(addDetailedDto.getInforlist1()); + dto.setXcxssrqgj(addDetailedDto.getInforlist2()); + dto.setZccssrqgj(addDetailedDto.getInforlist3()); timeDto.add(dto); } - }else { - TimeDto dto = new TimeDto(); - dto.setStandId(addDetailedDto.getInforlist()); - dto.setSsrq(addDetailedDto.getInforlist1()); - dto.setXcxssrqgj(addDetailedDto.getInforlist2()); - dto.setZccssrqgj(addDetailedDto.getInforlist3()); - timeDto.add(dto); + } else { + timeDto = null; } - }else { - timeDto=null; - } - service.insertDetailedList(sarLawsDetailedList.getId(),timeDto); + service.insertDetailedList(sarLawsDetailedList.getId(), timeDto); - } catch (Exception e) { - e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } + //0表示添加成功，1表示添加失败 + return "0"; + //添加方法结束 + } + + //如果页面字段国家不为空，则是国家地区清单新增 + if (addDetailedDto.getCountryArea() != null) { + //如果数据库里有数据，则判断，如果没有，则直接新增成功 + if (sarLawsDetailedLists.size() > 0) { + for (int i = 0; i < sarLawsDetailedLists.size(); i++) { +// System.out.println("数据库里的第"+(i+1)+"条数据为"+sarLawsDetailedLists.get(i).getCountryArea()); +// System.out.println("数据库里的第"+(i+1)+"条数据的长度为"+sarLawsDetailedLists.get(i).getCountryArea().length()); +// System.out.println("页面字段"+addDetailedDto.getCountryArea()); +// System.out.println("页面字段长度"+addDetailedDto.getCountryArea().length()); + System.out.println(sarLawsDetailedLists.get(i)); + if (null == sarLawsDetailedLists.get(i)) { + System.out.println("数据库里第" + (i + 1) + "条的国家地区字段长度为空，不重复，目前可以添加"); + } else if (addDetailedDto.getCountryArea().length() != sarLawsDetailedLists.get(i).getCountryArea().length()) { + System.out.println("数据库里第" + (i + 1) + "条的国家地区字段长度和页面的国家地区字段长度不一样，不重复，目前可以添加"); + } else { + System.out.println("数据库里第" + (i + 1) + "条的国家地区字段长度和页面的国家地区字段长度一样，可能重复"); + //判断页面的国家地区是单选还是多选（判断能不能拆） + if (addDetailedDto.getCountryArea().contains(",")) { + System.out.println("页面是多选"); + //如果数据库里的国家地区字段存在",",说明是多选，如果不存在说明是单选 + if (sarLawsDetailedLists.get(i).getCountryArea().contains(",")) { + System.out.println("数据库是多选，如果页面字段拆分之后都包含于数据库字段拆分之后，则说明重复，目前不许添加"); + System.out.println("页面字段为" + addDetailedDto.getCountryArea()); +// System.out.println("页面字段以“，”为分隔符拆分后为"+ Arrays.toString(addDetailedDto.getCountryArea().split(","))); + String[] frontCountryArea = addDetailedDto.getCountryArea().split(","); +// System.out.println("页面字段以“，”为分隔符拆分后为"+ frontCountryArea[0]+"然后"+frontCountryArea[1]+"然后"+frontCountryArea[2]); + String[] databaseCountryArea = sarLawsDetailedLists.get(i).getCountryArea().split(","); +// System.out.println("数据库字段以“，”为分隔符拆分后为"+ databaseCountryArea[0]+"然后"+databaseCountryArea[1]+"然后"+databaseCountryArea[2]); + + + //如果页面字段拆分之后都包含于数据库字段拆分之后，则说明重复，不许添加 + for (int j = 0; j < frontCountryArea.length; j++) { + //如果数据库包含了页面字段的所有值，说明这俩完全相同，重复，不许添加 + List databaseCountryAreaList = Arrays.asList(databaseCountryArea); + if (databaseCountryAreaList.contains(frontCountryArea[j])) { + System.out.println("数据库" + databaseCountryAreaList); + System.out.println("页面" + frontCountryArea[j]); + System.out.println("数据库里的字段包含页面里的字段，可能重复，目前不许添加"); + multiAddFlag = false; + } else { + System.out.println("数据库" + databaseCountryAreaList); + System.out.println("页面" + frontCountryArea[j]); + System.out.println("数据库里的字段和页面字段虽然长度相同，但是里面有不一样的元素，可以添加"); + multiAddFlag = true; + } +// System.out.println("页面字段以“，”为分隔符拆分后分别为"+ frontCountryArea[j]); +// System.out.println("数据库字段以“，”为分隔符拆分后分别为"+ databaseCountryArea[j]); + } + if (multiAddFlag == true) { + System.out.println("长度相同，只要有一个不重复，就可以添加"); + } else { + System.out.println("长度相同，整个循环下来都重复，说明两个字段重复，不许添加"); + break; + } + } + } else { + System.out.println("页面是单选"); + + //如果数据库里的国家地区字段存在",",说明是多选，如果不存在说明是单选 + if (sarLawsDetailedLists.get(i).getCountryArea().contains(",")) { + System.out.println("数据库是多选，肯定不重复，目前可以添加"); + } else { + System.out.println("数据库是单选，如果数据库里的字段和页面的字段相等，重复，不许添加"); + //如果数据库里的字段和页面的字段相等，重复，不许添加 + if (Objects.equals(sarLawsDetailedLists.get(i).getCountryArea(), addDetailedDto.getCountryArea())) { + System.out.println("数据库里的字段和页面的字段相等，重复，不许添加"); + singleAddFlag = false; + break; + } else { + System.out.println("数据库里的字段和页面的字段不相等，不重复，允许添加"); + } + } + } + } + } + } else { + //数据库为空，直接添加 + //下面放添加的具体方法 + try { + SarLawsDetailedList sarLawsDetailedList = SarLawsDetailedList.builder() + .id(UUIDUtils.randomUUID20()) + .sortKey(addDetailedDto.getSortKey()) + .detailedListName(addDetailedDto.getDetailedListName()) + .detailedListState("0") + .detailedListVision("v0") + .applicationScope(addDetailedDto.getApplicationScope()) + .updateTime(new Date()) + .updatePeople(addDetailedDto.getUpdatePeople()) + .remark(addDetailedDto.getRemark()) + .updatePeople(getUserName()) + .fileIds(addDetailedDto.getFileIds()) + .build(); + List timeDto = new ArrayList<>(); + switch (addDetailedDto.getSortKey()) { + case "1": + sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea()); + + break; + case "2": + sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName()); + + + break; + case "3": + sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList()); + + break; + default: + break; + } + if ("admin".equals(getUserName())) sarLawsDetailedList.setUpdatePeople("管理员"); + else { + sarLawsDetailedList.setUpdatePeople(getUserName()); + } + sarLawsDetailedListDao.insert(sarLawsDetailedList); + if (addDetailedDto.getInforlist() != null) { + if (addDetailedDto.getInforlist().contains(",")) { + String[] id = addDetailedDto.getInforlist().split(","); + String[] putTime = addDetailedDto.getInforlist1().split(","); + String[] zcc = addDetailedDto.getInforlist2().split(","); + String[] xcx = addDetailedDto.getInforlist3().split(","); + for (int a = 0; a < id.length; a++) { + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if ("-".equals(putTime[a]) || null == putTime[a]) { + dto.setPutTime(null); + } else { + dto.setPutTime(putTime[a]); + } + if ("-".equals(putTime[a]) || null == xcx[a]) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if ("-".equals(putTime[a]) || null == zcc[a]) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } + } else { + TimeDto dto = new TimeDto(); + dto.setStandId(addDetailedDto.getInforlist()); + dto.setPutTime(addDetailedDto.getInforlist1()); + dto.setXcxssrqgj(addDetailedDto.getInforlist2()); + dto.setZccssrqgj(addDetailedDto.getInforlist3()); + timeDto.add(dto); + } + } else { + timeDto = null; + } + service.insertDetailedList(sarLawsDetailedList.getId(), timeDto); + + } catch (Exception e) { + e.printStackTrace(); + } + //0表示添加成功，1表示添加失败 + return "0"; + //添加方法结束 + } + } + + //如果循环完整个数据库，都没有重复使当前数据无法添加，则添加 + if (multiAddFlag == true && singleAddFlag == true) { + //下面放添加的具体方法 + try { + SarLawsDetailedList sarLawsDetailedList = SarLawsDetailedList.builder() + .id(UUIDUtils.randomUUID20()) + .sortKey(addDetailedDto.getSortKey()) + .detailedListName(addDetailedDto.getDetailedListName()) + .detailedListState("0") + .detailedListVision("v0") + .applicationScope(addDetailedDto.getApplicationScope()) + .updateTime(new Date()) + .updatePeople(addDetailedDto.getUpdatePeople()) + .remark(addDetailedDto.getRemark()) + .updatePeople(getUserName()) + .fileIds(addDetailedDto.getFileIds()) + .build(); + List timeDto = new ArrayList<>(); + switch (addDetailedDto.getSortKey()) { + case "1": + sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea()); + + break; + case "2": + sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName()); + + + break; + case "3": + sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList()); + + break; + default: + break; + } + if ("admin".equals(getUserName())) sarLawsDetailedList.setUpdatePeople("管理员"); + else { + sarLawsDetailedList.setUpdatePeople(getUserName()); + } + sarLawsDetailedListDao.insert(sarLawsDetailedList); + if (addDetailedDto.getInforlist() != null) { + if (addDetailedDto.getInforlist().contains(",")) { + String[] id = addDetailedDto.getInforlist().split(","); + String[] putTime = addDetailedDto.getInforlist1().split(","); + String[] zcc = addDetailedDto.getInforlist2().split(","); + String[] xcx = addDetailedDto.getInforlist3().split(","); + for (int a = 0; a < id.length; a++) { + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if ("-".equals(putTime[a]) || null == putTime[a]) { + dto.setPutTime(null); + } else { + dto.setPutTime(putTime[a]); + } + if ("-".equals(putTime[a]) || null == xcx[a]) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if ("-".equals(putTime[a]) || null == zcc[a]) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } + } else { + TimeDto dto = new TimeDto(); + dto.setStandId(addDetailedDto.getInforlist()); + dto.setPutTime(addDetailedDto.getInforlist1()); + dto.setXcxssrqgj(addDetailedDto.getInforlist2()); + dto.setZccssrqgj(addDetailedDto.getInforlist3()); + timeDto.add(dto); + } + } else { + timeDto = null; + } + service.insertDetailedList(sarLawsDetailedList.getId(), timeDto); + + } catch (Exception e) { + e.printStackTrace(); + } + //0表示添加成功，1表示添加失败 + return "0"; + //添加方法结束 + } else { + //0表示添加成功，1表示添加失败 + return "1"; } - return "添加成功"; } @Override public IPage AllSelectD(Integer page, Integer pageSize, String sortKey, String countryArea, String projectName, - String detailedList, String detailedListName,String carType) { + String detailedList, String detailedListName) { QueryWrapper wrapper = new QueryWrapper<>(); if ("1".equals(sortKey)) { wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea). like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); } else if ("2".equals(sortKey)) { wrapper.like(StringUtils.isNotEmpty(projectName), "project_name", projectName). - like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName). - like(StringUtils.isNotEmpty(carType), "car_type", carType); + like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); } else if ("3".equals(sortKey)) { wrapper.like(StringUtils.isNotEmpty(detailedList), "detailed_list", detailedList). @@ -181,9 +451,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl map1:arr) { - if (map1.get("value").equals(list1.getCountryArea())){ + } else { + for (Map map1 : arr) { + if (map1.get("value").equals(list1.getCountryArea())) { list1.setCountryArea(map1.get("label")); break; } @@ -202,46 +472,46 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); - if ( detailedUpDto.getInforlist().contains(",")) { + if (detailedUpDto.getInforlist().contains(",")) { String[] id = detailedUpDto.getInforlist().split(","); - String[] ssrq = detailedUpDto.getInforlist1().split(","); + String[] putTime = detailedUpDto.getInforlist1().split(","); String[] zcc = detailedUpDto.getInforlist2().split(","); String[] xcx = detailedUpDto.getInforlist3().split(","); - for (int a = 0; a < id.length; a++) { - TimeDto dto = new TimeDto(); - dto.setStandId(id[a]); - if (ssrq.length<=a) { - dto.setSsrq(null); - } else { - dto.setSsrq(ssrq[a]); - } - if (ssrq.length<=a) { - dto.setXcxssrqgj(null); - } else { - dto.setXcxssrqgj(xcx[a]); - } - if (ssrq.length<=a) { - dto.setZccssrqgj(null); - } else { - dto.setZccssrqgj(zcc[a]); - } - timeDto.add(dto); + for (int a = 0; a < id.length; a++) { + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if (putTime.length <= a) { + dto.setPutTime(null); + } else { + dto.setPutTime(putTime[a]); } + if (putTime.length <= a) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if (putTime.length <= a) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } } else { TimeDto dto = new TimeDto(); dto.setStandId(detailedUpDto.getInforlist()); - dto.setSsrq(detailedUpDto.getInforlist1()); + dto.setPutTime(detailedUpDto.getInforlist1()); dto.setXcxssrqgj(detailedUpDto.getInforlist2()); dto.setZccssrqgj(detailedUpDto.getInforlist3()); timeDto.add(dto); From 79a6ac3b4cf8b111db546d081f15a1818431e724 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 18 Aug 2021 09:22:11 +0800 Subject: [PATCH 2/5] commit --- .../SarLawsAttrDetailedListController.java | 4 ++-- .../dao/SarLawsAttrDetailedListDao.java | 2 +- .../entity/LawsDto.java | 5 +--- .../entity/SarFindDto.java | 3 --- .../entity/SarLawsAttrDetailedList.java | 4 ++-- .../entity/StandExcelDto.java | 2 +- .../SarLawsAttrDetailedListServiceImpl.java | 11 ++++----- .../SarLawsDetailedListController.java | 4 ++-- .../entity/AddDetailedDto.java | 3 +-- .../entity/SarLawsDetailedList.java | 3 --- .../sarLawsDetailedList/entity/TimeDto.java | 2 +- .../service/ISarLawsDetailedListService.java | 2 +- ...ndardComplianceAssessResultController.java | 24 +++++++------------ .../SarStandardComplianceProductAssess.java | 8 ------- .../SarStandardComplianceProductAssessEO.java | 4 ---- .../entity/SarStandardsInfoEO.java | 3 --- 16 files changed, 25 insertions(+), 59 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 724cf5f8..47156302 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 @@ -222,8 +222,8 @@ public class SarLawsAttrDetailedListController extends BaseController> sycpx = (List>)map.get("SYCPXCLASS"); for (LawsDto list1:data){ - if (list1.getSSRQ()!=null){ - list1.setSSRQ(list1.getSSRQ().substring(0,10)); + if (list1.getPutTime()!=null){ + list1.setPutTime(list1.getPutTime().substring(0,10)); } if (list1.getZCCSSRQGJ()!=null){ list1.setZCCSSRQGJ(list1.getZCCSSRQGJ().substring(0,10)); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index 4307db71..2ff5fc7c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -22,7 +22,7 @@ import java.util.List; public interface SarLawsAttrDetailedListDao extends BaseMapper { //根据清单id，查出标准的id并排序 - List selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size,@Param("sar") SarFindDto sarFindDto); + List selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size); //根据标准id查出数据 List selectLawsById(@Param("param1") List LawsIds, @Param("sarFindDto") SarFindDto sarFindDto); //根据标准id查出数据用于清单查询 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 120a444d..730446d8 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 @@ -63,7 +63,7 @@ public class LawsDto { @ExcelProperty(value = "标准实施日期", index = 8) @ApiModelProperty(value = "标准实施日期") @DateTimeFormat("yyyy年MM月dd日") - private String SSRQ; + private String putTime; @ColumnWidth(16) @ExcelProperty(value = "新车型实施日期", index = 9) @@ -115,7 +115,4 @@ public class LawsDto { @ApiModelProperty(value = "文本状态") private String textStatus; - - @ApiModelProperty(value = "适用车型") - private String applyArctic; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java index db12a5b6..06dc3d5d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java @@ -23,8 +23,5 @@ public class SarFindDto { // private String ZCCSSRQGJ; private String zrbm; private String sycpx; - private String standSort; - private String standType; - private String standNumber; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java index b037f45f..45dc5441 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java @@ -44,8 +44,8 @@ public class SarLawsAttrDetailedList extends BaseEntity { private String number; @ApiModelProperty(value = "标准实施日期") - @TableField(value = "ssrq") - private String ssrq; + @TableField(value = "putTime") + private String putTime; @ApiModelProperty(value = "新车型实施日期") @TableField(value = "xcxssrq") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java index 5588e7e2..6805be5d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java @@ -29,7 +29,7 @@ public class StandExcelDto { @ApiModelProperty(value = "能源类型") private String NYLX; @ApiModelProperty(value = "标准实施日期") - private String SSRQ; + private String putTime; @ApiModelProperty(value = "新车型实施日期") private String newCarTime; @ApiModelProperty(value = "在产车实施日期") 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 9028d493..92c664b7 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 @@ -45,21 +45,18 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper); //查询标准id - List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize(),sarFindDto); + List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize()); if (CollectionUtils.isEmpty(lawsIds)){ return null; } List list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto); for (LawsDto lawsDto:list){ - if (StringUtils.isNoneEmpty(lawsDto.getApplyArctic())){ - lawsDto.setApplyArctic(lawsDto.getApplyArctic()); - } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("stand_id",lawsDto.getId()) .eq("detailed_list_id",sarFindDto.getId()); List sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); - if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){ - lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getPutTime())){ + lawsDto.setPutTime(sarLawsAttrDetailedLists.get(0).getPutTime()); } if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); @@ -202,7 +199,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl publicList1 = sarLawsDetailedListService.AllSelectD(page, pageSize, sortKey, - countryArea, projectName, detailedList, detailedListName,carType); + countryArea, projectName, detailedList, detailedListName); List list= publicList1.getRecords();//从封装中取出数据 List list1;//继承类集合实现 list1 = BeanConverUtil.converList(list,FindFileNameDto.class);//将原来类的数据赋给继承类 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java index 47f55aad..6e7af186 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java @@ -40,6 +40,5 @@ public class AddDetailedDto { private String inforlist2; @ApiModelProperty(value = "新车型实施时间") private String inforlist3; - @ApiModelProperty(value = "车辆类别") - private String carType; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java index beec8129..b95650b5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java @@ -81,8 +81,5 @@ public class SarLawsDetailedList extends BaseEntity { @TableField("file_id") private String fileIds; - @ApiModelProperty(value = "附件id") - @TableField("car_type") - private String carType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java index 510ebe8c..e2dee83d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java @@ -15,7 +15,7 @@ public class TimeDto { private String standId; @ApiModelProperty(value = "实施日期") - private String ssrq; + private String putTime; @ApiModelProperty(value = "在产车实施日期") private String zccssrqgj; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java index a772e7c8..323c009e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java @@ -23,7 +23,7 @@ public interface ISarLawsDetailedListService extends IService AllSelectD(Integer pages, Integer size, String sortKey, String countryArea,String projectName, - String detailedList, String detailedListName,String carType); + String detailedList, String detailedListName); // IPage selectAllP(Integer pages,Integer size,String sortKey); String updateList(DetailedUpDto detailedUpDto); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 924cafd0..5d46d005 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -59,16 +59,13 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandApplicationType() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME",eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } - if (eo.getType() != null && !eo.getType().trim().equals("")) { - queryWrapper.like("type",eo.getType().trim()); - } IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -78,16 +75,13 @@ public class SarStandardComplianceAssessResultController { if(eo.getPosition()==1){ QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME",eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } - if (eo.getType() != null && !eo.getType().trim().equals("")) { - queryWrapper.like("type",eo.getType().trim()); - } IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -96,16 +90,13 @@ public class SarStandardComplianceAssessResultController { }else{ QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME",eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } - if (eo.getType() != null && !eo.getType().trim().equals("")) { - queryWrapper.like("type",eo.getType().trim()); - } IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -167,11 +158,14 @@ public class SarStandardComplianceAssessResultController { public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); - if (eo.getType() !=null) queryWrapper.eq("type",eo.getType()); if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); - if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); - if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); +// if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); +// if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); + IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); + +// while(page.getRecords().remove(null)); + return Result.success(page); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java index c6496762..4601161e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java @@ -91,10 +91,6 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @ApiModelProperty(value = "在产产品合规信息") private String productionCompliance; - @ApiModelProperty(value = "在产产品不合规信息") - @TableField("production_non_compliance") - private String productionNonCompliance; - @ApiModelProperty(value = "在产产品不合规应对措施") private String productionCountermeasures; @@ -117,10 +113,6 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @TableField("clause_name") private String clauseName; - @ApiModelProperty(value = "流程UUID") - @TableField("type") - private String type; - private String id; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java index c91afc56..53b782b2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java @@ -18,10 +18,6 @@ public class SarStandardComplianceProductAssessEO{ @TableField("STAND_ID") private String standId; - @ApiModelProperty(value = "流程UUID") - @TableField("type") - private String type; - @ApiModelProperty(value = "'项目名称'") private String productName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java index 4fb0c327..9981e6ee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java @@ -25,9 +25,6 @@ public class SarStandardsInfoEO { @ApiModelProperty(value = "国内1，国外2") private Integer position=1; - @ApiModelProperty(value = "流程UUID") - @TableField("type") - private String type; @ApiModelProperty("页数") private Integer current=1; From 9e0aad737ce7d97f6e94337038377228987053f3 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 18 Aug 2021 13:46:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsDetailedListServiceImpl.java | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index eb6eeb92..63c916fd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -62,7 +62,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.select("DISTINCT country_area"); + wrapper.select("DISTINCT country_area,car_type"); List sarLawsDetailedLists = sarLawsDetailedListDao.selectList(wrapper); //多选是否可以添加的标识，true表示可以添加，false表示不许添加 boolean multiAddFlag = true; @@ -71,8 +71,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl AllSelectD(Integer page, Integer pageSize, String sortKey, - String countryArea, String projectName, + String countryArea, String carType, String detailedList, String detailedListName) { QueryWrapper wrapper = new QueryWrapper<>(); if ("1".equals(sortKey)) { wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea). like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); } else if ("2".equals(sortKey)) { - wrapper.like(StringUtils.isNotEmpty(projectName), "project_name", projectName). + wrapper.like(StringUtils.isNotEmpty(carType), "car_type", carType). like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); } else if ("3".equals(sortKey)) { @@ -475,9 +479,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl Date: Wed, 18 Aug 2021 14:44:27 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListController.java | 4 +- .../entity/LawsDto.java | 5 +- .../entity/SarLawsAttrDetailedList.java | 4 +- .../SarLawsAttrDetailedListServiceImpl.java | 9 ++- .../SarLawsDetailedListController.java | 4 +- .../entity/AddDetailedDto.java | 3 +- .../entity/SarLawsDetailedList.java | 3 + .../sarLawsDetailedList/entity/TimeDto.java | 2 +- .../service/ISarLawsDetailedListService.java | 2 +- ...ndardComplianceAssessResultController.java | 68 +++++++++---------- .../SarStandardComplianceProductAssessEO.java | 4 ++ .../entity/SarStandardsInfoEO.java | 3 + 12 files changed, 62 insertions(+), 49 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 47156302..724cf5f8 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 @@ -222,8 +222,8 @@ public class SarLawsAttrDetailedListController extends BaseController> sycpx = (List>)map.get("SYCPXCLASS"); for (LawsDto list1:data){ - if (list1.getPutTime()!=null){ - list1.setPutTime(list1.getPutTime().substring(0,10)); + if (list1.getSSRQ()!=null){ + list1.setSSRQ(list1.getSSRQ().substring(0,10)); } if (list1.getZCCSSRQGJ()!=null){ list1.setZCCSSRQGJ(list1.getZCCSSRQGJ().substring(0,10)); 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 730446d8..120a444d 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 @@ -63,7 +63,7 @@ public class LawsDto { @ExcelProperty(value = "标准实施日期", index = 8) @ApiModelProperty(value = "标准实施日期") @DateTimeFormat("yyyy年MM月dd日") - private String putTime; + private String SSRQ; @ColumnWidth(16) @ExcelProperty(value = "新车型实施日期", index = 9) @@ -115,4 +115,7 @@ public class LawsDto { @ApiModelProperty(value = "文本状态") private String textStatus; + + @ApiModelProperty(value = "适用车型") + private String applyArctic; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java index 45dc5441..b037f45f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java @@ -44,8 +44,8 @@ public class SarLawsAttrDetailedList extends BaseEntity { private String number; @ApiModelProperty(value = "标准实施日期") - @TableField(value = "putTime") - private String putTime; + @TableField(value = "ssrq") + private String ssrq; @ApiModelProperty(value = "新车型实施日期") @TableField(value = "xcxssrq") 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 92c664b7..a733b867 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 @@ -51,12 +51,15 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto); for (LawsDto lawsDto:list){ + if (StringUtils.isNoneEmpty(lawsDto.getApplyArctic())){ + lawsDto.setApplyArctic(lawsDto.getApplyArctic()); + } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("stand_id",lawsDto.getId()) .eq("detailed_list_id",sarFindDto.getId()); List sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); - if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getPutTime())){ - lawsDto.setPutTime(sarLawsAttrDetailedLists.get(0).getPutTime()); + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){ + lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); } if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); @@ -199,7 +202,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl publicList1 = sarLawsDetailedListService.AllSelectD(page, pageSize, sortKey, - countryArea, projectName, detailedList, detailedListName); + countryArea, projectName, detailedList, detailedListName,carType); List list= publicList1.getRecords();//从封装中取出数据 List list1;//继承类集合实现 list1 = BeanConverUtil.converList(list,FindFileNameDto.class);//将原来类的数据赋给继承类 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java index 6e7af186..47f55aad 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java @@ -40,5 +40,6 @@ public class AddDetailedDto { private String inforlist2; @ApiModelProperty(value = "新车型实施时间") private String inforlist3; - + @ApiModelProperty(value = "车辆类别") + private String carType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java index b95650b5..beec8129 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java @@ -81,5 +81,8 @@ public class SarLawsDetailedList extends BaseEntity { @TableField("file_id") private String fileIds; + @ApiModelProperty(value = "附件id") + @TableField("car_type") + private String carType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java index e2dee83d..510ebe8c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java @@ -15,7 +15,7 @@ public class TimeDto { private String standId; @ApiModelProperty(value = "实施日期") - private String putTime; + private String ssrq; @ApiModelProperty(value = "在产车实施日期") private String zccssrqgj; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java index 323c009e..a772e7c8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java @@ -23,7 +23,7 @@ public interface ISarLawsDetailedListService extends IService AllSelectD(Integer pages, Integer size, String sortKey, String countryArea,String projectName, - String detailedList, String detailedListName); + String detailedList, String detailedListName,String carType); // IPage selectAllP(Integer pages,Integer size,String sortKey); String updateList(DetailedUpDto detailedUpDto); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 1e7c723f..4ab81ce3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -61,64 +61,64 @@ public class SarStandardComplianceAssessResultController { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { - queryWrapper.like("STAND_NAME",eo.getStandName().trim()); + queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { - queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); + queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); } if (eo.getType() != null && !eo.getType().trim().equals("")) { - queryWrapper.like("type",eo.getType().trim()); + queryWrapper.like("type", eo.getType().trim()); } IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); - }else { - if(eo.getPosition()==1){ + } else { + if (eo.getPosition() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { - queryWrapper.like("STAND_NAME",eo.getStandName().trim()); + queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { - queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); + queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); } // if (eo.getType() != null && !eo.getType().trim().equals("")) { // queryWrapper.like("type",eo.getType().trim()); // } IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); - }else{ + } else { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { - queryWrapper.like("STAND_NAME",eo.getStandName().trim()); + queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { - queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); + queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); } // if (eo.getType() != null && !eo.getType().trim().equals("")) { // queryWrapper.like("type",eo.getType().trim()); // } IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); } } } - private static class InsertEntity{ + private static class InsertEntity { List entityList; T eo; } - @ApiOperation(value="（插入/更新）标准清单") + @ApiOperation(value = "（插入/更新）标准清单") @PostMapping("/standard") public ResponseMessage insertStandard(@RequestBody InsertEntity insertEntity) throws InvocationTargetException, IllegalAccessException { @@ -128,27 +128,27 @@ public class SarStandardComplianceAssessResultController { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarStandardComplianceProductAssess obj=new SarStandardComplianceProductAssess(); + SarStandardComplianceProductAssess obj = new SarStandardComplianceProductAssess(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } iSarStandardComplianceProductAssessService.saveOrUpdateBatch(entityList); - }else { - if(eo.getPosition()==1){ + } else { + if (eo.getPosition() == 1) { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + SarInterpretationNationalStandard obj = new SarInterpretationNationalStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); - }else{ + } else { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } @@ -166,14 +166,11 @@ public class SarStandardComplianceAssessResultController { public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); + if (eo.getType() != null) queryWrapper.eq("type", eo.getType()); if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); -// if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); -// if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - + if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); + if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); - -// while(page.getRecords().remove(null)); - return Result.success(page); } @@ -195,22 +192,22 @@ public class SarStandardComplianceAssessResultController { @ApiOperation(value = "条件查询技术审核符合性清单") @GetMapping("/interpretation") public ResponseMessage selectNationalStandard(InterpretationEO eo) throws Exception { - if (eo.getPosition()==1) { + if (eo.getPosition() == 1) { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - if(eo.getStandId()!=null)queryWrapper.eq("STAND_ID",eo.getStandId()); + if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); } else { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - if(eo.getStandId()!=null)queryWrapper.eq("STAND_ID",eo.getStandId()); + if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); } @@ -223,11 +220,11 @@ public class SarStandardComplianceAssessResultController { InterpretationEO eo = insertEntity.eo; - if (eo.getPosition()==1) { + if (eo.getPosition() == 1) { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + SarInterpretationNationalStandard obj = new SarInterpretationNationalStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } @@ -235,10 +232,9 @@ public class SarStandardComplianceAssessResultController { } else { - List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java index 53b782b2..c91afc56 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java @@ -18,6 +18,10 @@ public class SarStandardComplianceProductAssessEO{ @TableField("STAND_ID") private String standId; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; + @ApiModelProperty(value = "'项目名称'") private String productName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java index 9981e6ee..4fb0c327 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java @@ -25,6 +25,9 @@ public class SarStandardsInfoEO { @ApiModelProperty(value = "国内1，国外2") private Integer position=1; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; @ApiModelProperty("页数") private Integer current=1; From 508c2922002a07b7940cc35f7cda2acc87e1cd19 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 18 Aug 2021 15:15:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/FeignClient/workFlowFeignClient.java | 4 ++-- adc-da-main/src/main/resources/application-dev.properties | 2 +- adc-da-main/src/main/resources/application.properties | 1 + 3 files changed, 4 insertions(+), 3 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) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index d889af61..c9a24e7a 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -12,7 +12,7 @@ spring.datasource.password = root #============================================== # 应用设置 -spring.application.name=FotonLAWSSystem556 +spring.application.name=FotonLAWSSystem application.code=20200101 application.center=1 #============================================== diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index d39b475a..50c4225d 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -40,6 +40,7 @@ eureka.client.fetch-registry=true #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ +#eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000