修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourcePoolDto.java

@@ -63,10 +63,10 @@ public class WaterResourcePoolDto  extends BaseDto {
     private String recUserName;
 
    @ApiModelProperty(value = "最低报警水位（m）")
-   private float minWaterLevel;
+   private Float minWaterLevel;
 
    @ApiModelProperty(value = "最高报警水位（m）")
-   private float maxWaterLevel;
+   private Float maxWaterLevel;
 
    @ApiModelProperty("水池液位显示装置id")
    private String levelDeviceId;

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -3136,7 +3136,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			if (map1.containsKey(fieldCode.substring(0,fieldCode.length()-4))){
 				dynamicFormInstance.setFieldValueLabel(map1.get(fieldCode.substring(0,fieldCode.length()-4)).toString());
 			}
-
+			// 动态表单存在默认值
+			if ("birthdayTime".equals(dynamicFormInstance.getFieldCode()) && ObjectUtils.isEmpty(peopleInfoDto.getFirefighters().getBirthdayTime())){
+				dynamicFormInstance.setFieldValue(null);
+			}
 			dynamicFormInstancelist.add(dynamicFormInstance);
 		});
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceServiceImpl.java

@@ -171,6 +171,7 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
                     waterResourceNaturalService.createWithModel(waterResourceNaturalDto);
                     break;
                 case "industryPool":
+                case "waterTank":
                 case "pool":
                     // 新增基础信息
                     model.setIsIot(true);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -787,6 +787,12 @@ public class ExcelServiceImpl {
 				List<DynamicFormInstance> dynamicFormInstancelist = new ArrayList<>();
 
 				dynamicFormColumn.forEach(DynamicFormInitDto -> {
+					// 动态标题存在默认值
+					if ("birthdayTime".equals(DynamicFormInitDto.getKey())) {
+						DynamicFormInstanceDto formItemDescr = DynamicFormInitDto.getFormItemDescr();
+						formItemDescr.setFieldValue(null);
+						DynamicFormInitDto.setFormItemDescr(formItemDescr);
+					}
 					dynamicFormValue.add(DynamicFormInitDto.getFormItemDescr());
 				});
 				dynamicFormValue.forEach(dynamicFormInstanceDto -> {