From 2d036d97788c6a489d573386da4a1534e20bed99 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 03 十一月 2023 09:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
index 4ebdc94..390f915 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
@@ -4,25 +4,22 @@
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.view.repository.Api1305Rep;
import com.fzzy.api.view.repository.Api1306Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy40.entity.Fz40AreationData;
import com.fzzy.async.fzzy40.entity.Fz40DrugLog;
-import com.fzzy.async.fzzy40.repository.Fzzy40Sync1305Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1306Rep;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.Date;
import java.util.List;
/**
* 鐔忚捀浣滀笟鏁版嵁鍚屾
*
- * @author chen
+ * @author czt
* @date 2022-09-08 09:51
*/
@Slf4j
@@ -46,7 +43,7 @@
* @param start 璧峰鏃堕棿
* @param end 鎴鏃堕棿
*/
- public void syncData(String deptId, Date start, Date end) {
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
log.info("-------------1306鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
//鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
ApiLog apiLog = new ApiLog();
@@ -75,8 +72,8 @@
api1306 = new Api1306();
BeanUtils.copyProperties(fz40DrugLog, api1306);
- api1306.setXzzydh(fz40DrugLog.getId());
- api1306.setCfdm(fz40DrugLog.getDepotId());
+ api1306.setXzzydh(api1105.getHwdm().substring(0,25) + fz40DrugLog.getId());
+ api1306.setCfdm(api1105.getHwdm().substring(0,25));
api1306.setXzkssj(fz40DrugLog.getStart());
api1306.setXzjssj(fz40DrugLog.getEnd());
api1306.setHcjcdh(fz40DrugLog.getPestBatchId());
@@ -87,6 +84,7 @@
api1306.setNd(fz40DrugLog.getConcentration());
api1306.setLddwyyl(fz40DrugLog.getGrainDose());
api1306.setKjdwyyl(fz40DrugLog.getSpaceDose());
+ api1306.setSyff(StringUtils.isEmpty(fz40DrugLog.getSyff())?"0":fz40DrugLog.getSyff());
api1306.setZyyl(fz40DrugLog.getDose());
api1306.setSqrq(fz40DrugLog.getVentilateTime());
api1306.setSqff(fz40DrugLog.getVentilateMethod());
@@ -94,10 +92,13 @@
api1306.setXzxgpj(fz40DrugLog.getEvaluate());
api1306.setZhgxsj(fz40DrugLog.getUpdateTime());
+ api1306.setHwdm(api1105.getHwdm());
+ api1306.setKqdm(kqdm);
+ api1306.setBizId(fz40DrugLog.getId());
api1306List = api1306Rep.getDataById(api1306.getXzzydh());
- if(null == api1306List || api1306List.isEmpty()){
+ if (null == api1306List || api1306List.isEmpty()) {
api1306.setCzbz(Constant.CZBZ_I);
- }else {
+ } else {
api1306.setCzbz(api1306List.get(0).getCzbz());
}
--
Gitblit v1.9.3