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!432
This commit is contained in:
super_liu
2022-03-28 11:50:05 +08:00
parent 4807ecde20 a88f092575
commit 40a0445fd1
1 changed files with 3 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+3 -35
View File
@@ -668,49 +668,17 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String standId = result.get(0).getId(); String standId = result.get(0).getId();
String field = beUpedField; String field = beUpedField;
String citedStand = sarBussStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId()); String citedStand = sarBussStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId());
QueryWrapper qw = new QueryWrapper();
qw.eq("STAND_ID",standId);
int count = sarBussStandAttrInfoEODao.selectCount(qw);
String changeCitedStand = ""; String changeCitedStand = "";
if (StringUtils.isNotBlank(citedStand)) { if (StringUtils.isNotBlank(citedStand)) {
String[] beforeReplacedStandNumStr = citedStand.split(","); String[] beforeReplacedStandNumStr = citedStand.split(",");
if (Arrays.asList(beforeReplacedStandNumStr).contains(newCiteStand)) { if (Arrays.asList(beforeReplacedStandNumStr).contains(addStrandNumber)) {
continue; continue;
} else { } else {
changeCitedStand = citedStand + "," + newCiteStand; changeCitedStand = citedStand + "," + addStrandNumber;
} }
sarBussStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand); sarBussStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand);
} else { } else {
if(count == 0){ sarBussStandAttrInfoEODao.updateStandInfo(standId, field, addStrandNumber);
String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr();
String mustFields = FieldConvertUtil.mustFields;
String mustValues = FieldConvertUtil.mustValues(standId);
// 将字符串转为map进行解析
Map<String,String> sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
StringBuilder fieldsBuilder = new StringBuilder();
StringBuilder valuesBuilder = new StringBuilder();
for (Map.Entry<String,String> entry : sarStandAttrMap.entrySet()) {
String attrKey = entry.getKey();
String attrValue = "";
if (InitStandAttrUtil.queryFieldListBuss != null && !InitStandAttrUtil.queryFieldListBuss.isEmpty()) {
if (InitStandAttrUtil.queryFieldListBuss.contains(attrKey)) {
if("BDTQBBHBUSS".equals(attrKey)){
valuesBuilder.append(",").append("'").append(newCiteStand).append("'");
}else {
valuesBuilder.append(",").append("'").append(attrValue).append("'");
}
fieldsBuilder.append(",").append(attrKey);
}
}
}
String insertField = mustFields + fieldsBuilder.toString();
String insertValue = mustValues + valuesBuilder.toString();
sarBussStandAttrInfoEODao.insertStandAttr(insertField,insertValue);
}else {
sarBussStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand);
}
} }
} }
} }