FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!67
This commit is contained in:
高嵩
2023-04-26 18:00:18 +08:00
parent 6fced0aadd 8f94ca3472
commit 82bf3d49a8
7 changed files with 265 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+39 -10
View File
@@ -199,17 +199,46 @@ public class ActSarItemsEOService {
if (org.apache.commons.lang3.StringUtils.isNotBlank(sarStandardsInfoEO.getReplaceStandNum())){ if (org.apache.commons.lang3.StringUtils.isNotBlank(sarStandardsInfoEO.getReplaceStandNum())){
sarStandardsInfoDao.updateById(sarStandardsInfoEO); sarStandardsInfoDao.updateById(sarStandardsInfoEO);
String id = sarStandardsInfoEO.getStandName(); String id = sarStandardsInfoEO.getStandName();
SarStandardsInfo sarStandardsInfo = sarStandardsInfoDao.selectBy(id); List<SarStandardsInfo> sarStandardsInfos = sarStandardsInfoDao.selectBy(id);
if (sarStandardsInfo != null){ for (SarStandardsInfo sarStandardsInfo:sarStandardsInfos){
String textStatus = "chblaarg77"; if (sarStandardsInfo != null && sarStandardsInfo.getStandSort().equals("GB") && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){
sarStandardsInfo.setTextStatus(textStatus); String textStatus = "chblaarg77";
sarStandardsInfoDao.updateById(sarStandardsInfo); sarStandardsInfo.setTextStatus(textStatus);
sarStandardsInfoDao.updateById(sarStandardsInfo);
logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态");
String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态";
sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.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(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content);
}
} }
SarStandardsInfo sarStandardsInfo1 = sarStandardsInfoDao.selectBy1(id);
if (sarStandardsInfo1 != null){ List<SarStandardsInfo> sarStandardsInfo1s = sarStandardsInfoDao.selectBy1(id);
String textStatus = "chblaarg77"; for (SarStandardsInfo sarStandardsInfo1 : sarStandardsInfo1s){
sarStandardsInfo1.setTextStatus(textStatus); if (sarStandardsInfo1 != null && sarStandardsInfo1.getStandSort().equals("GB") && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){
sarStandardsInfoDao.updateById(sarStandardsInfo1); String textStatus = "chblaarg77";
sarStandardsInfo1.setTextStatus(textStatus);
sarStandardsInfoDao.updateById(sarStandardsInfo1);
logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态");
String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态";
sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.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(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content);
}
} }
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+1 -1
View File
@@ -920,7 +920,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
//处理 代替被代替数据 关系 //处理 代替被代替数据 关系
@ApiOperation(value = "国内海外数据处理接口") @ApiOperation(value = "国内海外数据处理接口")
@GetMapping("/replaceBdtbzhforDtbzh") @GetMapping("/replaceBdtbzhforDtbzh")
public String replaceBdtbzhforDtbzh(SarStandardsInfo sarStandardsInfo) { public String replaceBdtbzhforDtbzh(SarStandardsInfo sarStandardsInfo)throws Exception {
sarStandardsInfoEOService.replaceBdtbzhforDtbzh(); sarStandardsInfoEOService.replaceBdtbzhforDtbzh();
return "1"; return "1";
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
+5 -2
View File
@@ -119,8 +119,11 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
List<SarStandardsInfo> selectStandardsByStandnumber2(SarStandardsInfo sarStandardsInfoEO); List<SarStandardsInfo> selectStandardsByStandnumber2(SarStandardsInfo sarStandardsInfoEO);
SarStandardsInfo selectBy(String id); List<SarStandardsInfo> selectBy(String id);
SarStandardsInfo selectBy1(String id); List<SarStandardsInfo> selectBy1(String id);
@Select("select * from SAR_STANDARDS_INFO where VALID_FLAG = 0")
List<SarStandardsInfo> getSarStandardsInfo();
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java
+1 -1
View File
@@ -65,7 +65,7 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
void updateIntoIndexForMap(Map<String,Object> attrInfoMap); void updateIntoIndexForMap(Map<String,Object> attrInfoMap);
void replaceBdtbzhforDtbzh(); void replaceBdtbzhforDtbzh() throws Exception;
void replaceBdtbzhforDtbzhQb(); void replaceBdtbzhforDtbzhQb();
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+206 -82
View File
@@ -318,92 +318,182 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
@Override @Override
public void replaceBdtbzhforDtbzh() { public void replaceBdtbzhforDtbzh() throws Exception{
//第一步先处理国内海外数据 //第一步先处理国内海外数据
//获取代替标准号不为空的数据 //获取代替标准号不为空的数据
QueryWrapper<SarStandAttrInfo> wrapper = new QueryWrapper<>(); // QueryWrapper<SarStandAttrInfo> wrapper = new QueryWrapper<>();
wrapper.isNotNull("DTBJH"); // wrapper.isNotNull("DTBJH");
wrapper.ne("DTBJH", ""); // wrapper.ne("DTBJH", "");
wrapper.eq("valid_flag", "0"); // wrapper.eq("valid_flag", "0");
// wrapper.eq("stand_id", "6zaj8lx8s9ebc3za0g95"); //// wrapper.eq("stand_id", "6zaj8lx8s9ebc3za0g95");
List<SarStandAttrInfo> sarStandAttrInfos = sarStandAttrInfoEODao.selectList(wrapper); // List<SarStandAttrInfo> sarStandAttrInfos = sarStandAttrInfoEODao.selectList(wrapper);
if (null != sarStandAttrInfos && !sarStandAttrInfos.isEmpty()) { // if (null != sarStandAttrInfos && !sarStandAttrInfos.isEmpty()) {
//获取数据以及更新自身 新查询当前标准数据并将格式化之后的数据更新到代替标准号中 // //获取数据以及更新自身 新查询当前标准数据并将格式化之后的数据更新到代替标准号中
int i = 1; // int i = 1;
for (SarStandAttrInfo sarStandAttrInfo : sarStandAttrInfos) { // for (SarStandAttrInfo sarStandAttrInfo : sarStandAttrInfos) {
String dtbzh = convertStandCodeHandle(sarStandAttrInfo.getDtbjh()); // String dtbzh = convertStandCodeHandle(sarStandAttrInfo.getDtbjh());
logger.info("第" + i + "行数据代替标准号为" + dtbzh + "转换前标准号为" + sarStandAttrInfo.getDtbjh()); // logger.info("第" + i + "行数据代替标准号为" + dtbzh + "转换前标准号为" + sarStandAttrInfo.getDtbjh());
logger.info("第" + i + "行数据为" + sarStandAttrInfo.toString()); // logger.info("第" + i + "行数据为" + sarStandAttrInfo.toString());
QueryWrapper<SarStandAttrInfo> wrapper2 = new QueryWrapper<>(); // QueryWrapper<SarStandAttrInfo> wrapper2 = new QueryWrapper<>();
wrapper2.eq("valid_flag", "0"); // wrapper2.eq("valid_flag", "0");
wrapper2.eq("stand_id", sarStandAttrInfo.getStandId()); // wrapper2.eq("stand_id", sarStandAttrInfo.getStandId());
List<SarStandAttrInfo> attrInfoList = sarStandAttrInfoEODao.selectList(wrapper2); // List<SarStandAttrInfo> attrInfoList = sarStandAttrInfoEODao.selectList(wrapper2);
attrInfoList.get(0).setDtbjh(dtbzh); // attrInfoList.get(0).setDtbjh(dtbzh);
sarStandAttrInfoEODao.update(attrInfoList.get(0), wrapper2); // sarStandAttrInfoEODao.update(attrInfoList.get(0), wrapper2);
//
//
// //找到用来代替的标准号
// SearchStandContext searchStandContext1 = new SearchStandContext();
// searchStandContext1.setStandId(sarStandAttrInfo.getStandId());
// List<StandData> 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<String> strings = new ArrayList<>(Arrays.asList(dtbzh.split(",")));
// strings.forEach(s -> {
// if (StringUtils.isNotBlank(s)) {
// SearchStandContext searchStandContext = new SearchStandContext();
// searchStandContext.setStandCode(s);
// List<StandData> list = standDataDao.searchStandDataThree(searchStandContext);
// if (null != list && list.size() > 0) {
// QueryWrapper<SarStandAttrInfo> wrapper1 = new QueryWrapper<>();
// wrapper1.eq("valid_flag", "0");
// wrapper1.eq("stand_id", list.get(0).getStandId());
// List<SarStandAttrInfo> 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<StandData> list = standDataDao.searchStandDataThree(searchStandContext);
// if (null != list && list.size() > 0) {
// QueryWrapper<SarStandAttrInfo> wrapper1 = new QueryWrapper<>();
// wrapper1.eq("valid_flag", "0");
// wrapper1.eq("stand_id", list.get(0).getStandId());
// List<SarStandAttrInfo> 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<SarStandardsInfo> sarStandardsInfoEOs = dao.getSarStandardsInfo();
if (ObjectUtils.isNotEmpty(sarStandardsInfoEOs) && sarStandardsInfoEOs != null) {
for (SarStandardsInfo sarStandardsInfoEO : sarStandardsInfoEOs) {
if (sarStandardsInfoEO != null && ObjectUtils.isNotEmpty(sarStandardsInfoEO)) {
//找到用来代替的标准号 //createStandAttrInfo(sarStandardsInfoEO,true);
SearchStandContext searchStandContext1 = new SearchStandContext();
searchStandContext1.setStandId(sarStandAttrInfo.getStandId());
List<StandData> list1 = standDataDao.searchStandDataThree(searchStandContext1);
if (null != list1 && list1.size() > 0) {
String bdtbzh = list1.get(0).getStandNum();
//现在针对处理一波代替标准号 根据标准号找到 String sarStandAttrEOStr = sarStandardsInfoEO.getSarStandAttrEOStr();
if (dtbzh.contains(",") && !dtbzh.isEmpty() && !"".equals(dtbzh) && !dtbzh.contains("null") && !dtbzh.contains("Q/FT") &&null!=bdtbzh && !bdtbzh.contains("null")) { // 将字符串转为map进行解析
//判定是不是多个 Map<String, String> sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
List<String> strings = new ArrayList<>(Arrays.asList(dtbzh.split(","))); for (Map.Entry<String, String> entry : sarStandAttrMap.entrySet()) {
strings.forEach(s -> { String attrKey = entry.getKey();
if (StringUtils.isNotBlank(s)) { String attrValue = String.valueOf(entry.getValue());
SearchStandContext searchStandContext = new SearchStandContext(); if (InitStandAttrUtil.queryFieldList != null && !InitStandAttrUtil.queryFieldList.isEmpty()) {
searchStandContext.setStandCode(s); if (InitStandAttrUtil.queryFieldList.contains(attrKey)) {
List<StandData> list = standDataDao.searchStandDataThree(searchStandContext); if ("YYBJ".equals(attrKey)) {
if (null != list && list.size() > 0) { sarStandardsInfoEO.setCiteStand(attrValue);
QueryWrapper<SarStandAttrInfo> wrapper1 = new QueryWrapper<>(); } else if ("CBBH".equals(attrKey)) {
wrapper1.eq("valid_flag", "0"); sarStandardsInfoEO.setRelateStand(attrValue);
wrapper1.eq("stand_id", list.get(0).getStandId()); } else if ("DTBJH".equals(attrKey)) {
List<SarStandAttrInfo> attrInfos = sarStandAttrInfoEODao.selectList(wrapper1); sarStandardsInfoEO.setReplaceStandNum(attrValue);
if (null != attrInfos && attrInfos.size() > 0) { } else if ("BFDTBZ".equals(attrKey)) {
if (null != attrInfos.get(0).getBdtbzh() && !"".equals(attrInfos.get(0).getBdtbzh())) { sarStandardsInfoEO.setReplacePartStandNum(attrValue);
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);
}
} }
} // 不同类型存储数据需单独处理值
}); if (InitStandAttrUtil.numFieldList.contains(attrKey)) {
if (StringUtils.isBlank(attrValue)) {
} else if (!dtbzh.isEmpty() && !"".equals(dtbzh) && !dtbzh.contains("null") && !dtbzh.contains("Q/FT") &&null!=bdtbzh && !bdtbzh.contains("null")) { attrValue = "null";
//单个
SearchStandContext searchStandContext = new SearchStandContext();
searchStandContext.setStandCode(dtbzh);
List<StandData> list = standDataDao.searchStandDataThree(searchStandContext);
if (null != list && list.size() > 0) {
QueryWrapper<SarStandAttrInfo> wrapper1 = new QueryWrapper<>();
wrapper1.eq("valid_flag", "0");
wrapper1.eq("stand_id", list.get(0).getStandId());
List<SarStandAttrInfo> 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 if (InitStandAttrUtil.timeFieldList.contains(attrKey)) {
attrValue = FieldConvertUtil.changeTimeValue(attrValue);
} else { } else {
attrInfos.get(0).setBdtbzh(bdtbzh); attrValue = "'" + attrValue + "'";
}
}
}
}
if (StringUtils.isNotBlank(sarStandardsInfoEO.getReplaceStandNum())){
dao.updateById(sarStandardsInfoEO);
String id = sarStandardsInfoEO.getId();
List<SarStandardsInfo> 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(sarStandardsInfoEO.getId(), sarStandardsInfoEO.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(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content);
}
}
}
List<SarStandardsInfo> 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(sarStandardsInfoEO.getId(), sarStandardsInfoEO.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(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content);
} }
sarStandAttrInfoEODao.update(attrInfos.get(0), wrapper1);
} }
} }
} }
i++;
} }
} }
} }
} }
@Override @Override
@@ -1332,18 +1422,52 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
} }
if (StringUtils.isNotBlank(sarStandardsInfoEO.getReplaceStandNum())){ if (StringUtils.isNotBlank(sarStandardsInfoEO.getReplaceStandNum())){
dao.updateById(sarStandardsInfoEO); dao.updateById(sarStandardsInfoEO);
String id = sarStandardsInfoEO.getStandName(); String id = sarStandardsInfoEO.getId();
SarStandardsInfo sarStandardsInfo = dao.selectBy(id); List<SarStandardsInfo> sarStandardsInfos = dao.selectBy(id);
if (sarStandardsInfo != null){ if (ObjectUtils.isNotEmpty(sarStandardsInfos) && sarStandardsInfos != null){
String textStatus = "chblaarg77"; for (SarStandardsInfo sarStandardsInfo:sarStandardsInfos){
sarStandardsInfo.setTextStatus(textStatus); if (sarStandardsInfo != null && sarStandardsInfo.getStandSort().equals("GB") && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){
dao.updateById(sarStandardsInfo); String textStatus = "chblaarg77";
sarStandardsInfo.setTextStatus(textStatus);
dao.updateById(sarStandardsInfo);
logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态");
String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态";
sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.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(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content);
}
}
} }
SarStandardsInfo sarStandardsInfo1 = dao.selectBy1(id);
if (sarStandardsInfo1 != null){
String textStatus = "chblaarg77"; List<SarStandardsInfo> sarStandardsInfo1s = dao.selectBy1(id);
sarStandardsInfo1.setTextStatus(textStatus); if (ObjectUtils.isNotEmpty(sarStandardsInfo1s) && sarStandardsInfo1s != null){
dao.updateById(sarStandardsInfo1); 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(sarStandardsInfoEO.getId(), sarStandardsInfoEO.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(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content);
}
}
} }
} }
} }
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+4 -4
View File
@@ -2041,7 +2041,7 @@
<select id="selectBy" resultType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo"> <select id="selectBy" resultType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo">
select select
ssi2.id ssi2.*
from from
SAR_STANDARDS_INFO ssi, SAR_STANDARDS_INFO ssi,
SAR_STANDARDS_INFO ssi2 SAR_STANDARDS_INFO ssi2
@@ -2052,11 +2052,11 @@
<if test="standSort !=null and standNumber !=null and standYear ==null"> <if test="standSort !=null and standNumber !=null and standYear ==null">
ssi.REPLACE_STAND_NUM = concat(ssi2.STAND_SORT,' ',ssi2.STAND_NUMBER) ssi.REPLACE_STAND_NUM = concat(ssi2.STAND_SORT,' ',ssi2.STAND_NUMBER)
</if> </if>
and ssi.STAND_NAME = #{id} and ssi.id = #{id} and ssi.VALID_FLAG = 0
</select> </select>
<select id="selectBy1" resultType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo"> <select id="selectBy1" resultType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo">
select select
ssi2.id ssi2.*
from from
SAR_STANDARDS_INFO ssi, SAR_STANDARDS_INFO ssi,
SAR_STANDARDS_INFO ssi2 SAR_STANDARDS_INFO ssi2
@@ -2067,7 +2067,7 @@
<if test="standSort !=null and standNumber !=null and standYear ==null"> <if test="standSort !=null and standNumber !=null and standYear ==null">
ssi.REPLACE_STAND_NUM = concat(ssi2.STAND_SORT,ssi2.STAND_NUMBER) ssi.REPLACE_STAND_NUM = concat(ssi2.STAND_SORT,ssi2.STAND_NUMBER)
</if> </if>
and ssi.STAND_NAME = #{id} and ssi.id = #{id} and ssi.VALID_FLAG = 0
</select> </select>
</mapper> </mapper>
adc-da-slrs/src/main/resources/mysql/interfaceLog.sql
+9
View File
@@ -1,5 +1,14 @@
-- 福田 需要通过第三方调用的接口 -- 福田 需要通过第三方调用的接口
--2023-04-26 11:18
--名称 国内海外数据处理接口 处理 代替被代替数据 关系
--详情
--路径 http://localhost:9090/api/sarStandardsInfo/sar-standards-info/replaceBdtbzhforDtbzh
--参数
--类型 Get
-- 2023-04-23 11:18 -- 2023-04-23 11:18
-- 名称 纠正企业标准复审日期的数据 -Q/QCBFC -Q/FT X产品标准（发布日期和复审日期留一个（逻辑：产品标准经过3年需要复审，技术标准经过5年需要复审）。,其他为技术标准。（如遇新的产品标准编号规则应通知李经理补充。）） -- 名称 纠正企业标准复审日期的数据 -Q/QCBFC -Q/FT X产品标准（发布日期和复审日期留一个（逻辑：产品标准经过3年需要复审，技术标准经过5年需要复审）。,其他为技术标准。（如遇新的产品标准编号规则应通知李经理补充。））
-- 详情 -- 详情