update

陈威
1 parent d7270408
Showing 3 changed files with 26 additions and 8 deletions Show diff stats
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicCmtyVo.java
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml
@@ -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");
@@ -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;
+    }
 }
@@ -371,7 +371,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </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 &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
                         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 &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
                         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>
...	...	@@ -237,7 +237,7 @@ public class McBasicCmtyController extends BaseController {
237	237
238	238
239	239	@PostMapping("/summaryExport")
240		- public void summaryExport(McBasicCmtyVo mcBasicCmtyVo,HttpServletResponse response) throws IOException {
	240	+ public void summaryExport(@RequestBody McBasicCmtyVo mcBasicCmtyVo,HttpServletResponse response) throws IOException {
241	241	List<McBasicCmty> list = mcBasicCmtyService.selectMcBasicCmtySummaryList(mcBasicCmtyVo);
242	242	try {
243	243	response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
...	...
...	...	@@ -2,6 +2,9 @@ package com.chinagas.modules.schsf.domain.vo;
2	2
3	3	import com.chinagas.modules.schsf.domain.McBasicCmty;
4	4
	5	+import java.util.ArrayList;
	6	+import java.util.List;
	7	+
5	8
6	9	public class McBasicCmtyVo extends McBasicCmty {
7	10
...	...	@@ -11,6 +14,13 @@ public class McBasicCmtyVo extends McBasicCmty {
11	14	/** 结束财年 */
12	15	private Long finishFiscalYear;
13	16
	17	+
	18	+ /**
	19	+ * ids
	20	+ */
	21	+ private List<String> idList = new ArrayList<String>();
	22	+
	23	+
14	24	public Long getStartFiscalYear() {
15	25	return startFiscalYear;
16	26	}
...	...	@@ -26,4 +36,12 @@ public class McBasicCmtyVo extends McBasicCmty {
26	36	public void setFinishFiscalYear(Long finishFiscalYear) {
27	37	this.finishFiscalYear = finishFiscalYear;
28	38	}
	39	+
	40	+ public List<String> getIdList() {
	41	+ return idList;
	42	+ }
	43	+
	44	+ public void setIdList(List<String> idList) {
	45	+ this.idList = idList;
	46	+ }
29	47	}
...	...
...	...	@@ -371,7 +371,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
371	371	</select>
372	372
373	373	<select id="selectMcBasicCmtySummaryList" resultMap="McBasicCmtyResult" parameterType="com.chinagas.modules.schsf.domain.vo.McBasicCmtyVo">
374		- SELECT d.fiscal_year, d.region_name, d.group_name, d.company_name, d.company_code,
	374	+ SELECT d.id,d.fiscal_year, d.region_name, d.group_name, d.company_name, d.company_code,
375	375	d.province, d.city, d.district, d.street, d.vlg_or_cmty, d.resp_person, d.urb_rur_cls,
376	376	d.project_type_name,
377	377	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"
440	440	GROUP BY
441	441	fiscal_year, company_code, urb_rur_cls,
442	442	user_province, user_city, user_district, user_street, vlg_or_cmty
443		- ) qkhs on hs.fiscal_year = m.fiscal_year and hs.company_code=m.company_code and hs.urb_rur_cls=m.urb_rur_cls
444		- 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
	443	+ ) qkhs on qkhs.fiscal_year = m.fiscal_year and qkhs.company_code=m.company_code and qkhs.urb_rur_cls=m.urb_rur_cls
	444	+ 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
445	445	left join (
446	446	SELECT fiscal_year, company_code, urb_rur_cls,
447	447	user_province, user_city, user_district, user_street, vlg_or_cmty,
...	...	@@ -453,16 +453,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
453	453	GROUP BY
454	454	fiscal_year, company_code, urb_rur_cls,
455	455	user_province, user_city, user_district, user_street, vlg_or_cmty
456		- ) fqhs on hs.fiscal_year = m.fiscal_year and hs.company_code=m.company_code and hs.urb_rur_cls=m.urb_rur_cls
457		- 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
	456	+ ) fqhs on fqhs.fiscal_year = m.fiscal_year and fqhs.company_code=m.company_code and fqhs.urb_rur_cls=m.urb_rur_cls
	457	+ 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
458	458	left join (
459	459	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
460	460	FROM mc_ignition i
461	461	INNER JOIN mc_visit v on i.visit_id= v.id
462	462	WHERE i.status_code in ('MAINTENANCE_YES','MAINTENANCE_NO')
463	463	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
464		- ) dhhs on hs.fiscal_year = m.fiscal_year and hs.company_code=m.company_code and hs.urb_rur_cls=m.urb_rur_cls
465		- 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
	464	+ ) dhhs on dhhs.fiscal_year = m.fiscal_year and dhhs.company_code=m.company_code and dhhs.urb_rur_cls=m.urb_rur_cls
	465	+ 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
466	466	where 1=1
467	467	<if test="fiscalYear != null "> and m.fiscal_year = #{fiscalYear}</if>
468	468	<if test="regionName != null and regionName != ''"> and m.region_name like concat('%', #{regionName}, '%')</if>
...	...