From 89cb4ea9adbf4578cceb379b58f36d0ac2d05095 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期一, 25 九月 2023 20:25:06 +0800
Subject: [PATCH] 优化上海数据上报

---
 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
index 2583529..37544c8 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -5,6 +5,7 @@
 import com.fzzy.api.service.ApiCommonService;
 import com.fzzy.api.service.ApiTriggerService;
 import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.utils.DateUtil;
 import com.fzzy.api.view.repository.Api1202Rep;
 import com.fzzy.api.view.repository.Api1203Rep;
 import com.fzzy.api.view.repository.ApiLogRep;
@@ -20,6 +21,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -113,7 +115,16 @@
                 if(null == sysData.getFullWeightTime()){
                     sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
                 }
-                apiData.setQysj(sysData.getFullWeightTime());
+
+                //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤锛岃嫢涓嶅尮閰嶏紝鍒欐洿鏀逛笟鍔℃椂闂翠负鍗曟嵁鍙锋墍鍦ㄧ殑鏃堕棿
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
+                Date time = dateFormat.parse(apiData.getRkjydh().substring(2, 8));
+                int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getRegisterTime()), DateUtil.getCurZero(time));
+                if(numDay != 0){
+                    sysData.setRegisterTime(DateUtils.addDays(sysData.getRegisterTime(), numDay));
+                }
+
+                apiData.setQysj(sysData.getRegisterTime());
                 apiData.setQyrxm(sysData.getCheckUser());
                 //鎵︽牱鏂瑰紡 2-鏅鸿兘闅忔満
                 apiData.setQyfs("2");
@@ -149,7 +160,7 @@
                     apiData.setJyjg("1");
                 }
                 apiData.setJyrxm(sysData.getCheckUser());
-                apiData.setJysj(DateUtils.addMinutes(sysData.getFullWeightTime(), 5));
+                apiData.setJysj(DateUtils.addMinutes(sysData.getRegisterTime(), 90));
 
                 //绮鍝佺
                 String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());

--
Gitblit v1.9.3