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

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

@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
 import io.swagger.annotations.ApiModel;
@@ -13,10 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.util.ObjectUtils;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author system_generator
+ * @date 2021-06-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "WaterResourceDto", description = "水资源")
+public class WaterResourceForExportDto extends BaseDto {
+	@ExcelIgnore
+	@ApiModelProperty(value = "机构/部门名称")
+	private String bizOrgName;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "机构编码")
+	private String bizOrgCode;
+
+	@ExcelIgnore
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty(value = "名称", index = 0)
+	@ApiModelProperty(value = "资源名称")
+	private String name;
+
+	@ExcelProperty(value = "地址", index = 1)
+	@ApiModelProperty(value = "地址")
+	private String address;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "资源类型（消火栓：hydrant、消防水鹤：crane、天然水源：natural、消防水池：pool）")
+	private String resourceType;
+
+	@ExplicitConstraint(type = "XFSYLX", indexNum = 2, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
+	@ExcelProperty(value = "资源类型", index = 2)
+	@ApiModelProperty(value = "资源类型名称（消火栓、消防水鹤、天然水源、消防水池）")
+	private String resourceTypeName;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "所在建筑id")
+	private Long belongBuildingId;
+
+	@ExplicitConstraint(indexNum = 3, sourceClass = CommonExplicitConstraint.class, method = "getWaterBuildingList")
+	@ExcelProperty(value = "所在建筑", index = 3)
+	@ApiModelProperty(value = "所在建筑")
+	private String belongBuilding;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "所属消防系统id")
+	private Long belongFightingSystemId;
+
+	@ExplicitConstraint(indexNum = 4, sourceClass = CommonExplicitConstraint.class, method = "getFireSystemList")
+	@ExcelProperty(value = "所属消防系统", index = 4)
+	@ApiModelProperty(value = "所属消防系统")
+	private String belongFightingSystem;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "管理单位id")
+	private Long managementUnitId;
+
+	@ExplicitConstraint(indexNum = 9, sourceClass = CommonExplicitConstraint.class, method = "getWaterCompanyList")
+	@ExcelProperty(value = "管理单位", index = 9)
+	@ApiModelProperty(value = "管理单位")
+	private String managementUnit;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "维保单位id")
+	private Long maintenanceUnitId;
+
+	@ExplicitConstraint(indexNum = 10, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
+	@ExcelProperty(value = "维保单位", index = 10)
+	@ApiModelProperty(value = "维保单位")
+	private String maintenanceUnit;
+
+	@ExcelProperty(value = "建造日期", index = 7)
+	@ApiModelProperty(value = "建造日期")
+	private String buildDate;
+
+	@ExcelProperty(value = "启用日期", index = 8)
+	@ApiModelProperty(value = "启用日期")
+	private String enableDate;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "方位图集合")
+	private List<Object> orientationImgList;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "实景图集合")
+	private List<Object> realityImgList;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "方位图")
+	private String orientationImg;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "实景图")
+	private String realityImg;
+
+	@ExplicitConstraint(indexNum = 38, sourceClass = CommonExplicitConstraint.class, method = "getContactUser")
+	@ExcelProperty(value = "联系人姓名", index = 38)
+	@ApiModelProperty(value = "联系人姓名")
+	private String contactUser;
+
+	/**
+	 * 联系人姓名id
+	 */
+	@ExcelIgnore
+	@TableField("contact_user_id")
+	private String contactUserId;
+
+	@ExcelProperty(value = "联系人电话", index = 39)
+	@ApiModelProperty(value = "联系人电话")
+	private String contactPhone;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "是否有物联参数（1有，0没有）")
+	private Boolean isIot;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "消防救援机构_通用唯一识别码")
+	private String rescueOrgCode;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "行政区划代码")
+	private String administrativeCode;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "更新人员")
+	private String recUserName;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "组织机构代码")
+	private String orgCode;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "资源id")
+	private Long resourceId;
+
+	@ExcelProperty(value = "高度（cm）", index = 11)
+	@ApiModelProperty(value = "高度（cm）")
+	private Float height;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "水源可用状态类别代码")
+	private String statusCode;
+
+	@ExplicitConstraint(type = "SYZT", indexNum = 12, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
+	@ExcelProperty(value = "水源可用状态", index = 12)
+	@ApiModelProperty(value = "水源可用状态类别名称")
+	private String status;
+
+	@ExcelProperty(value = "所属路段", index = 13)
+	@ApiModelProperty(value = "所属路段")
+	private String section;
+
+	@ExcelProperty(value = "所属管网", index = 14)
+	@ApiModelProperty(value = "所属管网")
+	private String pipeNetwork;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "消防给水管网形式类型代码")
+	private String pipeTypeCode;
+
+	@ExplicitConstraint(type = "XFJSGW", indexNum = 15, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
+	@ExcelProperty(value = "消防给水管网形式", index = 15)
+	@ApiModelProperty(value = "消防给水管网形式")
+	private String pipeTypeName;
+
+	@ExcelProperty(value = "管网直径（cm）", index = 16)
+	@ApiModelProperty(value = "管网直径（cm）")
+	private Float pipeDiameter;
+
+	@ExcelProperty(value = "进水管直径(cm)", index = 17)
+	@ApiModelProperty(value = "进水管直径(cm)")
+	private Float inletPipeDiameter;
+
+	@ExcelProperty(value = "出水管直径(cm)", index = 18)
+	@ApiModelProperty(value = "出水管直径(cm)")
+	private Float outletPipeDiameter;
+
+	@ExcelProperty(value = "加水车道数量(个)", index = 19)
+	@ApiModelProperty(value = "加水车道数量(个)")
+	private Integer waterfillingLaneNum;
+
+	@ExcelProperty(value = "供水单位名称", index = 20)
+	@ApiModelProperty(value = "供水单位名称")
+	private String waterSupplyName;
+
+	@ExplicitConstraint(type = "XHSXTLX", indexNum = 21, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
+	@ExcelProperty(value = "消火栓系统类型", index = 21)
+	@ApiModelProperty(value = "消火栓系统类型")
+	private String systemType;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "消火栓系统类型code")
+	private String systemTypeCode;
+
+	@ExcelProperty(value = "消防设施状况", index = 22)
+	@ApiModelProperty(value = "消防设施状况分类")
+	private String facilitiesCategory;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "消防设施状况分类code")
+	private String facilitiesCategoryCode;
+
+	@ExcelProperty(value = "道路路口路段", index = 23)
+	@ApiModelProperty(value = "道路路口路段简要情况")
+	private String roadJunctionInfo;
+
+	@ExplicitConstraint(type = "XHSFZXS", indexNum = 24, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
+	@ExcelProperty(value = "消火栓放置形式", index = 24)
+	@ApiModelProperty(value = "消火栓放置形式")
+	private String placeForm;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "消火栓放置形式code")
+	private String placeFormCode;
+
+	@ExplicitConstraint(type = "XFSDJK", indexNum = 25, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
+	@ExcelProperty(value = "消防水带接口", index = 25)
+	@ApiModelProperty(value = "消防水带接口")
+	private String hoseConnection;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "消防水带接口code")
+	private String hoseConnectionCode;
+
+	@ExplicitConstraint(type = "QSXS", indexNum = 26, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
+	@ExcelProperty(value = "取水形式", index = 26)
+	@ApiModelProperty(value = "取水形式")
+	private String intakeForm;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "水源类型代码")
+	private String typeCode;
+
+	@ExplicitConstraint(type = "TRSYLX", indexNum = 27, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
+	@ExcelProperty(value = "水源类型", index = 27)
+	@ApiModelProperty(value = "水源类型")
+	private String type;
+
+	@ExcelProperty(value = "容积（m³）", index = 28)
+	@ApiModelProperty(value = "容积（m³）")
+	private Float volume;
+
+	@ExcelProperty(value = "面积（㎡）", index = 29)
+	@ApiModelProperty(value = "面积（㎡）")
+	private Float area;
+
+	@ExcelProperty(value = "水质情况", index = 30)
+	@ApiModelProperty(value = "水质情况")
+	private String qualitySituationInfo;
+
+	@ExcelProperty(value = "四季变化简要情况", index = 31)
+	@ApiModelProperty(value = "四季变化简要情况")
+	private String seasonChangeInfo;
+
+//    @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 String hasDrySeasonType;
+
+	@ExcelProperty(value = "枯水期跨度简要情况", index = 33)
+	@ApiModelProperty(value = "枯水期跨度简要情况")
+	private String dryPeriodSpan;
+
+	@ExcelProperty(value = "取水高度(cm)", index = 34)
+	@ApiModelProperty(value = "取水高度(cm)")
+	private Float intakeHeight;
+
+	@ExcelProperty(value = "水源标高差(cm)", index = 35)
+	@ApiModelProperty(value = "水源标高差(cm)")
+	private Float elevationDifference;
+
+	@ExcelProperty(value = "停车位置", index = 36)
+	@ApiModelProperty(value = "停车位置")
+	private String parkingPosition;
+
+	@ExcelProperty(value = "停车数量(个)", index = 37)
+	@ApiModelProperty(value = "停车数量(个)")
+	private int parkingNum;
+
+	// 物联参数改为动态加载，原先字段作废，字段做隐藏
+	@ExcelIgnore
+	@ApiModelProperty(value = "储水量容积物联编码")
+	private String iotWaterStorage;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "流量物联编码")
+	private String iotFlowRate;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "状态物联编码")
+	private String iotStatus;
+
+	// BUG 2920 管网压力字段冗余 2021-09-18 陈召
+	@ExcelIgnore
+	@ApiModelProperty(value = "管网压力物联编码")
+	private String iotPipePressure;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "物联参数")
+	private Map<String, Object> waterResourceIotDto;
+
+	@ExcelIgnore
+	@ApiModelProperty("设施定义id")
+	private Long equipId;
+
+	@ApiModelProperty("设施定义名称")
+	@ExcelProperty(value = "设施定义名称", index = 5)
+	@ExplicitConstraint(indexNum = 5, sourceClass = CommonExplicitConstraint.class, method = "getEquipDefinition")
+	private String equipName;
+
+	@ExcelIgnore
+	@ApiModelProperty("设施分类id")
+	private Long equipCategoryId;
+	// BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17
+	@ApiModelProperty("设施分类名称")
+	@ExcelIgnore
+//    @ExplicitConstraint(indexNum = 42, sourceClass = CommonExplicitConstraint.class, method = "getEquipCategory")
+//    @ExcelProperty(value = "设施分类名称", index = 42)
+	private String equipCategoryName;
+	
+	@ApiModelProperty("设施分类编码")
+	@ExcelIgnore
+	private String equipCategoryCode;
+
+	@ApiModelProperty("设施编码")
+	@ExcelIgnore
+	private String equipCode;
+
+	@ApiModelProperty("维保周期")
+	@ExcelProperty(value = "维保周期(月)", index = 6)
+	private String maintenancePeriod;
+
+	@ApiModelProperty(value = "经度")
+	@ExcelProperty(value = "经度", index = 40)
+	private Double longitude;
+
+	@ApiModelProperty(value = "纬度")
+	@ExcelProperty(value = "纬度", index = 41)
+	private Double latitude;
+
+	@ExcelProperty(value = "消火栓类型", index =42)
+	@ExplicitConstraint(type = "HSLX",indexNum = 42, sourceClass = CommonExplicitConstraint.class)
+	@ApiModelProperty(value = "消火栓类型")
+	@TableField(exist = false)
+	private String hydrantType;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "附件")
+	@TableField(exist = false)
+	private Map<String, List<AttachmentDto>> attachments;
+
+	@ExcelProperty(value = "最低报警水位（m）", index = 43)
+	@ApiModelProperty(value = "最低报警水位（m）")
+	private Float minWaterLevel;
+
+	@ExcelProperty(value = "最高报警水位（m）", index = 44)
+	@ApiModelProperty(value = "最高报警水位（m）")
+	private Float maxWaterLevel;
+
+	@ExcelIgnore
+	@ApiModelProperty("水池液位显示装置id")
+	private String levelDeviceId;
+
+	@ApiModelProperty("水池液位显示装置名称")
+	@ExcelProperty(value = "水池液位显示装置", index = 45)
+	@ExplicitConstraint(indexNum = 45, sourceClass = CommonExplicitConstraint.class, method = "getListByEquipmentCode")
+	private String levelDeviceName;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceMapper.java

@@ -2,10 +2,7 @@ package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceZhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResource;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,7 +18,7 @@ import java.util.Map;
  */
 public interface WaterResourceMapper extends BaseMapper<WaterResource> {
 
-    List<WaterResourceDto> exportToExcel(@Param("isDelete")Boolean isDelete,@Param("name")String name, @Param("resourceType")String resourceType, @Param("bizOrgCode")String bizOrgCode);
+    List<WaterResourceForExportDto> exportToExcel(@Param("isDelete")Boolean isDelete, @Param("name")String name, @Param("resourceType")String resourceType, @Param("bizOrgCode")String bizOrgCode);
 
 
     /***

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceMapper">
     <!--BUG 2919 消防水源导出没有设施定义 分类名称 设施编码 维保周期 by kongfm 2021-09-16   -->
-    <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto">
+    <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceForExportDto">
         select r.name,
                r.address,
                r.resource_type_name,
@@ -10,8 +10,8 @@
                r.belong_fighting_system,
                r.management_unit,
                r.maintenance_unit,
-               r.build_date,
-               r.enable_date,
+               date_format(r.build_date, '%Y-%m-%d') AS buildDate,
+               date_format(r.enable_date, '%Y-%m-%d') AS enableDate,
                r.orientation_img,
                r.reality_img,
                r.contact_user,

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

@@ -10,14 +10,7 @@ import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
-import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceCraneDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceHydrantDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceNaturalDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourcePoolDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceZhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResource;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceCrane;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceHydrant;
@@ -200,8 +193,8 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
     /**
      * 导出列表
      */
-    public List<WaterResourceDto> exportToExcel(Boolean isDelete, String name,
-                                                String resourceType,String bizOrgCode ) {
+    public List<WaterResourceForExportDto> exportToExcel(Boolean isDelete, String name,
+                                                         String resourceType, String bizOrgCode ) {
     	if ("null".equals(name)) {
     		name = null;
 		}

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

@@ -4,6 +4,7 @@ import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -12,11 +13,14 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.spire.ms.System.Collections.Specialized.CollectionsUtil;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
 import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.jcs.api.dto.SignDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.SinStaticDto;
+import io.github.classgraph.json.JSONUtils;
+import io.micrometer.core.instrument.util.JsonUtils;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -256,7 +260,7 @@ public class ExcelServiceImpl {
 						WaterResourceDto.class, dataSourcesImpl, false);
 				break;
 			}
-			List<WaterResourceDto> waterResourceDtoList = null;
+			List<WaterResourceForExportDto> waterResourceDtoList = null;
 			if(par.size()>0) {
 				waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true,par.containsKey("name")?par.get("name").toString():null,
 						par.containsKey("resourceType")?par.get("resourceType").toString():null,par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null);
@@ -264,7 +268,7 @@ public class ExcelServiceImpl {
 				waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true,null,null,par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null);
 			}
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), waterResourceDtoList,
-					WaterResourceDto.class, dataSourcesImpl, false);
+					WaterResourceForExportDto.class, dataSourcesImpl, false);
 			break;
 		case "HKQ":
 			List<AircraftDto> aircraftDtoList = null;

amos-boot-system-equip/src/main/resources/changelog/init/view_all.sql

@@ -7713,29 +7713,22 @@ ORDER BY
 DROP VIEW IF EXISTS `v_fire_check_num_shaoshan`;
 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `v_fire_check_num_shaoshan` AS
 SELECT
-	(
-	SELECT
-		ifnull( sum( `p_plan_task`.`point_num` ), 0 )
-	FROM
-		`p_plan_task`
-	WHERE
-		( to_days( `p_plan_task`.`begin_time` ) - to_days( curdate()) ) <= 0 AND ( to_days( `p_plan_task`.`end_time` ) - to_days( curdate()) ) >= 0
-	) AS `point_num`,
-	(
-	SELECT
-		ifnull( sum( `p_plan_task`.`point_num` ), 0 )
-	FROM
-		`p_plan_task`
-	WHERE
-		`p_plan_task`.`finish_status` = 3
-		AND ( to_days( `p_plan_task`.`begin_time` ) - to_days( curdate()) ) <= 0 AND ( to_days( `p_plan_task`.`end_time` ) - to_days( curdate()) ) >= 0
-	) AS `miss_num`,
-	(
-	SELECT
-		ifnull( sum( `p_plan_task`.`point_num` ), 0 )
+    ( SELECT ifnull( sum( `p_plan_task`.`point_num` ), 0 ) FROM `p_plan_task` WHERE `p_plan_task`.`check_date` LIKE concat( curdate(), '%' ) ) AS `point_num`,
+    (
+        SELECT
+            ifnull( sum( `p_plan_task`.`point_num` ), 0 )
+        FROM
+            `p_plan_task`
+        WHERE
+                `p_plan_task`.`finish_status` = 3
+          AND `p_plan_task`.`check_date` LIKE concat( curdate(), '%' )
+    ) AS `miss_num`,
+    (
+        SELECT
+            ifnull( sum( `p_plan_task`.`point_num` ), 0 )
+        FROM
+            `p_plan_task`
+        WHERE
+                `p_plan_task`.`finish_status` = 0
+          AND `p_plan_task`.`check_date` LIKE concat( curdate(), '%' )
+    ) AS `unfinish_num`;
\ No newline at end of file
-	FROM
-		`p_plan_task`
-	WHERE
-		( `p_plan_task`.`finish_status` = 0 )
-	AND ( to_days( `p_plan_task`.`begin_time` ) - to_days( curdate()) ) <= 0 AND ( to_days( `p_plan_task`.`end_time` ) - to_days( curdate()) ) >= 0
-	) AS `unfinish_num`;
\ No newline at end of file