From 688c86b79945850483d2a7e34dd1b4448cac7295 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 6 Mar 2024 09:55:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(asms):=20=E4=BF=AE=E6=94=B9=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asms/service/impl/LawsAsmsOpenApiServiceImpl.java |  7 ++++++-
 .../asms/service/impl/SynchronizationAsmsService.java | 11 ++++++++---
 2 files changed, 14 insertions(+), 4 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 e69925f5..8408db28 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
@@ -523,8 +523,13 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
 					// 标准性质
                     /*itemValues = getItemValues(lawsAsmsDomestic.getStandardNature(),
 							"1695010513489833985", sysDictItemList);*/
+					lawsDomesticStandard.setStandardProperty("SN002");
 					// 标准性质判断
-					lawsDomesticStandard.setStandardProperty(judgeStandardProperty(lawsDomesticStandard.getStandardNumber()));
+//					if (Objects.equals("强制性", lawsAsmsDomestic.getStandardNature())){
+//						lawsDomesticStandard.setStandardProperty(judgeStandardProperty(lawsDomesticStandard.getStandardNumber()));
+//					}else {
+//						lawsDomesticStandard.setStandardProperty("SN002");
+//					}
 					// 标准状态
 					itemValues = getItemValues(lawsAsmsDomestic.getStandardStatus(),
 							"1695991936599715842", sysDictItemList);
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 15ed36eb..eac2752d 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
@@ -140,12 +140,17 @@ public class SynchronizationAsmsService {
         } else {
             dupCodeList = new ArrayList<>();
         }
-
+        // TODO:过滤数据测试用
+        mapList = mapList.stream().filter(v -> v.get("createTime").substring(0, 10).equals("2024-02-22")).collect(Collectors.toList());
         List<LawsAsmsDomestic> lawsAsmsDomesticList = new ArrayList();
         mapList.forEach(eMap -> {
             String createTimeString = eMap.get("createTime");
             Date createTime = DateUtil.getDateSecond(createTimeString);
-            Date yesterday = DateUtil.getDateAddDays(new Date(), -1);
+//            Date yesterday = DateUtil.getDateAddDays(new Date(), -1);
+            Calendar instance = Calendar.getInstance();
+            // TODO:过滤数据测试用
+            instance.set(2024,1,23);
+            Date yesterday = DateUtil.getDateAddDays(instance.getTime(), -1);
             // 创建时间为昨天的数据
             if (createTime.after(DateUtil.getDayStart(yesterday)) && createTime.before(DateUtil.getDayEnd(yesterday))) {
                 if (!dupCodeList.contains((String) eMap.get("code"))) {
@@ -237,7 +242,7 @@ public class SynchronizationAsmsService {
                     /*itemValues = getItemValues(lawsAsmsDomestic.getStandardNature(),
 							"1695010513489833985", sysDictItemList);*/
             // 标准性质判断
-            lawsDomesticStandard.setStandardProperty(lawsAsmsOpenApiService.judgeStandardProperty(lawsDomesticStandard.getStandardNumber()));
+            lawsDomesticStandard.setStandardProperty("SN002");
             // 标准状态
             itemValues = getItemValues(lawsAsmsDomestic.getStandardStatus(),
                     "1695991936599715842", sysDictItemList);