From 53ccc5a913d143bf65baab0a29ca54b84b2340c8 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 19 Jul 2022 17:31:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=20=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E5=8F=8A=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20FBGYWBD=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=E5=8F=91=E5=B8=83=E7=A8=BF(=E8=AF=91?= =?UTF-8?q?=E6=96=87)=20=E5=85=A5=E5=BA=93=E6=B7=BB=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsEOService.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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..76d48958 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 @@ -852,6 +852,25 @@ public class ActSarItemsEOService { addAttInfoMap.put("FBGBJBD",fileStr); } } + }else if(oldAttInfoMap.containsKey("FBGYWBD")){ + String fileStr = (String) oldAttInfoMap.get("FBGYWBD"); + if(StringUtils.isNotBlank(fileStr)){ + String newFileStr =addAttInfoMap.containsKey("FBGYWBD")?(String)addAttInfoMap.get("FBGYWBD"):null; + if(StringUtils.isNotBlank(newFileStr)){ + String[] fileSplit = fileStr.split(","); + String[] newFileSplit = newFileStr.split(","); + Set fileSet = new HashSet<>(); + for(String sData:fileSplit){ + fileSet.add(sData); + } + for(String sData:newFileSplit){ + fileSet.add(sData); + } + addAttInfoMap.put("FBGYWBD",StringUtils.join(fileSet.toArray(), ",")); + }else{ + addAttInfoMap.put("FBGYWBD",fileStr); + } + } } } From 17dd917d1e62f7e150b3a1734e6b33de1a1d4fb1 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 19 Jul 2022 18:07:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=BB=93=E6=9E=84=E5=8D=95=E5=85=83=E5=8F=98?= =?UTF-8?q?=E5=9E=8B=E5=8F=B7(=E4=B9=98=E7=94=A8=E8=BD=A6)=20=20=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=BB=93=E6=9E=84=E5=8D=95=E5=85=83=E5=90=8D=E7=A7=B0?= =?UTF-8?q?(=E4=B9=98=E7=94=A8=E8=BD=A6)=20DOC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/数据库改动.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/sql/数据库改动.sql b/doc/sql/数据库改动.sql index 24948330..b214ee22 100644 --- a/doc/sql/数据库改动.sql +++ b/doc/sql/数据库改动.sql @@ -7,3 +7,9 @@ INSERT INTO `foton_slrs`.`ts_dictype`(`ID`, `DIC_ID`, `DIC_TYPE_NAME`, `DIC_TYPE 5.12------------------- 新增企标文本状态 发布、即将实施 INSERT INTO `foton_slrs`.`ts_dictype` (`ID`, `DIC_ID`, `DIC_TYPE_NAME`, `DIC_TYPE_CODE`, `DESCRIBES`, `SHOW_INDEX`, `PARENT_ID`, `TREE_PID`, `OTHERS`, `CREATION_USER`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`) VALUES ('yxje11vu7hngvakm6xor', 'qybmpmpvykzpwy511xai', '发布', '6jnqba2mby', '', '7', NULL, NULL, NULL, 'chenchunmei', '0', '2022-05-12 01:45:21', '2022-05-12 01:45:21'); INSERT INTO `foton_slrs`.`ts_dictype` (`ID`, `DIC_ID`, `DIC_TYPE_NAME`, `DIC_TYPE_CODE`, `DESCRIBES`, `SHOW_INDEX`, `PARENT_ID`, `TREE_PID`, `OTHERS`, `CREATION_USER`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`) VALUES ('n4wyayhkmbhc58wi21rs', 'qybmpmpvykzpwy511xai', '即将实施', 'rpvoxsvr60', '', '8', NULL, NULL, NULL, 'chenchunmei', '0', '2022-05-12 01:45:56', '2022-05-12 01:45:56'); + + + +2022.07.19 ---- 模块结构单元变型号(乘用车) 模块结构单元名称(乘用车) +INSERT INTO `foton_slrs`.`sar_stand_attr_details` (`ID`, `ATTR_FIELD`, `ATTR_NAME`, `ATTR_TYPE`, `ATTR_LEN`, `ORDER_NUM`, `IS_EDIT`, `CREATION_USER`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `IS_MUST`, `IS_SHOW_IMP`, `SHOW_REGION_ID`, `SEL_VAL`, `SAR_TYPE`, `IS_SEARCH`, `IS_WARN`, `IS_JANSUO`) VALUES ('gkwa6r4bfyjush9zbdyb1', 'CYCDYBXHBUSS', '模块结构单元变型号(乘用车)', 'INPUT_STR', '200', '18', '0', 'chenchunmei', '0', '2021-12-15 16:00:00', '2022-07-19 09:46:13', '1', '0', '2YVQYFS332W5XWAAY25F', '', 'BUSS', '1', '1', NULL); +INSERT INTO `foton_slrs`.`sar_stand_attr_details` (`ID`, `ATTR_FIELD`, `ATTR_NAME`, `ATTR_TYPE`, `ATTR_LEN`, `ORDER_NUM`, `IS_EDIT`, `CREATION_USER`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `IS_MUST`, `IS_SHOW_IMP`, `SHOW_REGION_ID`, `SEL_VAL`, `SAR_TYPE`, `IS_SEARCH`, `IS_WARN`, `IS_JANSUO`) VALUES ('gkwa6r4bfyjush9zbdyb2', 'CYCDYMCBUSS', '模块结构单元名称(乘用车)', 'INPUT_STR', '200', '19', '0', 'chenchunmei', '0', '2021-12-15 16:00:00', '2022-07-19 09:46:13', '1', '0', '2YVQYFS332W5XWAAY25F', '', 'BUSS', '1', '1', NULL);