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 
feat: There is no way the, 企标代替被代替

See merge request LiuChao/foton-slrs-system-rest!428
This commit is contained in:
super_liu
2022-03-25 13:33:13 +08:00
parent 0c2acec862 a1475db743
commit 3c95778f70
1 changed files with 17 additions and 17 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
+17 -17
View File
@@ -546,7 +546,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//修改收藏分享编号名称
updateCollectAndShare(sarBussionessStandEO);
updateCiteStand(sarBussionessStandEO, null, "DTQBBHBUSS", "BDTQBBHBUSS");
updateCiteStand(sarBussionessStandEO, beforeStandEO, "DTQBBHBUSS", "BDTQBBHBUSS");
// 记录修改日志
saveUpdateLog(sarBussionessStandEO,beforeStandEO);
@@ -622,24 +622,24 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
// 新增修改标准过程中，根据代替标准号，修改被代替标准号对应的标准
public void updateCiteStand(SarBussionessStand sarBussionessStandEO, SarStandardsInfo beforeSarStandardsInfo, String upField, String beUpedField) throws Exception {
public void updateCiteStand(SarBussionessStand sarBussionessStandEO, SarBussionessStand beforeSarStandardsInfo, String upField, String beUpedField) throws Exception {
// 记录要被代替标准号的数据
// SarStandardsInfoEO chageEO= new SarStandardsInfoEO();
SarBussionessStand sarStandardsSelectEO = new SarBussionessStand();
String addStrandNumber = "";
String beforeStrandNumber = "";
if (StringUtils.isNotEmpty(sarBussionessStandEO.getStandYear())) {
addStrandNumber = sarBussionessStandEO.getStandSort() + " " + sarBussionessStandEO.getStandNumber() + "-" + sarBussionessStandEO.getStandYear();
if (StringUtils.isNotEmpty(sarBussionessStandEO.getStandCode())) {
addStrandNumber = sarBussionessStandEO.getStandCode();
} else {
addStrandNumber = sarBussionessStandEO.getStandSort() + " " + sarBussionessStandEO.getStandNumber();
addStrandNumber = sarBussionessStandEO.getStandCode();
}
if (beforeSarStandardsInfo != null) {
if (StringUtils.isNotEmpty(beforeSarStandardsInfo.getStandYear())) {
beforeStrandNumber = beforeSarStandardsInfo.getStandSort() + " " + beforeSarStandardsInfo.getStandNumber() + "-" + beforeSarStandardsInfo.getStandYear();
} else {
beforeStrandNumber = beforeSarStandardsInfo.getStandSort() + " " + beforeSarStandardsInfo.getStandNumber();
if (StringUtils.isNotEmpty(beforeSarStandardsInfo.getStandCode())) {
beforeStrandNumber = beforeSarStandardsInfo.getStandCode();
}
}
// 以“，”分隔查看之前是否有 ，如果有不修改，如果没有，追加修改
String newCiteStand = "";
if ("DTQBBHBUSS".equals(upField)) {
@@ -674,14 +674,14 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String changeCitedStand = "";
if (StringUtils.isNotBlank(citedStand)) {
String[] beforeReplacedStandNumStr = citedStand.split(",");
if (Arrays.asList(beforeReplacedStandNumStr).contains(addStrandNumber)) {
if (Arrays.asList(beforeReplacedStandNumStr).contains(newCiteStand)) {
continue;
} else {
changeCitedStand = citedStand + "," + addStrandNumber;
changeCitedStand = citedStand + "," + newCiteStand;
}
sarBussStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand);
} else {
changeCitedStand = addStrandNumber;
if(count == 0){
String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr();
String mustFields = FieldConvertUtil.mustFields;
@@ -696,7 +696,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if (InitStandAttrUtil.queryFieldListBuss != null && !InitStandAttrUtil.queryFieldListBuss.isEmpty()) {
if (InitStandAttrUtil.queryFieldListBuss.contains(attrKey)) {
if("BDTQBBHBUSS".equals(attrKey)){
valuesBuilder.append(",").append("'").append(changeCitedStand).append("'");
valuesBuilder.append(",").append("'").append(newCiteStand).append("'");
}else {
valuesBuilder.append(",").append("'").append(attrValue).append("'");
@@ -722,7 +722,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
for (String beforeStr : beforeEOrepNums) {
// 如果再旧的中包含，在新的中没有，需要删除
if (!Arrays.asList(nowEOrepNums).contains(beforeStr)) {
sarStandardsSelectEO.setStandNumber(beforeStr);
sarStandardsSelectEO.setStandCode(beforeStr);
List<SarBussionessStand> result = this.baseMapper.selectStandardsByStandNumber(sarStandardsSelectEO);
if (result != null && result.size() > 0) {
String standId = result.get(0).getId();
@@ -749,16 +749,16 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
} else {
// 如果为空，判断是否为修改
if (null != beforeSarStandardsInfo) {
String oldCiteStand = String.valueOf(beforeSarStandardsInfo.getAttrInfoMap().get("YYBJ"));
String oldCiteStand = String.valueOf(beforeSarStandardsInfo.getAttrInfoMap().get(upField));
if (StringUtils.isNotEmpty(oldCiteStand)) {
String[] beforeEOrepNums = oldCiteStand.split(",");
for (String beforeStr : beforeEOrepNums) {
// 如果再旧的中包含，在新的中没有，需要删除,相关数据取第一条是因为标准号是唯一的
sarStandardsSelectEO.setStandNumber(beforeStr);
sarStandardsSelectEO.setStandCode(beforeStr);
List<SarBussionessStand> result = this.baseMapper.selectStandardsByStandNumber(sarStandardsSelectEO);
if (result != null && result.size() > 0) {
String standId = result.get(0).getId();
String field = "BYYBJ";
String field = beUpedField;
String citedStand = sarBussStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId());
String changeCitedStand = "";
if (StringUtils.isNotBlank(citedStand)) {