diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 2e3d8450..18873758 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -21,6 +21,7 @@ import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService; +import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; @@ -108,6 +109,9 @@ public class ActSarItemsBussEOService { @Autowired private EsRevisePlanLogDao esRevisePlanLogDao; + @Autowired + private SarBussionessStandDao sarBussionessStandEODao; + public void processCreateFsBuss(String standJson) throws Exception { Map standMap = new HashMap(); @@ -339,6 +343,7 @@ public class ActSarItemsBussEOService { String prcName = String.valueOf(standMap.get("prcName")); String prcCreateUser = String.valueOf(standMap.get("prcCreateUser")); String standType = String.valueOf(standMap.get("standType")); + String DTQBBHBUSS = String.valueOf(standMap.get("DTQBBHBUSS")); // String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估 SarBussionessStand sarBussionessStand = new SarBussionessStand(); // if(standMap.containsKey("standId")) { @@ -407,11 +412,6 @@ public class ActSarItemsBussEOService { } } - //企标实施时间 -// if (StringUtils.isBlank(sarBussionessStand.getPutTime())){ -// logger.info("企标实施日期不能为空"); -// throw new AdcDaBaseException("企标实施日期不能为空"); -// } List lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode); // if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { @@ -486,6 +486,7 @@ public class ActSarItemsBussEOService { } else {//标准号、ID都不存在的情况 // 新增方法 sarBussionessStand.setPrcCreateUser(prcCreateUser); + sarBussionessStand.setReplaceStandNum(DTQBBHBUSS); // 根据标准号判断数据是否已存在 // QueryWrapperqueryWrapper = new QueryWrapper<>(); // queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 529cc085..3edb7781 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -209,7 +209,7 @@ public class ActSarItemsEOService { String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; sarUpdLogEOService.createBaseLog(sarStandardsInfo.getId(), sarStandardsInfo.getStandType() + "_STAND", content); - }else if (sarStandardsInfo != null && (sarStandardsInfoEO.getTextStatus().equals("hb0iy9z23c") || sarStandardsInfoEO.getTextStatus().equals("hc99551723c") || sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ + }else if (sarStandardsInfo != null && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ String textStatus = "qke0ckro2p"; sarStandardsInfo.setTextStatus(textStatus); sarStandardsInfoDao.updateById(sarStandardsInfo); @@ -230,7 +230,7 @@ public class ActSarItemsEOService { String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; sarUpdLogEOService.createBaseLog(sarStandardsInfo1.getId(), sarStandardsInfo1.getStandType() + "_STAND", content); - }else if (sarStandardsInfo1 != null && (sarStandardsInfoEO.getTextStatus().equals("hb0iy9z23c") || sarStandardsInfoEO.getTextStatus().equals("hc99551723c") || sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ + }else if (sarStandardsInfo1 != null && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ String textStatus = "qke0ckro2p"; sarStandardsInfo1.setTextStatus(textStatus); sarStandardsInfoDao.updateById(sarStandardsInfo1); 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 3efec211..851d0b52 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 @@ -131,5 +131,7 @@ public interface SarBussionessStandDao extends BaseMapper { String setDtqbbhbuss(String dtqbbhbuss); String selectByStandCode(String standCode); + + SarBussionessStand selectByReplaceStandNum(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 df27dc73..9e0aba7d 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 @@ -708,6 +708,15 @@ public class SarBussionessStandServiceImpl extends ServiceImpl= 1) { @@ -2875,6 +2884,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attInfoMap = new HashMap<>(); @@ -2944,7 +2954,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl= 1) { // 根据代替标准号 ，修改代替标准号标准中的，被代替标准号 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 0a26fff4..a75d9553 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -320,91 +320,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); -// wrapper.isNotNull("DTBJH"); -// wrapper.ne("DTBJH", ""); -// wrapper.eq("valid_flag", "0"); -//// wrapper.eq("stand_id", "6zaj8lx8s9ebc3za0g95"); -// List sarStandAttrInfos = sarStandAttrInfoEODao.selectList(wrapper); -// if (null != sarStandAttrInfos && !sarStandAttrInfos.isEmpty()) { -// //获取数据以及更新自身 新查询当前标准数据并将格式化之后的数据更新到代替标准号中 -// int i = 1; -// for (SarStandAttrInfo sarStandAttrInfo : sarStandAttrInfos) { -// String dtbzh = convertStandCodeHandle(sarStandAttrInfo.getDtbjh()); -// logger.info("第" + i + "行数据代替标准号为" + dtbzh + "转换前标准号为" + sarStandAttrInfo.getDtbjh()); -// logger.info("第" + i + "行数据为" + sarStandAttrInfo.toString()); -// QueryWrapper wrapper2 = new QueryWrapper<>(); -// wrapper2.eq("valid_flag", "0"); -// wrapper2.eq("stand_id", sarStandAttrInfo.getStandId()); -// List attrInfoList = sarStandAttrInfoEODao.selectList(wrapper2); -// attrInfoList.get(0).setDtbjh(dtbzh); -// sarStandAttrInfoEODao.update(attrInfoList.get(0), wrapper2); -// -// -// //找到用来代替的标准号 -// SearchStandContext searchStandContext1 = new SearchStandContext(); -// searchStandContext1.setStandId(sarStandAttrInfo.getStandId()); -// List list1 = standDataDao.searchStandDataThree(searchStandContext1); -// if (null != list1 && list1.size() > 0) { -// String bdtbzh = list1.get(0).getStandNum(); -// -// //现在针对处理一波代替标准号 根据标准号找到 -// if (dtbzh.contains(",") && !dtbzh.isEmpty() && !"".equals(dtbzh) && !dtbzh.contains("null") && !dtbzh.contains("Q/FT") &&null!=bdtbzh && !bdtbzh.contains("null")) { -// //判定是不是多个 -// List strings = new ArrayList<>(Arrays.asList(dtbzh.split(","))); -// strings.forEach(s -> { -// if (StringUtils.isNotBlank(s)) { -// SearchStandContext searchStandContext = new SearchStandContext(); -// searchStandContext.setStandCode(s); -// List list = standDataDao.searchStandDataThree(searchStandContext); -// if (null != list && list.size() > 0) { -// QueryWrapper wrapper1 = new QueryWrapper<>(); -// wrapper1.eq("valid_flag", "0"); -// wrapper1.eq("stand_id", list.get(0).getStandId()); -// List attrInfos = sarStandAttrInfoEODao.selectList(wrapper1); -// if (null != attrInfos && attrInfos.size() > 0) { -// if (null != attrInfos.get(0).getBdtbzh() && !"".equals(attrInfos.get(0).getBdtbzh())) { -// if (!attrInfos.get(0).getBdtbzh().contains(bdtbzh)) { -// attrInfos.get(0).setBdtbzh(attrInfos.get(0).getBdtbzh() + "," + bdtbzh); -// } -// } else { -// attrInfos.get(0).setBdtbzh(bdtbzh); -// } -// sarStandAttrInfoEODao.update(attrInfos.get(0), wrapper1); -// } -// } -// } -// }); -// -// } else if (!dtbzh.isEmpty() && !"".equals(dtbzh) && !dtbzh.contains("null") && !dtbzh.contains("Q/FT") &&null!=bdtbzh && !bdtbzh.contains("null")) { -// //单个 -// SearchStandContext searchStandContext = new SearchStandContext(); -// searchStandContext.setStandCode(dtbzh); -// List list = standDataDao.searchStandDataThree(searchStandContext); -// if (null != list && list.size() > 0) { -// QueryWrapper wrapper1 = new QueryWrapper<>(); -// wrapper1.eq("valid_flag", "0"); -// wrapper1.eq("stand_id", list.get(0).getStandId()); -// List attrInfos = sarStandAttrInfoEODao.selectList(wrapper1); -// if (null != attrInfos && attrInfos.size() > 0) { -// if (null != attrInfos.get(0).getBdtbzh() && !"".equals(attrInfos.get(0).getBdtbzh())) { -// if (!attrInfos.get(0).getBdtbzh().contains(bdtbzh)) { -// attrInfos.get(0).setBdtbzh(attrInfos.get(0).getBdtbzh() + "," + bdtbzh); -// } -// } else { -// attrInfos.get(0).setBdtbzh(bdtbzh); -// } -// sarStandAttrInfoEODao.update(attrInfos.get(0), wrapper1); -// } -// } -// } -// i++; -// } -// } -// } - List sarStandardsInfoEOs = dao.getSarStandardsInfo(); if (ObjectUtils.isNotEmpty(sarStandardsInfoEOs) && sarStandardsInfoEOs != null) { for (SarStandardsInfo sarStandardsInfoEO : sarStandardsInfoEOs) { @@ -428,7 +343,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarStandardsInfos = dao.selectBy(id); - if (ObjectUtils.isNotEmpty(sarStandardsInfos) && sarStandardsInfos != null){ + if (ObjectUtils.isNotEmpty(sarStandardsInfos) && sarStandardsInfos != null){ for (SarStandardsInfo sarStandardsInfo:sarStandardsInfos){ if (sarStandardsInfo != null && sarStandardsInfo.getStandSort().equals("GB") && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ String textStatus = "chblaarg77"; @@ -1407,7 +1322,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl select id from sar_bussioness_stand where stand_code = #{standCode} and VALID_FLAG = 0 limit 1 + update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile}