From 824e6334fa8ed8b7882a6b8e16a5e4de1b0982bd Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期二, 26 九月 2023 16:32:38 +0800
Subject: [PATCH] 优化上海数据上报
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
index 155850e..ce60794 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -99,7 +99,7 @@
//鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤锛岃嫢涓嶅尮閰嶏紝鍒欐洿鏀逛笟鍔℃椂闂翠负鍗曟嵁鍙锋墍鍦ㄧ殑鏃堕棿
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
Date time = dateFormat.parse(sysData.getId().substring(2, 10));
- int numDay = DateUtil.difDay(sysData.getCompleteTime(), time);
+ int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getCompleteTime()), DateUtil.getCurZero(time));
if(numDay != 0){
sysData.setFullWeightTime(DateUtils.addDays(sysData.getFullWeightTime(), numDay));
sysData.setEmptyWeightTime(DateUtils.addDays(sysData.getEmptyWeightTime(), numDay));
@@ -151,7 +151,7 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
- if(sysData.getEmptyWeightTime().before(sysData.getRegisterTime())){
+ if(!sysData.getEmptyWeightTime().after(sysData.getRegisterTime())){
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
}
apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -160,7 +160,7 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
- if(sysData.getFullWeightTime().before(sysData.getEmptyWeightTime())){
+ if(!sysData.getFullWeightTime().after(sysData.getEmptyWeightTime())){
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
}
apiData.setMzjlsj(sysData.getFullWeightTime());
@@ -169,7 +169,7 @@
//鍑�閲�
apiData.setJz(sysData.getRecordWeight());
- if(sysData.getCompleteTime().before(sysData.getFullWeightTime())){
+ if(!sysData.getCompleteTime().after(sysData.getFullWeightTime())){
sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
}
apiData.setCmsj(sysData.getCompleteTime());
--
Gitblit v1.9.3