diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java index b2d919ed..47b0f8ae 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java @@ -57,6 +57,10 @@ public class SarBussStandAttrInfo extends BaseEntity { @TableField("TXLBBUSS") private String txlbbuss; + @ApiModelProperty(value = "被代替企标编号") + @TableField("BDTQBBHBUSS") + private String bdtqbbhbuss; + @TableField(exist = false) private String glwj; // diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 46b2d23e..8ff706e4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -55,8 +55,6 @@ public interface SarBussionessStandDao extends BaseMapper { List selectSarBussionesDownloadFileInfo(String id); - List selectStandardsByStandnumber(SarBussionessStand sarStandardsInfoEO); - List selectStandByStandNumber(@Param("standCode") String standCode); /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 22784202..c42aa5fc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -628,13 +628,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 0) { + if (StringUtils.isNotEmpty(newCiteStand) && newCiteStand.split(",").length > 0) { // 主要逻辑处理新增的 String nowEOrepNums[] = newCiteStand.split(","); for (String citeStand : nowEOrepNums) { - sarStandardsSelectEO.setStandNumber(citeStand); + sarStandardsSelectEO.setStandCode(citeStand); // if (StringUtils.isNotBlank(sarStandardsSelectEO.getStandNumber())) { // String sort = ""; // if (sarStandardsSelectEO.getStandNumber().length() > 3) { @@ -663,41 +663,67 @@ public class SarBussionessStandServiceImpl extends ServiceImpl result = this.baseMapper.selectStandardsByStandnumber(sarStandardsSelectEO); + List result = this.baseMapper.selectStandardsByStandNumber(sarStandardsSelectEO); if (result != null && result.size() > 0) { String standId = result.get(0).getId(); String field = beUpedField; String citedStand = sarBussStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId()); String changeCitedStand = ""; - if (org.apache.commons.lang3.StringUtils.isNotBlank(citedStand)) { + if (StringUtils.isNotBlank(citedStand)) { String[] beforeReplacedStandNumStr = citedStand.split(","); if (Arrays.asList(beforeReplacedStandNumStr).contains(addStrandNumber)) { continue; } else { changeCitedStand = citedStand + "," + addStrandNumber; } + sarBussStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand); } else { changeCitedStand = addStrandNumber; + + String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr(); + String mustFields = FieldConvertUtil.mustFields; + String mustValues = FieldConvertUtil.mustValues(standId); + // 将字符串转为map进行解析 + Map sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr); + StringBuilder fieldsBuilder = new StringBuilder(); + StringBuilder valuesBuilder = new StringBuilder(); + for (Map.Entry 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(changeCitedStand).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); } - sarBussStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand); } } // 如果id不为空,说明是修改,有逻辑删除的执行以下语句,存在之前是三项,现在修改成两项的情况 if (null != beforeSarStandardsInfo) { String oldCiteStand = String.valueOf(beforeSarStandardsInfo.getAttrInfoMap().get(upField)); - if (org.apache.commons.lang3.StringUtils.isNotEmpty(oldCiteStand)) { + if (StringUtils.isNotEmpty(oldCiteStand)) { String[] beforeEOrepNums = oldCiteStand.split(","); for (String beforeStr : beforeEOrepNums) { // 如果再旧的中包含,在新的中没有,需要删除 if (!Arrays.asList(nowEOrepNums).contains(beforeStr)) { sarStandardsSelectEO.setStandNumber(beforeStr); - List result = this.baseMapper.selectStandardsByStandnumber(sarStandardsSelectEO); + List result = this.baseMapper.selectStandardsByStandNumber(sarStandardsSelectEO); if (result != null && result.size() > 0) { String standId = result.get(0).getId(); String field = beUpedField; String citedStand = sarBussStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId()); String changeCitedStand = ""; - if (org.apache.commons.lang3.StringUtils.isNotBlank(citedStand)) { + if (StringUtils.isNotBlank(citedStand)) { String[] beforerepalced = citedStand.split(","); ArrayList beforlist = new ArrayList<>(Arrays.asList(beforerepalced)); if (beforlist.contains(beforeStrandNumber)) { @@ -718,23 +744,23 @@ public class SarBussionessStandServiceImpl extends ServiceImpl result = this.baseMapper.selectStandardsByStandnumber(sarStandardsSelectEO); + List result = this.baseMapper.selectStandardsByStandNumber(sarStandardsSelectEO); if (result != null && result.size() > 0) { String standId = result.get(0).getId(); String field = "BYYBJ"; String citedStand = sarBussStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId()); String changeCitedStand = ""; - if (org.apache.commons.lang3.StringUtils.isNotBlank(citedStand)) { + if (StringUtils.isNotBlank(citedStand)) { String[] beforerepalced = citedStand.split(","); ArrayList beforlist = new ArrayList<>(Arrays.asList(beforerepalced)); if (beforlist.contains(beforeStrandNumber)) { beforlist.remove(beforeStrandNumber); - changeCitedStand = org.apache.commons.lang3.StringUtils.join(beforlist.toArray(), ","); + changeCitedStand = StringUtils.join(beforlist.toArray(), ","); } else { continue; }