试验编号bug

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialNumberRuleServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.business.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -127,6 +128,11 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                 String currentMonthStr = String.format("%02d", currentMonthValue);
                 trialNumber.append(currentMonthStr);
             } else if (rule.getRule()==6) {
+                if(StringUtils.isEmpty(rule.getData())){
+                    trialNumber.append("");
+                    map.put("autoIncrementNumber","");
+                    continue;
+                }
                 if(rule.getIsAutoIncrement()!=null&&rule.getIsAutoIncrement()==1){
                     String autoIncrementNumber="";
                     //如果是需要自增的 先要查出当前数据库中自增编号的最大值
@@ -138,7 +144,11 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                             return rule.getData();
                         }
                     });
-                    autoIncrementNumber=incrementFormattedNumberWithCheck(maxNumber);
+                    if(maxNumber.equals(rule.getData())){
+                        autoIncrementNumber=maxNumber;
+                    }else {
+                        autoIncrementNumber=incrementFormattedNumberWithCheck(maxNumber);
+                    }
 //
 //                    String sql4="select auto_increment_number FROM u_trial_auto_number where type="+type+" and contract_id="+contractId+" and is_deleted=0  ORDER BY auto_increment_number ASC";
 //                    List<String> autoNumbers = jdbcTemplate.query(sql4, new SingleColumnRowMapper<>(String.class));

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/TableFileController.java

@@ -42,6 +42,7 @@ import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.manager.service.IExcelTabService;
 import org.springblade.manager.service.IWbsTreeContractService;
 import org.springblade.manager.service.IWbsTreePrivateService;
+import org.springblade.manager.vo.AppWbsTreeContractVO;
 import org.springblade.manager.vo.ExcelTabVO;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -282,11 +283,16 @@ public class TableFileController extends BladeController {
     @PostMapping("/sort")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "附件排序", notes = "传入listids")
-    public R sort(@RequestBody List<TableFile> list){
-        int i=1;
-        for (TableFile file : list) {
-            file.setSort(i++);
+    public R sort(@RequestBody List<AppWbsTreeContractVO> list){
+        for (AppWbsTreeContractVO vo : list) {
+            List<TableFile> fileList = vo.getFileList();
+            int i=1;
+            for (TableFile file : fileList) {
+                file.setSort(i++);
+            }
+            tableFileService.updateBatchById(fileList);
         }
-      return R.status(tableFileService.updateBatchById(list));
+
+      return R.status(true);
     }
 }