From bf055224492ed78cf937bc94cfe7c33885f86989 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 05 六月 2023 22:38:03 +0800
Subject: [PATCH] 优化嘉定纪委接口5
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 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 2277270..f383d4b 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -1,10 +1,7 @@
package com.fzzy.async.fzzy35.impl;
import com.fzzy.api.Constant;
-import com.fzzy.api.entity.Api1105;
-import com.fzzy.api.entity.Api1203;
-import com.fzzy.api.entity.ApiLog;
-import com.fzzy.api.entity.GbCheckItem;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
@@ -16,6 +13,8 @@
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1203Rep;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -86,10 +85,18 @@
String jyz;
String zkj;
String zkl;
+ List<Api1203> api1203List;
for (Fz35InoutRecord sysData : list) {
+ if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+ sysData.setRecordWeight(sysData.getSettleWeight());
+ }
+ //鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
+ if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+ continue;
+ }
//鑾峰彇鍏ュ簱璐ㄦ淇℃伅
- fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId());
+ fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId(), deptId.substring(0, 4));
if (null == fz35CheckItems || fz35CheckItems.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒板綋鍓嶅叆搴撹川妫�淇℃伅--------------");
continue;
@@ -102,13 +109,15 @@
}
apiData = new Api1203();
- apiData.setId(sysData.getId());
apiData.setRkjydh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
apiData.setRkywdh(apiData.getRkjydh());
+ if(null == sysData.getFullWeightTime()){
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
+ }
apiData.setQysj(sysData.getFullWeightTime());
apiData.setQyrxm(sysData.getCheckUser());
//鎵︽牱鏂瑰紡 2-鏅鸿兘闅忔満
@@ -125,20 +134,27 @@
if (gbCheckList == null || gbCheckList.isEmpty()) {
continue;
}
+ if (StringUtils.isEmpty(fz35CheckItem.getValue())) {
+ continue;
+ }
jyxm += gbCheckList.get(0).getCode() + ",";
jyz += fz35CheckItem.getValue() + ",";
- zkj += "0,";
- zkl += "0,";
+ zkj += ",0.0";
+ zkl += ",0.0";
}
apiData.setJyxm(jyxm);
apiData.setJyz(jyz);
- apiData.setZkj(zkj);
- apiData.setZkl(zkl);
- apiData.setJyjg("0");
+ apiData.setZkj(zkj.substring(1));
+ apiData.setZkl(zkl.substring(1));
+ if("UNPASS".equals(sysData.getCheckStatus())){
+ apiData.setJyjg("0");
+ }
+ if("PASS".equals(sysData.getCheckStatus())){
+ apiData.setJyjg("1");
+ }
apiData.setJyrxm(sysData.getCheckUser());
- apiData.setJysj(sysData.getFullWeightTime());
- //apiData.setJyjg("");
+ apiData.setJysj(DateUtils.addMinutes(sysData.getFullWeightTime(), 5));
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
@@ -149,7 +165,6 @@
apiData.setLsdd(mappingCode);
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setCzbz(Constant.CZBZ_I);
apiData.setZhgxsj(sysData.getCompleteTime());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
@@ -157,6 +172,13 @@
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
+ api1203List = api1203Rep.getDataById(apiData.getRkjydh());
+ if(null == api1203List || api1203List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1203List.get(0).getCzbz());
+ }
+
//淇濆瓨鏁版嵁
api1203Rep.save(apiData);
log.info("1203---鍚屾鏁版嵁锛歿}", apiData.toString());
--
Gitblit v1.9.3