Przeglądaj źródła

试验编号优化

chenr 1 miesiąc temu
rodzic
commit
5368c5662a

+ 1 - 1
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialMaterialMobilizationServiceImpl.java

@@ -97,7 +97,7 @@ public class TrialMaterialMobilizationServiceImpl extends BaseServiceImpl<TrialM
         }
         obj.setUserId(SecureUtil.getUserId());
         this.saveOrUpdate(obj);
-        if(obj.getAutoIncrementNumber()!=null){
+        if(StringUtils.isNotEmpty(obj.getAutoIncrementNumber())){
             if(obj.getTrialAutoNumber().equals(obj.getMaterialNumber())){
                 trialNumberRuleService.checkSave(obj.getContractId(), 1, obj.getId(), obj.getAutoIncrementNumber());
             }

+ 1 - 1
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSampleInfoServiceImpl.java

@@ -148,7 +148,7 @@ public class TrialSampleInfoServiceImpl extends BaseServiceImpl<TrialSampleInfoM
                 trialSampleInfo.setRepresentativeCount("0");
             }
             this.saveOrUpdate(trialSampleInfo);
-            if(obj.getAutoIncrementNumber()!=null){
+            if(StringUtils.isNotEmpty(obj.getAutoIncrementNumber())){
                 if(obj.getTrialAutoNumber().equals(obj.getSpecificationNumber())){
                     trialNumberRuleService.checkSave(obj.getContractId(), 2, obj.getId(), obj.getAutoIncrementNumber());
                 }

+ 1 - 1
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSelfInspectionRecordServiceImpl.java

@@ -1124,7 +1124,7 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
             jdbcTemplate.update("update u_entrust_info set sample_status=4 where id ='"+dto.getEntrustId()+"'");
         }
         String[] strings = dto.getTableType().split(",");
-        if(dto.getRecordAutoNumber()!=null||dto.getReportAutoNumber()!=null){
+        if(StringUtils.isNotEmpty(dto.getRecordAutoNumber())||StringUtils.isNotEmpty(dto.getReportAutoNumber())){
             if (dto.getOldRecordNumber()!=null&&dto.getOldRecordNumber().equals(dto.getRecordNo())||dto.getOldReportNumber()!=null&&dto.getOldReportNumber().equals(dto.getReportNo())) {
                 if(strings.length==1){
                     if(strings[0].equals("1")){