Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz5

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;
     /**
      * 自定义字段
      */

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());

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);
                     }
                 }
                 // 设置编号