From 757f412f9cfda99756aecf0bd6191871941405b9 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 6 Mar 2024 10:40:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(asms):=20=E6=A0=87=E5=87=86=E6=80=A7?=
 =?UTF-8?q?=E8=B4=A8=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsAsmsOpenApiServiceImpl.java | 16 +++-------------
 .../service/impl/SynchronizationAsmsService.java |  5 ++++-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java
index 8408db28..a70ac1cc 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java
@@ -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)){
diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java
index eac2752d..85845232 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java
@@ -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);