From 20517eaaaabec9f20f6e77a1254438e59f4001f5 Mon Sep 17 00:00:00 2001
From: 18792927508 <1322446236@qq.com>
Date: Thu, 28 Dec 2023 10:30:45 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/wisdomarbitrate/domain/CaseApplication.java |  2 +-
 .../service/impl/CaseApplicationServiceImpl.java      | 11 +++--------
 .../service/impl/CaseZipImportImpl.java               |  6 +++---
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
index b07f7f4..8239489 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
@@ -407,7 +407,7 @@ public class CaseApplication  extends BaseEntity {
     /**
      * 批号
      */
-    private String batchNumber;
+    private Integer batchNumber;
     /**
      * 自定义字段
      */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
index adb6beb..841a87e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
@@ -987,14 +987,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         String caseNum = generateCaseNum();
         caseApplication.setCaseNum(caseNum);
         // 设置批号
-        if(StrUtil.isEmpty(caseApplication.getBatchNumber())){
-            Integer maxBatchNumber = caseApplicationMapper.selectBatchNumberLike();
-            if(maxBatchNumber==null){
-                caseApplication.setBatchNumber("1");
-            }else {
-                caseApplication.setBatchNumber(maxBatchNumber+1+"");
-            }
-        }
+
+        caseApplication.setBatchNumber(0);
+
         caseApplication.setCreateBy(getUsername());
         caseApplication.setVersion(1);
         caseApplication.setId(IdWorkerUtil.getId());
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java
index 2c5fd94..9eb1fe4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java
@@ -248,14 +248,14 @@ public class CaseZipImportImpl {
                 caseApplication.setCaseAppliId(caseApplication.getId());
 
                 // 设置批号
-                if (StrUtil.isEmpty(caseApplication.getBatchNumber())) {
+                if (caseApplication.getBatchNumber()==null) {
                     maxBatchNumber = caseApplicationMapper.selectBatchNumberLike();
                     if (maxBatchNumber == null) {
                         maxBatchNumber = 1;
-                        caseApplication.setBatchNumber(maxBatchNumber.toString());
+                        caseApplication.setBatchNumber(maxBatchNumber);
                     } else {
                         maxBatchNumber = maxBatchNumber + 1;
-                        caseApplication.setBatchNumber(maxBatchNumber.toString());
+                        caseApplication.setBatchNumber(maxBatchNumber);
                     }
                 }
                 // 设置编号
-- 
2.54.0