ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 老法规导入-标准号代替被代替问题

Browse Source
This commit is contained in:
mzaxd
2023-12-29 14:23:50 +08:00
parent 0321614481
commit 05c8d31782
3 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java
+21 -9
View File
@@ -382,14 +382,18 @@ public class OldSystemServiceImpl implements OldSystemService {
String tdbzh = entity.getSubstituteStandardNumber();
String btdbzh = entity.getReplacedByStandardNumber();
// 代替标准号
// 先删除已经存储的关联
String standardNumber = entity.getStandardNumber();
if (StringUtils.isNotBlank(tdbzh)) {
lawsReplacedStandardService.addRelation(btdbzh, tdbzh, 1);
lawsReplacedStandardService.removeRelation(standardNumber, 1);
lawsReplacedStandardService.addRelationOldSystemSync(tdbzh, standardNumber, 1);
}
// 被代替标准号
if (StringUtils.isNotBlank(btdbzh)) {
List<String> replaceCodeList = Arrays.asList(btdbzh.split(";"));
List<String> replaceCodeList = Arrays.asList(btdbzh.split(","));
replaceCodeList.forEach(replaceCode -> {
lawsReplacedStandardService.addRelation(replaceCode, btdbzh, 1);
lawsReplacedStandardService.removeRelation(replaceCode, 1);
lawsReplacedStandardService.addRelationOldSystemSync(standardNumber, replaceCode, 1);
});
}
entity.setSubstituteStandardNumber(null);
@@ -1319,14 +1323,18 @@ public class OldSystemServiceImpl implements OldSystemService {
String tdbzh = entity.getSubstituteStandardNumber();
String btdbzh = entity.getReplacedByStandardNumber();
// 代替标准号
// 先删除已经存储的关联
String standardNumber = entity.getStandardNumber();
if (StringUtils.isNotBlank(tdbzh)) {
lawsReplacedStandardService.addRelation(btdbzh, tdbzh, 1);
lawsReplacedStandardService.removeRelation(standardNumber, 1);
lawsReplacedStandardService.addRelationOldSystemSync(tdbzh, standardNumber, 1);
}
// 被代替标准号
if (StringUtils.isNotBlank(btdbzh)) {
List<String> replaceCodeList = Arrays.asList(btdbzh.split(";"));
List<String> replaceCodeList = Arrays.asList(btdbzh.split(","));
replaceCodeList.forEach(replaceCode -> {
lawsReplacedStandardService.addRelation(replaceCode, btdbzh, 1);
lawsReplacedStandardService.removeRelation(replaceCode, 1);
lawsReplacedStandardService.addRelationOldSystemSync(standardNumber, replaceCode, 1);
});
}
entity.setSubstituteStandardNumber(null);
@@ -1526,14 +1534,18 @@ public class OldSystemServiceImpl implements OldSystemService {
String tdbzh = entity.getSubstituteStandardNumber();
String btdbzh = entity.getReplacedByStandardNumber();
// 代替标准号
// 先删除已经存储的关联
String standardNumber = entity.getStandardNumber();
if (StringUtils.isNotBlank(tdbzh)) {
lawsReplacedStandardService.addRelation(tdbzh, curStandardNumber, 1);
lawsReplacedStandardService.removeRelation(standardNumber, 1);
lawsReplacedStandardService.addRelationOldSystemSync(tdbzh, standardNumber, 1);
}
// 被代替标准号
if (StringUtils.isNotBlank(btdbzh)) {
List<String> replaceCodeList = Arrays.asList(btdbzh.split(";"));
List<String> replaceCodeList = Arrays.asList(btdbzh.split(","));
replaceCodeList.forEach(replaceCode -> {
lawsReplacedStandardService.addRelation(curStandardNumber, replaceCode, 1);
lawsReplacedStandardService.removeRelation(replaceCode, 1);
lawsReplacedStandardService.addRelationOldSystemSync(standardNumber, replaceCode, 1);
});
}
entity.setSubstituteStandardNumber(null);
laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsReplacedStandardService.java
+7
View File
@@ -18,6 +18,13 @@ public interface ILawsReplacedStandardService extends IService<LawsReplacedStand
**/
void addRelation(String replaced, String replacedBy, Integer type);
/**
* @Author: liao
* @Date: 2023/9/19 11:03
* @Description: 添加代替标准关联（老法规导入专用）
**/
void addRelationOldSystemSync(String replaced, String replacedBy, Integer type);
/**
* @Author: liao
* @Date: 2023/9/19 11:07
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsReplacedStandardServiceImpl.java
+19
View File
@@ -61,6 +61,25 @@ public class LawsReplacedStandardServiceImpl extends ServiceImpl<LawsReplacedSta
}
}
@Override
public void addRelationOldSystemSync(String replaced, String replacedBy, Integer type) {
// 如果代替的标准为空
if (StringUtils.isBlank(replaced)) {
return;
}
// 添加新的关联
List<String> replacedList = Arrays.asList(replaced.split(","));
List<LawsReplacedStandard> replacedStandardList = new ArrayList<>();
replacedList.forEach(e -> {
LawsReplacedStandard replacedStandard = new LawsReplacedStandard();
replacedStandard.setReplaced(e);
replacedStandard.setReplacedBy(replacedBy);
replacedStandard.setType(type);
replacedStandardList.add(replacedStandard);
});
saveBatch(replacedStandardList);
}
/**
* @Author: liao
* @Date: 2023/9/19 11:08