Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, 企标代替被代替

See merge request LiuChao/foton-slrs-system-rest!427
This commit is contained in:
super_liu
2022-03-25 11:15:14 +08:00
@@ -668,6 +668,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String standId = result.get(0).getId();
String field = beUpedField;
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 = "";
if (StringUtils.isNotBlank(citedStand)) {
String[] beforeReplacedStandNumStr = citedStand.split(",");
@@ -679,7 +682,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
sarBussStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand);
} else {
changeCitedStand = addStrandNumber;
if(count == 0){
String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr();
String mustFields = FieldConvertUtil.mustFields;
String mustValues = FieldConvertUtil.mustValues(standId);
@@ -705,6 +708,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String insertField = mustFields + fieldsBuilder.toString();
String insertValue = mustValues + valuesBuilder.toString();
sarBussStandAttrInfoEODao.insertStandAttr(insertField,insertValue);
}else {
sarBussStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand);
}
}
}
}