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

fix(asms): 标准性质判断

Browse Source
This commit is contained in:
yjz
2024-03-06 10:40:31 +08:00
parent 688c86b799
commit 757f412f9c
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java
+3 -13
View File
@@ -121,8 +121,6 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
private static SimpleDateFormat oldDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
@Value("#{'${standardProperty.recommend:}'.split(',')}")
private List<String> recommendList;
@Value("#{'${standardProperty.admittance:}'.split(',')}")
private List<String> admittanceList;
@@ -525,11 +523,9 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
"1695010513489833985", sysDictItemList);*/
lawsDomesticStandard.setStandardProperty("SN002");
// 标准性质判断
// if (Objects.equals("强制性", lawsAsmsDomestic.getStandardNature())){
// lawsDomesticStandard.setStandardProperty(judgeStandardProperty(lawsDomesticStandard.getStandardNumber()));
// }else {
// lawsDomesticStandard.setStandardProperty("SN002");
// }
if (Objects.equals("强制性", lawsAsmsDomestic.getStandardNature())){
lawsDomesticStandard.setStandardProperty(judgeStandardProperty(lawsDomesticStandard.getStandardNumber()));
}
// 标准状态
itemValues = getItemValues(lawsAsmsDomestic.getStandardStatus(),
"1695991936599715842", sysDictItemList);
@@ -855,12 +851,6 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
@Override
public String judgeStandardProperty(String standardNumber) {
for (String recommend : recommendList) {
// 推荐性判断
if (recommend.equals(standardNumber) || Pattern.matches(recommend, standardNumber)){
return "SN002";
}
}
for (String admittance : admittanceList) {
// 准入性判断
if (admittance.equals(standardNumber) || Pattern.matches(admittance, standardNumber)){
laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java
+4 -1
View File
@@ -241,8 +241,11 @@ public class SynchronizationAsmsService {
// 标准性质
/*itemValues = getItemValues(lawsAsmsDomestic.getStandardNature(),
"1695010513489833985", sysDictItemList);*/
// 标准性质判断
lawsDomesticStandard.setStandardProperty("SN002");
// 标准性质判断
if (Objects.equals("强制性", lawsAsmsDomestic.getStandardNature())){
lawsDomesticStandard.setStandardProperty(lawsAsmsOpenApiService.judgeStandardProperty(lawsDomesticStandard.getStandardNumber()));
}
// 标准状态
itemValues = getItemValues(lawsAsmsDomestic.getStandardStatus(),
"1695991936599715842", sysDictItemList);