From be5373a650a8a40e808ab1664e59c60807809a7c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期日, 21 十二月 2025 08:50:58 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java b/src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java
index 1ce2a78..08408e1 100644
--- a/src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java
+++ b/src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java
@@ -12,6 +12,8 @@
import com.zy.asrs.entity.ReviewDetl;
import com.zy.asrs.service.ReviewDetlService;
import com.zy.asrs.service.ReviewService;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.PlatformTransactionManager;
@@ -48,15 +50,18 @@
private final Long userId;
private TransactionStatus transactionStatus;
+ private ConfigService configService;
+
/**
* 濡傛灉浣跨敤浜唖pring,璇蜂娇鐢ㄨ繖涓瀯閫犳柟娉曘�傛瘡娆″垱寤篖istener鐨勬椂鍊欓渶瑕佹妸spring绠＄悊鐨勭被浼犺繘鏉�
*/
- public ImportReviewListener(PlatformTransactionManager transactionManager, ReviewService reviewService, ReviewDetlService reviewDetlService, SnowflakeIdWorker snowflakeIdWorker, Long userId) {
+ public ImportReviewListener(ConfigService configService, PlatformTransactionManager transactionManager, ReviewService reviewService, ReviewDetlService reviewDetlService, SnowflakeIdWorker snowflakeIdWorker, Long userId) {
this.transactionManager = transactionManager;
this.reviewService = reviewService;
this.reviewDetlService = reviewDetlService;
this.snowflakeIdWorker = snowflakeIdWorker;
this.userId = userId;
+ this.configService = configService;
}
private Set<String> uniquePackNos = new HashSet<>(); // 鐢ㄤ簬鍘婚噸鍖呰缁勫彿
@@ -82,13 +87,20 @@
// 棣栨鍑虹幇锛岃褰曞苟澶勭悊
uniquePackNos.add(data.getColumn1());
+ String orderNo = "";
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "orderNo"));
+ if (config != null && config.getStatus() == 1 && config.getValue() != null) {
+ orderNo = config.getValue();
+ }
+
String time = DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F);
Review review = reviewService.selectOne(new EntityWrapper<Review>().eq("order_no", data.getColumn1()));
if (review == null) {
review = new Review();
review.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
- review.setOrderNo(data.getColumn1());
+ review.setOrderNo(orderNo + data.getColumn1());
review.setOrderTime(time);
+ review.setDefNumber("Excel瀵煎叆");
review.setSettle(1L);
review.setStatus(1);
review.setCreateBy(userId);
--
Gitblit v1.9.1