修改bug

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

@@ -143,7 +143,7 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "水源可用状态类别代码")
     private String statusCode;
 
-    @ExplicitConstraint(type = "SYKYZT", indexNum = 12, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "SYZT", indexNum = 12, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "水源可用状态", index = 12)
     @ApiModelProperty(value = "水源可用状态类别名称")
     private String status;
@@ -160,7 +160,7 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "消防给水管网形式类型代码")
     private String pipeTypeCode;
 
-    @ExplicitConstraint(type = "XFJSGWXS", indexNum = 15, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "XFJSGW", indexNum = 15, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "消防给水管网形式", index = 15)
     @ApiModelProperty(value = "消防给水管网形式")
     private String pipeTypeName;
@@ -254,11 +254,19 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "四季变化简要情况")
     private String seasonChangeInfo;
 
-    @ExplicitConstraint(indexNum = 32, source = {"1", "0"}) //固定下拉内容
-    @ExcelProperty(value = "有无枯水期", index = 32)
+//    @ExplicitConstraint(indexNum = 32, source = {"0", "1"}) //固定下拉内容
+//    @ExcelProperty(value = "有无枯水期", index = 32)
+    @ExcelIgnore
     @ApiModelProperty(value = "有无枯水期")
     private Boolean hasDrySeason;
 
+    @ExplicitConstraint(indexNum = 32, source = {"有", "无"}) //固定下拉内容
+    @ExcelProperty(value = "有无枯水期", index = 32)
+    @ApiModelProperty(value = "有无枯水期")
+    private Boolean hasDrySeasonType;
+
+
+
     @ExcelProperty(value = "枯水期跨度简要情况", index = 33)
     @ApiModelProperty(value = "枯水期跨度简要情况")
     private String dryPeriodSpan;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

@@ -17,6 +17,8 @@
                r.contact_user,
                r.contact_phone,
                r.equip_name,
+               r.longitude,
+               r.latitude,
 			   r.equip_category_name,
 			   r.equip_code,
 			   r.maintenance_period,
@@ -45,6 +47,7 @@
                rn.quality_situation_info,
                rn.season_change_info,
                rn.has_dry_season,
+               (case r.has_dry_season when 0 then '有' when 1 then '无' end) hasDrySeasonType,
                rn.dry_period_span,
                rp.intake_height,
                rp.elevation_difference,

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

@@ -832,6 +832,10 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
 				item.setEquipCategoryId(Long.parseLong(equipCategory[1]));
 			}
 
+			if (item.getHasDrySeasonType() != null) {
+				boolean flag=  "有".equals(item.getHasDrySeasonType())?true:false;
+				item.setHasDrySeason(flag);
+			}
 			if (item.getEquipName() != null) {
 				String[] equipCategory = item.getEquipName().split("@");
 				item.setEquipId(Long.parseLong(equipCategory[1]));