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 32f4d761..529cc085 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 @@ -199,17 +199,46 @@ public class ActSarItemsEOService { if (org.apache.commons.lang3.StringUtils.isNotBlank(sarStandardsInfoEO.getReplaceStandNum())){ sarStandardsInfoDao.updateById(sarStandardsInfoEO); String id = sarStandardsInfoEO.getStandName(); - SarStandardsInfo sarStandardsInfo = sarStandardsInfoDao.selectBy(id); - if (sarStandardsInfo != null){ - String textStatus = "chblaarg77"; - sarStandardsInfo.setTextStatus(textStatus); - sarStandardsInfoDao.updateById(sarStandardsInfo); + List sarStandardsInfos = sarStandardsInfoDao.selectBy(id); + 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"; + sarStandardsInfo.setTextStatus(textStatus); + sarStandardsInfoDao.updateById(sarStandardsInfo); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); + + 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"))){ + String textStatus = "qke0ckro2p"; + sarStandardsInfo.setTextStatus(textStatus); + sarStandardsInfoDao.updateById(sarStandardsInfo); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); + + String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfo.getId(), sarStandardsInfo.getStandType() + "_STAND", content); + } } - SarStandardsInfo sarStandardsInfo1 = sarStandardsInfoDao.selectBy1(id); - if (sarStandardsInfo1 != null){ - String textStatus = "chblaarg77"; - sarStandardsInfo1.setTextStatus(textStatus); - sarStandardsInfoDao.updateById(sarStandardsInfo1); + + List sarStandardsInfo1s = sarStandardsInfoDao.selectBy1(id); + for (SarStandardsInfo sarStandardsInfo1 : sarStandardsInfo1s){ + if (sarStandardsInfo1 != null && sarStandardsInfo1.getStandSort().equals("GB") && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ + String textStatus = "chblaarg77"; + sarStandardsInfo1.setTextStatus(textStatus); + sarStandardsInfoDao.updateById(sarStandardsInfo1); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); + + 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"))){ + String textStatus = "qke0ckro2p"; + sarStandardsInfo1.setTextStatus(textStatus); + sarStandardsInfoDao.updateById(sarStandardsInfo1); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); + + String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfo1.getId(), sarStandardsInfo1.getStandType() + "_STAND", content); + } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java index fddfcb8b..63678277 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java @@ -4,6 +4,7 @@ import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; import com.adc.da.sys.common.SelectionResult; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; import java.util.List; @@ -45,5 +46,8 @@ public interface SarStandAttrInfoDao extends BaseMapper { void updateByIdInfo(@Param("id")String id,@Param("fbgbjbd") String fbgbuss,@Param("fbgywbd") String fbgywbd); String selectInfoStandId(@Param("standId")String standId); + + @Select("select * from SAR_STAND_ATTR_INFO where stand_id = #{id} and valid_flag=0") + SarStandAttrInfo getSarStandAttrInfo(String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 6479d29b..9e22faf1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -920,7 +920,7 @@ public class SarStandardsInfoController extends BaseController //处理 代替被代替数据 关系 @ApiOperation(value = "国内海外数据处理接口") @GetMapping("/replaceBdtbzhforDtbzh") - public String replaceBdtbzhforDtbzh(SarStandardsInfo sarStandardsInfo) { + public String replaceBdtbzhforDtbzh(SarStandardsInfo sarStandardsInfo)throws Exception { sarStandardsInfoEOService.replaceBdtbzhforDtbzh(); return "1"; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index c2488196..2658b99d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -119,8 +119,11 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectStandardsByStandnumber2(SarStandardsInfo sarStandardsInfoEO); - SarStandardsInfo selectBy(String id); + List selectBy(String id); - SarStandardsInfo selectBy1(String id); + List selectBy1(String id); + + @Select("select * from SAR_STANDARDS_INFO where VALID_FLAG = 0") + List getSarStandardsInfo(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index 5f6129cd..e32b952c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -65,7 +65,7 @@ public interface ISarStandardsInfoService extends IService { void updateIntoIndexForMap(Map attrInfoMap); - void replaceBdtbzhforDtbzh(); + void replaceBdtbzhforDtbzh() throws Exception; void replaceBdtbzhforDtbzhQb(); 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 d7cdb6ec..26a9a230 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 @@ -318,92 +318,154 @@ 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); +// QueryWrapper 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) { + if (sarStandardsInfoEO != null && ObjectUtils.isNotEmpty(sarStandardsInfoEO)) { + SarStandAttrInfo sarStandAttrInfo = sarStandAttrInfoEODao.getSarStandAttrInfo(sarStandardsInfoEO.getId()); + if (sarStandAttrInfo != null && ObjectUtils.isNotEmpty(sarStandAttrInfo)){ + sarStandardsInfoEO.setReplacedStandNum(sarStandAttrInfo.getDtbjh()); + } - //找到用来代替的标准号 - 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 (StringUtils.isNotBlank(sarStandardsInfoEO.getReplaceStandNum())){ + dao.updateById(sarStandardsInfoEO); + String id = sarStandardsInfoEO.getId(); + List sarStandardsInfos = dao.selectBy(id); + 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"; + sarStandardsInfo.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); - //现在针对处理一波代替标准号 根据标准号找到 - 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); - } + 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"))){ + String textStatus = "qke0ckro2p"; + sarStandardsInfo.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); + + String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfo.getId(), sarStandardsInfo.getStandType() + "_STAND", content); } } - }); + } - } 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); + + List sarStandardsInfo1s = dao.selectBy1(id); + if (ObjectUtils.isNotEmpty(sarStandardsInfo1s) && sarStandardsInfo1s != null){ + for (SarStandardsInfo sarStandardsInfo1 : sarStandardsInfo1s){ + if (sarStandardsInfo1 != null && sarStandardsInfo1.getStandSort().equals("GB") && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ + String textStatus = "chblaarg77"; + sarStandardsInfo1.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo1); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); + + 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"))){ + String textStatus = "qke0ckro2p"; + sarStandardsInfo1.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo1); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); + + String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfo1.getId(), sarStandardsInfo1.getStandType() + "_STAND", content); } - sarStandAttrInfoEODao.update(attrInfos.get(0), wrapper1); } } } - i++; } } } - } @Override @@ -1332,18 +1394,52 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarStandardsInfos = dao.selectBy(id); + 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"; + sarStandardsInfo.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); + + 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"))){ + String textStatus = "qke0ckro2p"; + sarStandardsInfo.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); + + String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfo.getId(), sarStandardsInfo.getStandType() + "_STAND", content); + } + } } - SarStandardsInfo sarStandardsInfo1 = dao.selectBy1(id); - if (sarStandardsInfo1 != null){ - String textStatus = "chblaarg77"; - sarStandardsInfo1.setTextStatus(textStatus); - dao.updateById(sarStandardsInfo1); + + + List sarStandardsInfo1s = dao.selectBy1(id); + if (ObjectUtils.isNotEmpty(sarStandardsInfo1s) && sarStandardsInfo1s != null){ + for (SarStandardsInfo sarStandardsInfo1 : sarStandardsInfo1s){ + if (sarStandardsInfo1 != null && sarStandardsInfo1.getStandSort().equals("GB") && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ + String textStatus = "chblaarg77"; + sarStandardsInfo1.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo1); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); + + 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"))){ + String textStatus = "qke0ckro2p"; + sarStandardsInfo1.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo1); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); + + String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfo1.getId(), sarStandardsInfo1.getStandType() + "_STAND", content); + } + } } } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 326dad79..afcfda21 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -2041,7 +2041,7 @@ diff --git a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql index 49bf82e3..1d54c770 100644 --- a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql +++ b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql @@ -1,5 +1,14 @@ -- 福田 需要通过第三方调用的接口 +--2023-04-26 11:18 +--名称 国内海外数据处理接口 处理 代替被代替数据 关系 +--详情 +--路径 http://localhost:9090/api/sarStandardsInfo/sar-standards-info/replaceBdtbzhforDtbzh +--参数 +--类型 Get + + + -- 2023-04-23 11:18 -- 名称 纠正企业标准复审日期的数据 -Q/QCBFC -Q/FT X产品标准（发布日期和复审日期留一个（逻辑：产品标准经过3年需要复审，技术标准经过5年需要复审）。,其他为技术标准。（如遇新的产品标准编号规则应通知李经理补充。）） -- 详情