From 8a2eb055bec07003f29db6f9507866f6e369bbe7 Mon Sep 17 00:00:00 2001
From: chenwei <timeless646@163.com>
Date: Wed, 24 Jul 2024 10:39:59 +0800
Subject: [PATCH] update

---
 zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java |  2 +-
 zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicCmtyVo.java          | 18 ++++++++++++++++++
 zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml                                | 14 +++++++-------
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java
index a457343..4b5eac2 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java
@@ -237,7 +237,7 @@ public class McBasicCmtyController extends BaseController {
 
 
     @PostMapping("/summaryExport")
-    public void summaryExport(McBasicCmtyVo mcBasicCmtyVo,HttpServletResponse response) throws IOException {
+    public void summaryExport(@RequestBody McBasicCmtyVo mcBasicCmtyVo,HttpServletResponse response) throws IOException {
         List<McBasicCmty> list = mcBasicCmtyService.selectMcBasicCmtySummaryList(mcBasicCmtyVo);
         try {
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicCmtyVo.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicCmtyVo.java
index 730c550..fc228a7 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicCmtyVo.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicCmtyVo.java
@@ -2,6 +2,9 @@ package com.chinagas.modules.schsf.domain.vo;
 
 import com.chinagas.modules.schsf.domain.McBasicCmty;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 public class McBasicCmtyVo extends McBasicCmty {
 
@@ -11,6 +14,13 @@ public class McBasicCmtyVo extends McBasicCmty {
     /** 结束财年 */
     private Long finishFiscalYear;
 
+
+    /**
+     * ids
+     */
+    private List<String> idList = new ArrayList<String>();
+
+
     public Long getStartFiscalYear() {
         return startFiscalYear;
     }
@@ -26,4 +36,12 @@ public class McBasicCmtyVo extends McBasicCmty {
     public void setFinishFiscalYear(Long finishFiscalYear) {
         this.finishFiscalYear = finishFiscalYear;
     }
+
+    public List<String> getIdList() {
+        return idList;
+    }
+
+    public void setIdList(List<String> idList) {
+        this.idList = idList;
+    }
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml
index 827ffc1..3d7976e 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml
@@ -371,7 +371,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectMcBasicCmtySummaryList" resultMap="McBasicCmtyResult" parameterType="com.chinagas.modules.schsf.domain.vo.McBasicCmtyVo">
-        SELECT d.fiscal_year, d.region_name, d.group_name, d.company_name, d.company_code,
+        SELECT d.id,d.fiscal_year, d.region_name, d.group_name, d.company_name, d.company_code,
                d.province, d.city, d.district, d.street, d.vlg_or_cmty, d.resp_person, d.urb_rur_cls,
                d.project_type_name,
                d.comm_hh,d.acct_fy_start_conf,(d.hh_prev_full+ d.hh_prev_inst_dp) as acct_prev_recov,d.acct_prev_charged,
@@ -440,8 +440,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         GROUP BY
                         fiscal_year, company_code, urb_rur_cls,
                         user_province, user_city, user_district, user_street, vlg_or_cmty
-                        ) qkhs on hs.fiscal_year = m.fiscal_year and hs.company_code=m.company_code and hs.urb_rur_cls=m.urb_rur_cls
-                and hs.user_province=m.province and hs.user_city=m.city and hs.user_district=m.district and hs.user_street=m.street and hs.vlg_or_cmty=m.vlg_or_cmty
+                        ) qkhs on qkhs.fiscal_year = m.fiscal_year and qkhs.company_code=m.company_code and qkhs.urb_rur_cls=m.urb_rur_cls
+                and qkhs.user_province=m.province and qkhs.user_city=m.city and qkhs.user_district=m.district and qkhs.user_street=m.street and qkhs.vlg_or_cmty=m.vlg_or_cmty
                 left join (
                         SELECT 	fiscal_year, company_code, urb_rur_cls,
                         user_province, user_city, user_district, user_street, vlg_or_cmty,
@@ -453,16 +453,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         GROUP BY
                         fiscal_year, company_code, urb_rur_cls,
                         user_province, user_city, user_district, user_street, vlg_or_cmty
-                        ) fqhs on hs.fiscal_year = m.fiscal_year and hs.company_code=m.company_code and hs.urb_rur_cls=m.urb_rur_cls
-                and hs.user_province=m.province and hs.user_city=m.city and hs.user_district=m.district and hs.user_street=m.street and hs.vlg_or_cmty=m.vlg_or_cmty
+                        ) fqhs on fqhs.fiscal_year = m.fiscal_year and fqhs.company_code=m.company_code and fqhs.urb_rur_cls=m.urb_rur_cls
+                and fqhs.user_province=m.province and fqhs.user_city=m.city and fqhs.user_district=m.district and fqhs.user_street=m.street and fqhs.vlg_or_cmty=m.vlg_or_cmty
                 left join (
                         SELECT v.fiscal_year, i.company_code, i.urb_rur_cls,i.user_province, i.user_city, i.user_district, i.user_street, i.vlg_or_cmty,COUNT(DISTINCT i.id) as hh_ev_ignite
                         FROM mc_ignition i
                         INNER JOIN mc_visit v on i.visit_id= v.id
                         WHERE i.status_code in ('MAINTENANCE_YES','MAINTENANCE_NO')
                         GROUP BY v.fiscal_year, i.company_code, i.urb_rur_cls,i.user_province, i.user_city, i.user_district, i.user_street, i.vlg_or_cmty
-                        ) dhhs on hs.fiscal_year = m.fiscal_year and hs.company_code=m.company_code and hs.urb_rur_cls=m.urb_rur_cls
-                and hs.user_province=m.province and hs.user_city=m.city and hs.user_district=m.district and hs.user_street=m.street and hs.vlg_or_cmty=m.vlg_or_cmty
+                        ) dhhs on dhhs.fiscal_year = m.fiscal_year and dhhs.company_code=m.company_code and dhhs.urb_rur_cls=m.urb_rur_cls
+                and dhhs.user_province=m.province and dhhs.user_city=m.city and dhhs.user_district=m.district and dhhs.user_street=m.street and dhhs.vlg_or_cmty=m.vlg_or_cmty
                 where 1=1
                 <if test="fiscalYear != null "> and m.fiscal_year = #{fiscalYear}</if>
                 <if test="regionName != null  and regionName != ''"> and m.region_name like concat('%', #{regionName}, '%')</if>
--
libgit2 0.21.2