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 9ceab31..a457343 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
@@ -224,4 +224,42 @@ public class McBasicCmtyController extends BaseController {
             response.getWriter().println(JSON.toJSONString(map));
         }
     }
+
+
+
+    @GetMapping("/summaryList")
+    public TableDataInfo summaryList(McBasicCmtyVo mcBasicCmtyVo) {
+        startPage();
+        mcBasicCmtyVo.setDefFlag("0");
+        List<McBasicCmty> list = mcBasicCmtyService.selectMcBasicCmtySummaryList(mcBasicCmtyVo);
+        return getDataTable(list);
+    }
+
+
+    @PostMapping("/summaryExport")
+    public void summaryExport(McBasicCmtyVo mcBasicCmtyVo,HttpServletResponse response) throws IOException {
+        List<McBasicCmty> list = mcBasicCmtyService.selectMcBasicCmtySummaryList(mcBasicCmtyVo);
+        try {
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setCharacterEncoding("utf-8");
+            // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
+            String fileName = URLEncoder.encode("累加户数项目公司", "UTF-8").replaceAll("\\+", "%20");
+            response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+            // 这里需要设置不关闭流
+            EasyExcel.write(response.getOutputStream(), McBasicCmty.class).autoCloseStream(Boolean.FALSE).sheet("累加户数项目公司").doWrite(list);
+        } catch (Exception e) {
+            // 重置response
+            e.printStackTrace();
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            Map<String, String> map = MapUtils.newHashMap();
+            map.put("status", "failure");
+            map.put("message", "下载文件失败" + e.getMessage());
+            response.getWriter().println(JSON.toJSONString(map));
+        }
+    }
+
+
+
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicCmtyMapper.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicCmtyMapper.java
index f1381a5..2138082 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicCmtyMapper.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicCmtyMapper.java
@@ -80,4 +80,11 @@ public interface McBasicCmtyMapper
     List<McBasicCmty> selectVisitDeptList(McBasicCmtyVo mcBasicCmtyVo);
 
 
+    /**
+     * 汇总报表
+     * @param mcBasicCmtyVo
+     * @return
+     */
+    List<McBasicCmty> selectMcBasicCmtySummaryList(McBasicCmtyVo mcBasicCmtyVo);
+
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcBasicCmtyService.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcBasicCmtyService.java
index 7049a00..c8e7481 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcBasicCmtyService.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcBasicCmtyService.java
@@ -82,4 +82,12 @@ public interface IMcBasicCmtyService
 
     List<McBasicCmty> selectVisitDeptList(McVisit mcVisit);
 
+    /**
+     * 报表汇总
+     * @param mcBasicCmtyVo
+     * @return
+     */
+    List<McBasicCmty> selectMcBasicCmtySummaryList(McBasicCmtyVo mcBasicCmtyVo);
+
+
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java
index 16ab021..ab3b881 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java
@@ -169,6 +169,11 @@ public class McBasicCmtyServiceImpl implements IMcBasicCmtyService {
         return mcBasicCmtyMapper.selectVisitDeptList(mcBasicCmtyVo);
     }
 
+    @Override
+    public List<McBasicCmty> selectMcBasicCmtySummaryList(McBasicCmtyVo mcBasicCmtyVo) {
+        return mcBasicCmtyMapper.selectMcBasicCmtySummaryList(mcBasicCmtyVo);
+    }
+
     private List<CompanyDto> loadDistinctGroups(McBasicCmtyVo mcBasicCmtyVo, CompanyDto parent) {
         mcBasicCmtyVo.setRegionName(parent.getValue());
         return mcBasicCmtyMapper.getDistinctGroupList(mcBasicCmtyVo);
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 ff1b146..827ffc1 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
@@ -369,4 +369,142 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and m.company_code = #{companyCode}
           and m.vlg_or_cmty = #{vlgOrCmty}
     </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,
+               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,
+               (d.hh_new_full +	d.hh_new_install) as curr_fy_new_recovered,
+               (d.hh_new_full +	d.hh_new_install+d.hh_prev_full +	d.acct_prev_charged) as total_charged,
+               d.qtr_target_company,d.hh_gsg_charged,d.hh_gsg_uncharged,(IFNULL(d.hh_gsg_charged,0)+ IFNULL(d.hh_gsg_uncharged,0)) as hh_gsg_total,
+               d.hh_new_full	,d.hh_new_install	,d.hh_prev_full	,d.hh_prev_inst_dp,
+               (IFNULL(d.acct_fy_start_conf,0) - d.hh_prev_full	- d.hh_prev_inst_dp) as hh_unchg,
+               d.hh_unchg_conf,d.hh_unchg_scan,
+               (d.hh_new_full +	d.hh_new_install+d.hh_prev_full +	d.hh_prev_inst_dp) as hh_ev_cum_paid,
+               (d.hh_new_install  +	d.hh_prev_inst_dp) as hh_ev_inst,
+               (d.hh_new_full  +	d.hh_prev_full) as hh_ev_full,
+               d.hh_ev_ignite,
+               ((d.hh_new_full +	d.hh_new_install+d.hh_prev_full +	d.acct_prev_charged) / d.comm_hh) as hh_ev_cum_setup,
+               ((d.hh_new_full  +	d.hh_prev_full) / d.comm_hh) as hh_ev_cum_gas
+        FROM (
+                select m.id,m.update_time,m.fiscal_year, m.region_name, m.group_name, m.company_name, m.company_code,
+                m.province, m.city, m.district, m.street, m.vlg_or_cmty, m.resp_person, m.urb_rur_cls,
+                m.project_type_name,
+                (IFNULL(m.comm_hh,0) + IFNULL(hs.comm_hh,0)) AS comm_hh,
+                m.acct_fy_start_conf,
+                (IFNULL(m.hh_new_full,0)+ IFNULL(qkhs.hh_new_full,0)) as hh_new_full,
+                (IFNULL(m.hh_new_install,0) + IFNULL(fqhs.hh_new_install,0)) as hh_new_install,
+                m.hh_prev_full,m.hh_prev_inst_dp,
+                (IFNULL(m.hh_ev_ignite,0) + IFNULL(dhhs.hh_ev_ignite,0)) as hh_ev_ignite,
+                null as acct_prev_recov,
+                m.acct_prev_charged,
+                null as curr_fy_new_recovered,
+                null as total_charged,
+                m.qtr_target_company,
+                m.hh_gsg_charged,
+                m.hh_gsg_uncharged,
+                null as hh_gsg_total,
+                null as hh_unchg,
+                m.hh_unchg_conf,
+                m.hh_unchg_scan,
+
+                null as hh_ev_cum_paid,
+                null as hh_ev_inst,
+                null as hh_ev_full,
+                null as hh_ev_cum_setup,
+                null as hh_ev_cum_gas
+
+                FROM mc_basic_cmty m
+                left join sys_user u on u.user_id = m.create_by
+                left join sys_dept d on d.dept_id = m.company_code
+                left join (
+                        SELECT 	fiscal_year, company_code, urb_rur_cls,
+                        user_province, user_city, user_district, user_street, vlg_or_cmty,
+                        COUNT(DISTINCT user_name,user_phone) AS comm_hh
+                        FROM
+                        mc_visit
+                        GROUP BY
+                        fiscal_year, company_code, urb_rur_cls,
+                        user_province, user_city, user_district, user_street, vlg_or_cmty
+                        ) hs 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
+                left join (
+                        SELECT 	fiscal_year, company_code, urb_rur_cls,
+                        user_province, user_city, user_district, user_street, vlg_or_cmty,
+                        COUNT(DISTINCT user_name,user_phone) AS hh_new_full
+                        FROM mc_visit
+                        WHERE 1=1
+                        AND charge_type='2'
+                        AND status_code NOT IN ('CANCEL')
+                        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
+                left join (
+                        SELECT 	fiscal_year, company_code, urb_rur_cls,
+                        user_province, user_city, user_district, user_street, vlg_or_cmty,
+                        COUNT(DISTINCT user_name,user_phone) AS hh_new_install
+                        FROM mc_visit
+                        WHERE 1=1
+                        AND charge_type in ("1","4")
+                        AND status_code NOT IN ('CANCEL')
+                        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
+                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
+                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>
+                <if test="groupName != null  and groupName != ''"> and m.group_name like concat('%', #{groupName}, '%')</if>
+                <if test="companyName != null  and companyName != ''"> and m.company_name like concat('%', #{companyName}, '%')</if>
+                <if test="companyCode != null  and companyCode != ''"> and m.company_code = #{companyCode}</if>
+                <if test="province != null  and province != ''"> and m.province = #{province}</if>
+                <if test="city != null  and city != ''"> and m.city = #{city}</if>
+                <if test="district != null  and district != ''"> and m.district = #{district}</if>
+                <if test="street != null  and street != ''"> and m.street = #{street}</if>
+                <if test="vlgOrCmty != null  and vlgOrCmty != ''"> and m.vlg_or_cmty = #{vlgOrCmty}</if>
+                <if test="respPerson != null  and respPerson != ''"> and m.resp_person = #{respPerson}</if>
+                <if test="urbRurCls != null  and urbRurCls != ''"> and m.urb_rur_cls = #{urbRurCls}</if>
+                <if test="projectTypeName != null  and projectTypeName != ''"> and m.project_type_name like concat('%', #{projectTypeName}, '%')</if>
+                <if test="commHh != null "> and m.comm_hh = #{commHh}</if>
+                <if test="acctFyStartConf != null "> and m.acct_fy_start_conf = #{acctFyStartConf}</if>
+                <if test="acctPrevRecov != null "> and m.acct_prev_recov = #{acctPrevRecov}</if>
+                <if test="acctPrevCharged != null "> and m.acct_prev_charged = #{acctPrevCharged}</if>
+                <if test="currFyNewRecovered != null "> and m.curr_fy_new_recovered = #{currFyNewRecovered}</if>
+                <if test="totalCharged != null "> and m.total_charged = #{totalCharged}</if>
+                <if test="qtrTargetCompany != null "> and m.qtr_target_company = #{qtrTargetCompany}</if>
+                <if test="hhGsgCharged != null "> and m.hh_gsg_charged = #{hhGsgCharged}</if>
+                <if test="hhGsgUncharged != null "> and m.hh_gsg_uncharged = #{hhGsgUncharged}</if>
+                <if test="hhGsgTotal != null "> and m.hh_gsg_total = #{hhGsgTotal}</if>
+                <if test="hhNewFull != null "> and m.hh_new_full = #{hhNewFull}</if>
+                <if test="hhNewInstall != null "> and m.hh_new_install = #{hhNewInstall}</if>
+                <if test="hhPrevFull != null "> and m.hh_prev_full = #{hhPrevFull}</if>
+                <if test="hhPrevInstDp != null "> and m.hh_prev_inst_dp = #{hhPrevInstDp}</if>
+                <if test="hhUnchg != null "> and m.hh_unchg = #{hhUnchg}</if>
+                <if test="hhUnchgConf != null "> and m.hh_unchg_conf = #{hhUnchgConf}</if>
+                <if test="hhUnchgScan != null "> and m.hh_unchg_scan = #{hhUnchgScan}</if>
+                <if test="hhEvCumPaid != null "> and m.hh_ev_cum_paid = #{hhEvCumPaid}</if>
+                <if test="hhEvInst != null "> and m.hh_ev_inst = #{hhEvInst}</if>
+                <if test="hhEvFull != null "> and m.hh_ev_full = #{hhEvFull}</if>
+                <if test="hhEvIgnite != null "> and m.hh_ev_ignite = #{hhEvIgnite}</if>
+                <if test="hhEvCumSetup != null "> and m.hh_ev_cum_setup = #{hhEvCumSetup}</if>
+                <if test="hhEvCumGas != null "> and m.hh_ev_cum_gas = #{hhEvCumGas}</if>
+                <if test="defFlag != null  and defFlag != ''"> and m.def_flag = #{defFlag}</if>
+                <if test="startFiscalYear != null  and startFiscalYear != ''"> and m.fiscal_year &gt;= #{startFiscalYear}</if>
+                <if test="finishFiscalYear != null  and finishFiscalYear != ''"> and m.fiscal_year &lt;= #{finishFiscalYear}</if>
+                ${params.dataScope}
+             ) d
+        ORDER BY d.update_time desc
+    </select>
 </mapper>
--
libgit2 0.21.2