页面修改

gw-slaj/src/main/java/com/goldenwater/slaj/hidd/controller/BisHiddConsultController.java

@@ -1,6 +1,8 @@
 package com.goldenwater.slaj.hidd.controller;
 
 import java.util.List;
+
+import com.goldenwater.slaj.hidd.domain.BisHiddConsultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.goldenwater.common.core.controller.BaseController;
@@ -26,7 +28,7 @@ public class BisHiddConsultController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(BisHiddConsult bisHiddConsult) {
         startPage();
-        List<BisHiddConsult> list = bisHiddConsultService.selectBisHiddConsultList(bisHiddConsult);
+        List<BisHiddConsultVo> list = bisHiddConsultService.selectBisHiddConsultList(bisHiddConsult);
         return getDataTable(list);
     }
 
@@ -54,8 +56,8 @@ public class BisHiddConsultController extends BaseController {
     @PreAuthorize("@ss.hasPermi('hidd:cons:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BisHiddConsult bisHiddConsult) {
-        List<BisHiddConsult> list = bisHiddConsultService.selectBisHiddConsultList(bisHiddConsult);
-        ExcelUtil<BisHiddConsult> util = new ExcelUtil<>(BisHiddConsult.class);
+        List<BisHiddConsultVo> list = bisHiddConsultService.selectBisHiddConsultList(bisHiddConsult);
+        ExcelUtil<BisHiddConsultVo> util = new ExcelUtil<>(BisHiddConsultVo.class);
         util.exportExcel(response, list, "隐患会商数据");
     }
 }

gw-slaj/src/main/java/com/goldenwater/slaj/hidd/domain/BisHiddConsultVo.java

@@ -0,0 +1,34 @@
+package com.goldenwater.slaj.hidd.domain;
+
+import lombok.Data;
+
+/**
+ * 隐患会商信息 VO
+ */
+@Data
+public class BisHiddConsultVo {
+    /** 主键 */
+    private String guid;
+    /** 隐患GUID */
+    private String hiddGuid;
+    /** 隐患名称 */
+    private String hiddName;
+    /** 会商主题 */
+    private String consTheme;
+    /** 会商时间 */
+    private String consTime;
+    /** 会商地点 */
+    private String consPlace;
+    /** 主持人 */
+    private String consHost;
+    /** 参会人员 */
+    private String consMembers;
+    /** 会商内容 */
+    private String consContent;
+    /** 会商结论 */
+    private String consResult;
+    /** 创建时间 */
+    private String createTime;
+    /** 更新时间 */
+    private String updateTime;
+}

gw-slaj/src/main/java/com/goldenwater/slaj/hidd/domain/TBusiHiddCountMonVo.java

@@ -0,0 +1,50 @@
+package com.goldenwater.slaj.hidd.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 隐患月度统计VO（包含查询条件和计算字段）
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TBusiHiddCountMonVo extends TBusiHiddCountMon {
+    // ============ 查询条件字段 ============
+    
+    /** 机构名称（模糊查询） */
+    private String orgNameQuery;
+    /** 单位性质 (1:直属单位 2:流域机构 3:下级水行政部门) */
+    private String unitType;
+
+    // ============ 计算字段（通过SQL计算） ============
+    
+    /** 隐患总数 */
+    private Integer totalHidd;
+    /** 已整改 */
+    private Integer solvedHidd;
+    /** 整改中 */
+    private Integer solvingHidd;
+    /** 未整改 */
+    private Integer unsolvedHidd;
+    /** 整改率 */
+    private Double solveRate;
+    /** 机构名称（关联查询） */
+    private String orgName;
+
+    // ============ 逾期统计字段 ============
+    
+    /** 重大隐患-整改中 */
+    private Integer zdSolvingHidd;
+    /** 重大隐患-未整改 */
+    private Integer zdUnsolvedHidd;
+    /** 重大隐患-逾期未整改 */
+    private Integer zdOverTimeHidd;
+    /** 一般隐患-整改中 */
+    private Integer ybSolvingHidd;
+    /** 一般隐患-未整改 */
+    private Integer ybUnsolvedHidd;
+    /** 一般隐患-逾期未整改 */
+    private Integer ybOverTimeHidd;
+    /** 逾期未整改总数 */
+    private Integer overTimeHidd;
+}

gw-slaj/src/main/java/com/goldenwater/slaj/hidd/domain/TBusiHiddCountVo.java

@@ -0,0 +1,54 @@
+package com.goldenwater.slaj.hidd.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 隐患统计VO（包含查询条件和计算字段）
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TBusiHiddCountVo extends TBusiHiddCount {
+    // ============ 查询条件字段 ============
+    
+    /** 统计年份（查询条件） */
+    private String statYear;
+    /** 统计月份（查询条件） */
+    private String statMonth;
+    /** 单位性质 (1:直属单位 2:流域机构 3:下级水行政部门) */
+    private String unitType;
+    /** 机构名称（模糊查询） */
+    private String orgNameQuery;
+
+    // ============ 计算字段（通过SQL计算） ============
+    
+    /** 隐患总数 */
+    private Integer totalHidd;
+    /** 已整改 */
+    private Integer solvedHidd;
+    /** 整改中 */
+    private Integer solvingHidd;
+    /** 未整改 */
+    private Integer unsolvedHidd;
+    /** 整改率 */
+    private Double solveRate;
+    /** 机构名称（关联查询） */
+    private String orgName;
+
+    // ============ 逾期统计字段 ============
+    
+    /** 重大隐患-整改中 */
+    private Integer zdSolvingHidd;
+    /** 重大隐患-未整改 */
+    private Integer zdUnsolvedHidd;
+    /** 重大隐患-逾期未整改 */
+    private Integer zdOverTimeHidd;
+    /** 一般隐患-整改中 */
+    private Integer ybSolvingHidd;
+    /** 一般隐患-未整改 */
+    private Integer ybUnsolvedHidd;
+    /** 一般隐患-逾期未整改 */
+    private Integer ybOverTimeHidd;
+    /** 逾期未整改总数 */
+    private Integer overTimeHidd;
+}

gw-slaj/src/main/java/com/goldenwater/slaj/hidd/mapper/BisHiddConsultMapper.java

@@ -2,6 +2,7 @@ package com.goldenwater.slaj.hidd.mapper;
 
 import java.util.List;
 import com.goldenwater.slaj.hidd.domain.BisHiddConsult;
+import com.goldenwater.slaj.hidd.domain.BisHiddConsultVo;
 
 /**
  * 隐患会商信息Mapper接口
@@ -10,12 +11,12 @@ public interface BisHiddConsultMapper {
     /**
      * 查询隐患会商信息列表
      */
-    List<BisHiddConsult> selectBisHiddConsultList(BisHiddConsult bisHiddConsult);
+    List<BisHiddConsultVo> selectBisHiddConsultList(BisHiddConsult bisHiddConsult);
 
     /**
      * 查询隐患会商信息详情
      */
-    BisHiddConsult selectBisHiddConsultByGuid(String guid);
+    BisHiddConsultVo selectBisHiddConsultByGuid(String guid);
 
     /**
      * 新增隐患会商信息

gw-slaj/src/main/java/com/goldenwater/slaj/hidd/service/IBisHiddConsultService.java

@@ -2,6 +2,7 @@ package com.goldenwater.slaj.hidd.service;
 
 import java.util.List;
 import com.goldenwater.slaj.hidd.domain.BisHiddConsult;
+import com.goldenwater.slaj.hidd.domain.BisHiddConsultVo;
 
 /**
  * 隐患会商信息Service接口
@@ -10,12 +11,12 @@ public interface IBisHiddConsultService {
     /**
      * 查询隐患会商信息列表
      */
-    List<BisHiddConsult> selectBisHiddConsultList(BisHiddConsult bisHiddConsult);
+    List<BisHiddConsultVo> selectBisHiddConsultList(BisHiddConsult bisHiddConsult);
 
     /**
      * 查询隐患会商信息详情
      */
-    BisHiddConsult selectBisHiddConsultByGuid(String guid);
+    BisHiddConsultVo selectBisHiddConsultByGuid(String guid);
 
     /**
      * 新增隐患会商信息

gw-slaj/src/main/java/com/goldenwater/slaj/hidd/service/impl/BisHiddConsultServiceImpl.java

@@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.goldenwater.slaj.hidd.mapper.BisHiddConsultMapper;
 import com.goldenwater.slaj.hidd.domain.BisHiddConsult;
+import com.goldenwater.slaj.hidd.domain.BisHiddConsultVo;
 import com.goldenwater.slaj.hidd.service.IBisHiddConsultService;
 
 /**
@@ -16,12 +17,12 @@ public class BisHiddConsultServiceImpl implements IBisHiddConsultService {
     private BisHiddConsultMapper bisHiddConsultMapper;
 
     @Override
-    public List<BisHiddConsult> selectBisHiddConsultList(BisHiddConsult bisHiddConsult) {
+    public List<BisHiddConsultVo> selectBisHiddConsultList(BisHiddConsult bisHiddConsult) {
         return bisHiddConsultMapper.selectBisHiddConsultList(bisHiddConsult);
     }
 
     @Override
-    public BisHiddConsult selectBisHiddConsultByGuid(String guid) {
+    public BisHiddConsultVo selectBisHiddConsultByGuid(String guid) {
         return bisHiddConsultMapper.selectBisHiddConsultByGuid(guid);
     }
 

gw-slaj/src/main/resources/mapper/slaj/BisHiddConsultMapper.xml

@@ -2,9 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goldenwater.slaj.hidd.mapper.BisHiddConsultMapper">
 
-    <resultMap type="BisHiddConsult" id="BisHiddConsultResult">
+    <resultMap type="BisHiddConsultVo" id="BisHiddConsultResult">
         <id property="guid" column="guid"/>
         <result property="hiddGuid" column="hidd_guid"/>
+        <result property="hiddName" column="hidd_name"/>
         <result property="consTheme" column="cons_theme"/>
         <result property="consTime" column="cons_time"/>
         <result property="consPlace" column="cons_place"/>
@@ -17,23 +18,25 @@
     </resultMap>
 
     <sql id="selectBisHiddConsultVo">
-        select guid, hidd_guid, cons_theme, cons_time, cons_place, cons_host, cons_members, cons_content, cons_result, create_time, update_time
-        from bis_hidd_consult
+        select c.guid, c.hidd_guid, h.hidd_name, c.cons_theme, c.cons_time, c.cons_place, 
+               c.cons_host, c.cons_members, c.cons_content, c.cons_result, c.create_time, c.update_time
+        from bis_hidd_consult c
+        left join obj_hidd h on c.hidd_guid = h.guid
     </sql>
 
     <select id="selectBisHiddConsultList" parameterType="BisHiddConsult" resultMap="BisHiddConsultResult">
         <include refid="selectBisHiddConsultVo"/>
         <where>
-            <if test="hiddGuid != null and hiddGuid != ''">and hidd_guid = #{hiddGuid}</if>
-            <if test="consTheme != null and consTheme != ''">and cons_theme like '%' || #{consTheme} || '%'</if>
-            <if test="consTime != null and consTime != ''">and cons_time = #{consTime}</if>
+            <if test="hiddGuid != null and hiddGuid != ''">and c.hidd_guid = #{hiddGuid}</if>
+            <if test="consTheme != null and consTheme != ''">and c.cons_theme like '%' || #{consTheme} || '%'</if>
+            <if test="consTime != null and consTime != ''">and c.cons_time = #{consTime}</if>
         </where>
-        order by create_time desc
+        order by c.create_time desc
     </select>
 
     <select id="selectBisHiddConsultByGuid" parameterType="String" resultMap="BisHiddConsultResult">
         <include refid="selectBisHiddConsultVo"/>
-        where guid = #{guid}
+        where c.guid = #{guid}
     </select>
 
     <insert id="insertBisHiddConsult" parameterType="BisHiddConsult" useGeneratedKeys="true" keyProperty="guid">