FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!558
This commit is contained in:
super_liu
2022-07-19 18:08:03 +08:00
parent 5a647b7a57 17dd917d1e
commit 4d72c4f90c
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+19
View File
@@ -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<String> 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);
}
}
}
}
doc/sql/数据库改动.sql
+6
View File
@@ -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);