新增试验编号bug

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialDetectionController.java

@@ -683,12 +683,12 @@ public class TrialDetectionController extends BladeController {
         if (vo.getRecordNo() == null) {
             Map<String, String> map = trialNumberRuleService.getTrialNumber(projectId, contractId, 4, nodeId, true);
             vo.setRecordNo(map.get("trialNumber"));
-            vo.setRecordAutoNumber(map.get("trialAutoNumber"));
+            vo.setRecordAutoNumber(map.get("autoIncrementNumber"));
         }
         if (vo.getReportNo() == null) {
             Map<String, String> map = trialNumberRuleService.getTrialNumber(projectId, contractId, 5, nodeId, true);
             vo.setReportNo(map.get("trialNumber"));
-            vo.setReportAutoNumber(map.get("trialAutoNumber"));
+            vo.setReportAutoNumber(map.get("autoIncrementNumber"));
         }
         List<TrialSeleInspectionRecordInfoDTO.StandardVo> mapList = jdbcTemplate.query("SELECT id,name from u_wbs_private_standard WHERE type = 2 and is_deleted = 0  and private_id = " + nodeId,
                 new BeanPropertyRowMapper<>(TrialSeleInspectionRecordInfoDTO.StandardVo.class));

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

@@ -90,6 +90,7 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
              rules = baseMapper.selectList(Wrappers.<TrialNumberRule>query().lambda().eq(TrialNumberRule::getContractId, contractId).eq(TrialNumberRule::getType, type).eq(TrialNumberRule::getStatus,2).orderByAsc(TrialNumberRule::getSort));
         }
         boolean flag=true;
+        boolean flag1=true;
         int i=1;
         do {
             for (TrialNumberRule rule : rules) {
@@ -153,6 +154,7 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                         });
                         if(StringUtils.isEmpty(maxNumber)){
                             autoIncrementNumber=rule.getData();
+                            flag1=false;
                         }else {
                             autoIncrementNumber=incrementFormattedNumberWithCheck(maxNumber,i);
                         }
@@ -203,10 +205,12 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                 }
             }
             if(isSaveRedis){
-                flag=checkTrialNumberIsExist(trialNumber.toString(),type,contractId);
-                i++;
-                if(!flag){
-                    trialNumber.setLength(0);
+                if(flag1){
+                    flag=checkTrialNumberIsExist(trialNumber.toString(),type,contractId);
+                    i++;
+                    if(!flag){
+                        trialNumber.setLength(0);
+                    }
                 }
             }
         }while (!flag);