From 12c99c99ed89d1d11318d9b4c6c295d35e21b1e7 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 20 八月 2025 18:30:00 +0800
Subject: [PATCH] 调整船运质检单号
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1403.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1403.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1403.java
index ad4e506..db4d03d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1403.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1403.java
@@ -1,16 +1,16 @@
package com.fzzy.async.fzzy40.impl;
import com.fzzy.api.Constant;
-import com.fzzy.api.entity.Api1101;
-import com.fzzy.api.entity.Api1403;
-import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.entity.*;
import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.utils.FileUtils;
import com.fzzy.api.view.repository.Api1101Rep;
import com.fzzy.api.view.repository.Api1403Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutPlan;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1403Rep;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Date;
@@ -28,6 +28,8 @@
@Autowired
private Fzzy40Sync1403Rep fzzy40Sync1403Rep;
+ @Autowired
+ private FileUtils fileUtil;
@Autowired
private Api1101Rep api1101Rep;
@Autowired
@@ -53,7 +55,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40InoutPlan> list = fzzy40Sync1403Rep.findDate("3", start, end);
+ List<Fz40InoutPlan> list = fzzy40Sync1403Rep.findDateByTime(deptId, start, end);
if (null == list || list.isEmpty()) {
return;
}
@@ -70,18 +72,28 @@
api1403.setKszxrq(fz35Plan.getBeginTime());
api1403.setJzzxrq(fz35Plan.getEndTime());
api1101List = api1101Rep.findPushData(kqdm);
- if(null != api1101List && api1101List.size() > 0){
+ if (null != api1101List && api1101List.size() > 0) {
api1403.setJhxddw(api1101List.get(0).getDwdm());
}
api1403.setJhxdsj(fz35Plan.getCreateTime());
+ api1403.setManageWay("1"); //榛樿鐩村偍
+ api1403.setRotationType("1"); //榛樿闈欐�佽疆鎹�
+
+ //鑻ラ檮浠秈d涓嶄负绌猴紝鍒欏垽鏂槸鍚︿负骞夸笢鐪佸钩鍙板崗璁紝骞夸笢鐪佸钩鍙板崗璁椂锛岄渶鍚屾椂鍚屾璁″垝闄勪欢淇℃伅
+ if (StringUtils.isNotEmpty(fz35Plan.getFileId())) {
+ //鏂囦欢璺緞
+ api1403.setWjdz(fileUtil.getCommonFilePath(fz35Plan.getFileTime()) + fz35Plan.getFileId());
+ //鏂囦欢鍚嶇О
+ api1403.setFileName(fz35Plan.getFileName());
+ }
api1403.setZhgxsj(new Date());
api1403.setKqdm(kqdm);
api1403.setBizId(fz35Plan.getId());
api1403List = api1403Rep.getDataByLhjhdh(api1403.getLhjhdh());
- if(null == api1403List || api1403List.isEmpty()){
+ if (null == api1403List || api1403List.isEmpty()) {
api1403.setCzbz(Constant.CZBZ_I);
- }else {
+ } else {
api1403.setCzbz(api1403List.get(0).getCzbz());
}
api1403Rep.save(api1403);
--
Gitblit v1.9.3