From e5d7a6730744a81ee25372afe0b176eb864b6a4f Mon Sep 17 00:00:00 2001 From: zyd Date: Tue, 19 Jul 2022 11:11:45 +0800 Subject: [PATCH 01/10] =?UTF-8?q?fix:=20=E5=85=A5=E5=BA=93=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=9C=B0=E5=9D=80=E6=B8=85=E7=90=86=E9=9D=9E=E6=9C=AC?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=86=85=E7=9A=84=E4=BB=A3=E7=A0=81=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsEOService.java | 24 +++++++++---------- .../impl/SarStandardsInfoServiceImpl.java | 5 +--- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index a279368a..518000ac 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -176,13 +176,13 @@ public class ActSarItemsEOService { } String standFoUser = ""; List> itemData = new ArrayList<>(); - if (breakVal != null) { - //取出taskbreak中的部分标准信息放到map中，如fo,svpps,责任部门，项目评估角色 - String valueStr = String.valueOf(breakVal); - jsonArray = JSONArray.parseArray(valueStr,String.class); - // 处理在标准、条款中的SVPPS、项目评估角色、责任部门、FO - handleStandCollectData(attInfoMap,jsonArray,itemData); - } +// if (breakVal != null) { +// //取出taskbreak中的部分标准信息放到map中，如fo,svpps,责任部门，项目评估角色 +// String valueStr = String.valueOf(breakVal); +// jsonArray = JSONArray.parseArray(valueStr,String.class); +// // 处理在标准、条款中的SVPPS、项目评估角色、责任部门、FO +// handleStandCollectData(attInfoMap,jsonArray,itemData); +// } //处理文件 //此处需要处理之前的文件信息，防止文件丢失 // attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus()); @@ -273,12 +273,12 @@ public class ActSarItemsEOService { // 编辑相关流程 sarStandAttrInfoEOService.updateStandInfo(sarStandardsInfoEO.getId(),"XGLC",prcNum); } - List allItems = new ArrayList<>(); +// List allItems = new ArrayList<>(); //开始处理条款数据，从去重后的结果中直接处理即可 - if(itemData!=null && !itemData.isEmpty()){ - // allItems = - saveStandItemsData(itemData, sarStandardsInfoEO); - } +// if(itemData!=null && !itemData.isEmpty()){ +// // allItems = +// saveStandItemsData(itemData, sarStandardsInfoEO); +// } //技术评估结果入库 重构技术评估结果入库内容 // if ("0".equals(isJudge)) { // saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum); 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 f2c1a0fc..23de453a 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 @@ -1935,17 +1935,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Tue, 19 Jul 2022 11:15:15 +0800 Subject: [PATCH 02/10] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DSQL=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/20220706_新表.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sql/20220706_新表.sql b/doc/sql/20220706_新表.sql index b33648ad..137d8c6d 100644 --- a/doc/sql/20220706_新表.sql +++ b/doc/sql/20220706_新表.sql @@ -1,4 +1,4 @@ -CREATE TABLE `foton_slrs`.`Untitled` ( +CREATE TABLE `foton_slrs`.`zl_data` ( `id` varchar(64) NULL COMMENT 'id', `data_id` varchar(64) NULL COMMENT '数据id' ); From 147d9e9fbbb5f92c46eb7ca72db6d0da7ef5d8f4 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 19 Jul 2022 14:00:05 +0800 Subject: [PATCH 03/10] 56627 --- .../SarLawsAttrDetailedListController.java | 253 +++++++++--------- 1 file changed, 129 insertions(+), 124 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 05aea921..abb9b05e 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 @@ -136,154 +136,159 @@ public class SarLawsAttrDetailedListController extends BaseController data = new ArrayList<>(); if (CollectionUtils.isEmpty(standExcelVo.getIds())){ List list= sarLawsAttrDetailedListDao.selectLawsId2(standExcelVo.getId()); - if (CollectionUtils.isEmpty(list)) return; - data=sarLawsAttrDetailedListDao.selectLawsByIdE(list); + if (!CollectionUtils.isEmpty(list)) { + data = sarLawsAttrDetailedListDao.selectLawsByIdE(list); + } }else { data=sarLawsAttrDetailedListDao.selectLawsByIdE(standExcelVo.getIds()); } - if ("1".equals(type)){ - List lawsIds=new ArrayList<>(); - SarFindDto sarFindDto=new SarFindDto(); - sarFindDto.setId(standExcelVo.getId()); - data.forEach(lawsDto -> {lawsIds.add(lawsDto.getId());}); - List list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto); - for (LawsDto lawsDto:data){ - 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()) && "null" != sarLawsAttrDetailedLists.get(0).getSsrq()) { - lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); - } - if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getXcxssrq()) { - lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); - } - if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getZccssrq()) { - lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq()); - } - if ("INLAND".equals(lawsDto.getStandType())) lawsDto.setStandType("INLAND_STAND"); - if ("FOREIGN".equals(lawsDto.getStandType())) lawsDto.setStandType("FOREIGN_STAND"); + if (!CollectionUtils.isEmpty(data)) { + if ("1".equals(type)) { + List lawsIds = new ArrayList<>(); + SarFindDto sarFindDto = new SarFindDto(); + sarFindDto.setId(standExcelVo.getId()); + data.forEach(lawsDto -> { + lawsIds.add(lawsDto.getId()); + }); + List list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds, sarFindDto); + for (LawsDto lawsDto : data) { + 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()) && "null" != sarLawsAttrDetailedLists.get(0).getSsrq()) { + lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); + } + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getXcxssrq()) { + lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); + } + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getZccssrq()) { + lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq()); + } + if ("INLAND".equals(lawsDto.getStandType())) lawsDto.setStandType("INLAND_STAND"); + if ("FOREIGN".equals(lawsDto.getStandType())) lawsDto.setStandType("FOREIGN_STAND"); + } } - } - //适用车型 - Map map= iDicTypeEOService.getDicTypeListCode(); - List> typeApplicable = (List>)map.get("ENERGYTYPES"); - for (LawsDto list1:data){ - if (StringUtils.isNotBlank(list1.getTypeApplicable()) && list1.getTypeApplicable().contains(",")){ - String[] split = list1.getTypeApplicable().split(","); - StringBuilder builder = new StringBuilder(); - for (String s:split){ - for (Map map1:typeApplicable) { - if (map1.get("value").equals(s)){ - s=map1.get("label"); - builder.append(s+","); + //适用车型 + Map map = iDicTypeEOService.getDicTypeListCode(); + List> typeApplicable = (List>) map.get("ENERGYTYPES"); + for (LawsDto list1 : data) { + if (StringUtils.isNotBlank(list1.getTypeApplicable()) && list1.getTypeApplicable().contains(",")) { + String[] split = list1.getTypeApplicable().split(","); + StringBuilder builder = new StringBuilder(); + for (String s : split) { + for (Map map1 : typeApplicable) { + 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.setTypeApplicable(completedString); + } else { + for (Map map1 : typeApplicable) { + if (map1.get("value").equals(list1.getTypeApplicable())) { + list1.setTypeApplicable(map1.get("label")); break; } } } - String completedString = builder.delete(builder.length()-1,builder.length()).toString(); - list1.setTypeApplicable(completedString); - }else { - for (Map map1 : typeApplicable) { - if (map1.get("value").equals(list1.getTypeApplicable())) { - list1.setTypeApplicable(map1.get("label")); - break; - } - } } - } - //能源类型 - List> nylx = (List>)map.get("NYLXCLASS"); - for (LawsDto list1:data){ - if (StringUtils.isNotBlank(list1.getNYLX()) && list1.getNYLX().contains(",")){ - String[] split = list1.getNYLX().split(","); - StringBuilder builder = new StringBuilder(); - for (String s:split){ - for (Map map1:nylx) { - if (map1.get("value").equals(s)){ - s=map1.get("label"); - builder.append(s+","); + //能源类型 + List> nylx = (List>) map.get("NYLXCLASS"); + for (LawsDto list1 : data) { + if (StringUtils.isNotBlank(list1.getNYLX()) && list1.getNYLX().contains(",")) { + String[] split = list1.getNYLX().split(","); + StringBuilder builder = new StringBuilder(); + for (String s : split) { + for (Map map1 : nylx) { + 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.setNYLX(completedString); + } else { + for (Map map1 : nylx) { + if (map1.get("value").equals(list1.getNYLX())) { + list1.setNYLX(map1.get("label")); break; } } } - String completedString = builder.delete(builder.length()-1,builder.length()).toString(); - list1.setNYLX(completedString); - }else { - for (Map map1 : nylx) { - if (map1.get("value").equals(list1.getNYLX())) { - list1.setNYLX(map1.get("label")); - break; - } - } } - } - //责任部门 - List> zrbn = (List>)map.get("ZRBMCLASS"); - for (LawsDto list1:data){ - if (StringUtils.isNotBlank(list1.getZRBM()) && list1.getZRBM().contains(",")){ - String[] split = list1.getZRBM().split(","); - StringBuilder builder = new StringBuilder(); - for (String s:split){ - for (Map map1:zrbn) { - if (map1.get("value").equals(s)){ - s=map1.get("label"); - builder.append(s+","); + //责任部门 + List> zrbn = (List>) map.get("ZRBMCLASS"); + for (LawsDto list1 : data) { + if (StringUtils.isNotBlank(list1.getZRBM()) && list1.getZRBM().contains(",")) { + String[] split = list1.getZRBM().split(","); + StringBuilder builder = new StringBuilder(); + for (String s : split) { + for (Map map1 : zrbn) { + if (map1.get("value").equals(s)) { + s = map1.get("label"); + builder.append(s + ","); + break; + } + } + } + try { + String completedString = builder.delete(builder.length() - 1, builder.length()).toString(); + list1.setZRBM(completedString); + } catch (Exception e) { + System.out.println(e); + } + } else { + for (Map map1 : zrbn) { + if (map1.get("value").equals(list1.getZRBM())) { + list1.setZRBM(map1.get("label")); break; } } } - try { - String completedString = builder.delete(builder.length()-1,builder.length()).toString(); - list1.setZRBM(completedString); - }catch (Exception e){ - System.out.println(e); + } + //产品线 + List> sycpx = (List>) map.get("SYCPXCLASS"); + for (LawsDto list1 : data) { + if (list1.getSSRQ() != null) { + list1.setSSRQ(list1.getSSRQ()); } - }else { - for (Map map1 : zrbn) { - if (map1.get("value").equals(list1.getZRBM())) { - list1.setZRBM(map1.get("label")); - break; - } + if (list1.getZCCSSRQGJ() != null) { + list1.setZCCSSRQGJ(list1.getZCCSSRQGJ()); + } + if (list1.getXCXSSRQGJ() != null) { + list1.setXCXSSRQGJ(list1.getXCXSSRQGJ()); } - } - } - //产品线 - List> sycpx = (List>)map.get("SYCPXCLASS"); - for (LawsDto list1:data){ - if (list1.getSSRQ()!=null){ - list1.setSSRQ(list1.getSSRQ()); - } - if (list1.getZCCSSRQGJ()!=null){ - list1.setZCCSSRQGJ(list1.getZCCSSRQGJ()); - } - if (list1.getXCXSSRQGJ()!=null){ - list1.setXCXSSRQGJ(list1.getXCXSSRQGJ()); - } - if (StringUtils.isNotBlank(list1.getSYCPX()) && list1.getSYCPX().contains(",")){ - String[] split = list1.getSYCPX().split(","); - StringBuilder builder = new StringBuilder(); - for (String s:split){ - for (Map map1:sycpx) { - if (map1.get("value").equals(s)){ - s=map1.get("label"); - builder.append(s+","); - break; + if (StringUtils.isNotBlank(list1.getSYCPX()) && list1.getSYCPX().contains(",")) { + String[] split = list1.getSYCPX().split(","); + StringBuilder builder = new StringBuilder(); + for (String s : split) { + for (Map map1 : sycpx) { + 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.setSYCPX(completedString); - }else { - for (Map map1 : sycpx) { - if (map1.get("value").equals(list1.getSYCPX())) { - list1.setSYCPX(map1.get("label")); - break; + String completedString = builder.delete(builder.length() - 1, builder.length()).toString(); + list1.setSYCPX(completedString); + } else { + for (Map map1 : sycpx) { + if (map1.get("value").equals(list1.getSYCPX())) { + list1.setSYCPX(map1.get("label")); + break; + } } } } From 3091e40ddc20ca48b804dbc002ed5ba43b8ea514 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 19 Jul 2022 15:05:39 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E9=97=AE=E7=AD=94=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E5=AD=97=E6=AE=B5=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index e64b06c1..390dadb8 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -128,7 +128,7 @@