Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/enums/CyclinderStatus.java

@@ -6,6 +6,7 @@ import lombok.Getter;
 public enum CyclinderStatus {
 
     NOHEGE("3139","不合格"),
+    NOT_UPLOAD("","未上传"),
     HEGE("3140","合格");
     private String code;
     private String name;

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/TzCylinderServiceImpl.java

@@ -183,8 +183,8 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 		}
 
 		for (TzCylinderFillingDto tzCylinderFillingDto : tzCylinderFillingDtoList) {
-			if (ValidationUtil.isEmpty(tzCylinderFillingDto.getTzCylinderAfterCheckDtoList())) { // 充装后复查记录没有默认不合格
-				tzCylinderFillingDto.setCheckResultsAfter(CyclinderStatus.NOHEGE.getName());
+			if (ValidationUtil.isEmpty(tzCylinderFillingDto.getTzCylinderAfterCheckDtoList())) { // 充装后复查记录没有默认未上传
+				tzCylinderFillingDto.setCheckResultsAfter(CyclinderStatus.NOT_UPLOAD.getName());
 			} else {
 				List<TzCylinderCheckDto> collect = tzCylinderFillingDto.getTzCylinderAfterCheckDtoList().stream().filter(dto -> dto.getResult().equals("0")).collect(Collectors.toList());
 				if (collect.size() != 0) {