update

陈威
1 parent 43e968b9
Showing 6 changed files with 62 additions and 1 deletions Show diff stats
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicMoneyVo.java
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitVo.java
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicMoneyMapper.xml
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
@@ -304,6 +304,11 @@ public class McVisitController extends BaseController {
     @GetMapping("/chargedList")
     public TableDataInfo chargedList(McVisitVo mcVisitVo) {
         startPage();
+        List<String> ignitionStatusCodeList = new ArrayList<String>();
+        ignitionStatusCodeList.add("MAINTENANCE_YES");
+        ignitionStatusCodeList.add("MAINTENANCE_NO");
+        mcVisitVo.setIgnitionStatusCodeList(ignitionStatusCodeList);
+
         List<String> ticketTypeList = new ArrayList<String>();
         ticketTypeList.add("2");
         ticketTypeList.add("3");
@@ -326,6 +331,7 @@ public class McVisitController extends BaseController {
         List<String> ticketTypeList = new ArrayList<String>();
         ticketTypeList.add("1");
         ticketTypeList.add("3");
+
         mcVisitVo.setTicketTypeList(ticketTypeList);
         mcVisitVo.setDefFlag("0");
 //        mcVisitVo.setStatusCode("APPROVED");
@@ -396,6 +402,12 @@ public class McVisitController extends BaseController {
     @RequirePermission("schsf:mcVisit:chargedListExport")
     @PostMapping("/chargedListExport")
     public void chargedListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException {
+
+        List<String> ignitionStatusCodeList = new ArrayList<String>();
+        ignitionStatusCodeList.add("MAINTENANCE_YES");
+        ignitionStatusCodeList.add("MAINTENANCE_NO");
+        mcVisitVo.setIgnitionStatusCodeList(ignitionStatusCodeList);
+
         List<String> ticketTypeList = new ArrayList<String>();
         ticketTypeList.add("2");
         ticketTypeList.add("3");
@@ -2,6 +2,9 @@ package com.chinagas.modules.schsf.domain.vo;
  
 import com.chinagas.modules.schsf.domain.McBasicMoney;
  
+import java.util.ArrayList;
+import java.util.List;
+
 public class McBasicMoneyVo extends McBasicMoney {
     /** 开始财年 */
     private Long startFiscalYear;
@@ -9,6 +12,11 @@ public class McBasicMoneyVo extends McBasicMoney {
     /** 结束财年 */
     private Long finishFiscalYear;
  
+    /**
+     * ids
+     */
+    private List<String> idList = new ArrayList<String>();
+
     public Long getStartFiscalYear() {
         return startFiscalYear;
     }
@@ -24,4 +32,13 @@ public class McBasicMoneyVo extends McBasicMoney {
     public void setFinishFiscalYear(Long finishFiscalYear) {
         this.finishFiscalYear = finishFiscalYear;
     }
+
+    public List<String> getIdList() {
+        return idList;
+    }
+
+    public void setIdList(List<String> idList) {
+        this.idList = idList;
+    }
 }
+
@@ -77,6 +77,11 @@ public class McVisitVo extends McVisit {
     private String finishIgnTime;
  
  
+    private List<String> ignitionStatusCodeList = new ArrayList<String>();
+
+
+
+
     public Long getStartFiscalYear() {
         return startFiscalYear;
     }
@@ -181,6 +186,14 @@ public class McVisitVo extends McVisit {
         this.finishIgnTime = finishIgnTime;
     }
  
+    public List<String> getIgnitionStatusCodeList() {
+        return ignitionStatusCodeList;
+    }
+
+    public void setIgnitionStatusCodeList(List<String> ignitionStatusCodeList) {
+        this.ignitionStatusCodeList = ignitionStatusCodeList;
+    }
+
     @Override
     public String toString() {
         return "McVisitVo{" +
@@ -197,6 +210,7 @@ public class McVisitVo extends McVisit {
                 ", idList=" + idList +
                 ", startIgnTime='" + startIgnTime + '\'' +
                 ", finishIgnTime='" + finishIgnTime + '\'' +
+                ", ignitionStatusCodeList=" + ignitionStatusCodeList +
                 '}';
     }
 }
@@ -503,6 +503,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
                 <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>
+                <if test="idList != null  and idList.size() > 0">
+                    and m.id in
+                    <foreach collection="idList" item="item" index="index" separator=","  open=" (" close=")">
+                        #{item}
+                    </foreach>
+                </if>
                 ${params.dataScope}
              ) d
         ORDER BY d.update_time desc
@@ -387,6 +387,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
                     <if test="defFlag != null  and defFlag != ''"> and t.def_flag = #{defFlag}</if>
                     <if test="startFiscalYear != null  and startFiscalYear != ''"> and t.fiscal_year &gt;= #{startFiscalYear}</if>
                     <if test="finishFiscalYear != null  and finishFiscalYear != ''"> and t.fiscal_year &lt;= #{finishFiscalYear}</if>
+                    <if test="idList != null  and idList.size() > 0">
+                        and t.id in
+                        <foreach collection="idList" item="item" index="index" separator=","  open=" (" close=")">
+                            #{item}
+                        </foreach>
+                    </if>
                     <!-- 数据范围过滤 -->
                     ${params.dataScope}
         ) d
@@ -599,7 +599,7 @@
         left join mc_ignition i on t.id= i.visit_id
         left join sys_user u on u.user_id = t.create_by
         left join sys_dept d on d.dept_id = t.company_code
-        where 1=1
+        where 1=1  and t.status_code !='CANCEL'
         <if test="ticketNumber != null  and ticketNumber != ''"> and t.ticket_number like concat('%', #{ticketNumber}, '%')</if>
         <if test="fiscalYear != null "> and t.fiscal_year = #{fiscalYear}</if>
         <if test="regionName != null  and regionName != ''"> and t.region_name like concat('%', #{regionName}, '%')</if>
@@ -712,6 +712,12 @@
         <if test="finishIgnTime != null and finishIgnTime != '' ">
             AND i.ign_time &lt;= #{startIgnTime}
         </if>
+        <if test="ignitionStatusCodeList != null  and ignitionStatusCodeList.size() > 0">
+            and i.status_code in
+            <foreach collection="ignitionStatusCodeList" item="item" index="index" separator=","  open=" (" close=")">
+                #{item}
+            </foreach>
+        </if>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         order by update_time desc
...	...	@@ -304,6 +304,11 @@ public class McVisitController extends BaseController {
304	304	@GetMapping("/chargedList")
305	305	public TableDataInfo chargedList(McVisitVo mcVisitVo) {
306	306	startPage();
	307	+ List<String> ignitionStatusCodeList = new ArrayList<String>();
	308	+ ignitionStatusCodeList.add("MAINTENANCE_YES");
	309	+ ignitionStatusCodeList.add("MAINTENANCE_NO");
	310	+ mcVisitVo.setIgnitionStatusCodeList(ignitionStatusCodeList);
	311	+
307	312	List<String> ticketTypeList = new ArrayList<String>();
308	313	ticketTypeList.add("2");
309	314	ticketTypeList.add("3");
...	...	@@ -326,6 +331,7 @@ public class McVisitController extends BaseController {
326	331	List<String> ticketTypeList = new ArrayList<String>();
327	332	ticketTypeList.add("1");
328	333	ticketTypeList.add("3");
	334	+
329	335	mcVisitVo.setTicketTypeList(ticketTypeList);
330	336	mcVisitVo.setDefFlag("0");
331	337	// mcVisitVo.setStatusCode("APPROVED");
...	...	@@ -396,6 +402,12 @@ public class McVisitController extends BaseController {
396	402	@RequirePermission("schsf:mcVisit:chargedListExport")
397	403	@PostMapping("/chargedListExport")
398	404	public void chargedListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException {
	405	+
	406	+ List<String> ignitionStatusCodeList = new ArrayList<String>();
	407	+ ignitionStatusCodeList.add("MAINTENANCE_YES");
	408	+ ignitionStatusCodeList.add("MAINTENANCE_NO");
	409	+ mcVisitVo.setIgnitionStatusCodeList(ignitionStatusCodeList);
	410	+
399	411	List<String> ticketTypeList = new ArrayList<String>();
400	412	ticketTypeList.add("2");
401	413	ticketTypeList.add("3");
...	...
...	...	@@ -2,6 +2,9 @@ package com.chinagas.modules.schsf.domain.vo;
2	2
3	3	import com.chinagas.modules.schsf.domain.McBasicMoney;
4	4
	5	+import java.util.ArrayList;
	6	+import java.util.List;
	7	+
5	8	public class McBasicMoneyVo extends McBasicMoney {
6	9	/** 开始财年 */
7	10	private Long startFiscalYear;
...	...	@@ -9,6 +12,11 @@ public class McBasicMoneyVo extends McBasicMoney {
9	12	/** 结束财年 */
10	13	private Long finishFiscalYear;
11	14
	15	+ /**
	16	+ * ids
	17	+ */
	18	+ private List<String> idList = new ArrayList<String>();
	19	+
12	20	public Long getStartFiscalYear() {
13	21	return startFiscalYear;
14	22	}
...	...	@@ -24,4 +32,13 @@ public class McBasicMoneyVo extends McBasicMoney {
24	32	public void setFinishFiscalYear(Long finishFiscalYear) {
25	33	this.finishFiscalYear = finishFiscalYear;
26	34	}
	35	+
	36	+ public List<String> getIdList() {
	37	+ return idList;
	38	+ }
	39	+
	40	+ public void setIdList(List<String> idList) {
	41	+ this.idList = idList;
	42	+ }
27	43	}
	44	+
...	...
...	...	@@ -77,6 +77,11 @@ public class McVisitVo extends McVisit {
77	77	private String finishIgnTime;
78	78
79	79
	80	+ private List<String> ignitionStatusCodeList = new ArrayList<String>();
	81	+
	82	+
	83	+
	84	+
80	85	public Long getStartFiscalYear() {
81	86	return startFiscalYear;
82	87	}
...	...	@@ -181,6 +186,14 @@ public class McVisitVo extends McVisit {
181	186	this.finishIgnTime = finishIgnTime;
182	187	}
183	188
	189	+ public List<String> getIgnitionStatusCodeList() {
	190	+ return ignitionStatusCodeList;
	191	+ }
	192	+
	193	+ public void setIgnitionStatusCodeList(List<String> ignitionStatusCodeList) {
	194	+ this.ignitionStatusCodeList = ignitionStatusCodeList;
	195	+ }
	196	+
184	197	@Override
185	198	public String toString() {
186	199	return "McVisitVo{" +
...	...	@@ -197,6 +210,7 @@ public class McVisitVo extends McVisit {
197	210	", idList=" + idList +
198	211	", startIgnTime='" + startIgnTime + '\'' +
199	212	", finishIgnTime='" + finishIgnTime + '\'' +
	213	+ ", ignitionStatusCodeList=" + ignitionStatusCodeList +
200	214	'}';
201	215	}
202	216	}
...	...
...	...	@@ -503,6 +503,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
503	503	<if test="defFlag != null and defFlag != ''"> and m.def_flag = #{defFlag}</if>
504	504	<if test="startFiscalYear != null and startFiscalYear != ''"> and m.fiscal_year >= #{startFiscalYear}</if>
505	505	<if test="finishFiscalYear != null and finishFiscalYear != ''"> and m.fiscal_year <= #{finishFiscalYear}</if>
	506	+ <if test="idList != null and idList.size() > 0">
	507	+ and m.id in
	508	+ <foreach collection="idList" item="item" index="index" separator="," open=" (" close=")">
	509	+ #{item}
	510	+ </foreach>
	511	+ </if>
506	512	${params.dataScope}
507	513	) d
508	514	ORDER BY d.update_time desc
...	...
...	...	@@ -387,6 +387,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
387	387	<if test="defFlag != null and defFlag != ''"> and t.def_flag = #{defFlag}</if>
388	388	<if test="startFiscalYear != null and startFiscalYear != ''"> and t.fiscal_year >= #{startFiscalYear}</if>
389	389	<if test="finishFiscalYear != null and finishFiscalYear != ''"> and t.fiscal_year <= #{finishFiscalYear}</if>
	390	+ <if test="idList != null and idList.size() > 0">
	391	+ and t.id in
	392	+ <foreach collection="idList" item="item" index="index" separator="," open=" (" close=")">
	393	+ #{item}
	394	+ </foreach>
	395	+ </if>
390	396	<!-- 数据范围过滤 -->
391	397	${params.dataScope}
392	398	) d
...	...
...	...	@@ -599,7 +599,7 @@
599	599	left join mc_ignition i on t.id= i.visit_id
600	600	left join sys_user u on u.user_id = t.create_by
601	601	left join sys_dept d on d.dept_id = t.company_code
602		- where 1=1
	602	+ where 1=1 and t.status_code !='CANCEL'
603	603	<if test="ticketNumber != null and ticketNumber != ''"> and t.ticket_number like concat('%', #{ticketNumber}, '%')</if>
604	604	<if test="fiscalYear != null "> and t.fiscal_year = #{fiscalYear}</if>
605	605	<if test="regionName != null and regionName != ''"> and t.region_name like concat('%', #{regionName}, '%')</if>
...	...	@@ -712,6 +712,12 @@
712	712	<if test="finishIgnTime != null and finishIgnTime != '' ">
713	713	AND i.ign_time <= #{startIgnTime}
714	714	</if>
	715	+ <if test="ignitionStatusCodeList != null and ignitionStatusCodeList.size() > 0">
	716	+ and i.status_code in
	717	+ <foreach collection="ignitionStatusCodeList" item="item" index="index" separator="," open=" (" close=")">
	718	+ #{item}
	719	+ </foreach>
	720	+ </if>
715	721	<!-- 数据范围过滤 -->
716	722	${params.dataScope}
717	723	order by update_time desc
...	...