update

陈威
1 parent 8973c55d
Showing 3 changed files with 52 additions and 3 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/McVisitVo.java
zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
@@ -319,7 +319,7 @@ public class McVisitController extends BaseController {
      * @return
      */
     @PostMapping("/visitListExport")
-    public void visitListExport(McVisitVo mcVisitVo, HttpServletResponse response) throws IOException {
+    public void visitListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException {
         List<String> ticketTypeList = new ArrayList<String>();
         ticketTypeList.add("1");
         ticketTypeList.add("3");
@@ -391,7 +391,7 @@ public class McVisitController extends BaseController {
      * @return
      */
     @PostMapping("/chargedListExport")
-    public void chargedListExport(McVisitVo mcVisitVo, HttpServletResponse response) throws IOException {
+    public void chargedListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException {
         List<String> ticketTypeList = new ArrayList<String>();
         ticketTypeList.add("2");
         ticketTypeList.add("3");
@@ -61,6 +61,22 @@ public class McVisitVo extends McVisit {
     private String ignCnfStatusCode;
  
  
+    /**
+     * ids
+     */
+    private List<String> idList = new ArrayList<String>();
+
+    /**
+     * 点火时间-开始时间
+     */
+    private String startIgnTime;
+
+    /**
+     * 点火时间-结束时间
+     */
+    private String finishIgnTime;
+
+
     public Long getStartFiscalYear() {
         return startFiscalYear;
     }
@@ -141,6 +157,30 @@ public class McVisitVo extends McVisit {
         this.ignCnfStatusCode = ignCnfStatusCode;
     }
  
+    public List<String> getIdList() {
+        return idList;
+    }
+
+    public void setIdList(List<String> idList) {
+        this.idList = idList;
+    }
+
+    public String getStartIgnTime() {
+        return startIgnTime;
+    }
+
+    public void setStartIgnTime(String startIgnTime) {
+        this.startIgnTime = startIgnTime;
+    }
+
+    public String getFinishIgnTime() {
+        return finishIgnTime;
+    }
+
+    public void setFinishIgnTime(String finishIgnTime) {
+        this.finishIgnTime = finishIgnTime;
+    }
+
     @Override
     public String toString() {
         return "McVisitVo{" +
@@ -154,6 +194,9 @@ public class McVisitVo extends McVisit {
                 ", startUpdateTime='" + startUpdateTime + '\'' +
                 ", finishUpdateTime='" + finishUpdateTime + '\'' +
                 ", ignCnfStatusCode='" + ignCnfStatusCode + '\'' +
+                ", idList=" + idList +
+                ", startIgnTime='" + startIgnTime + '\'' +
+                ", finishIgnTime='" + finishIgnTime + '\'' +
                 '}';
     }
 }
@@ -674,7 +674,7 @@
                 </foreach>
             </if>
         </if>
-        <if test="ticketTypeList != null  and ticketTypeList != ''">
+        <if test="ticketTypeList != null  and ticketTypeList.size() > 0">
             <foreach collection="ticketTypeList" item="item" index="index" separator="or"  open=" and (" close=")">
                 t.ticket_type = #{item}
             </foreach>
@@ -682,6 +682,12 @@
         <if test="startEntryTime != null "> and t.entry_time &gt;= #{startEntryTime} </if>
         <if test="finishEntryTime != null "> and t.entry_time &lt;= #{finishEntryTime} </if>
         <if test="ignCnfStatusCode != null  and ignCnfStatusCode != ''"> and i.ign_cnf_status_code = #{ignCnfStatusCode}</if>
+        <if test="idList != null  and idList.size() > 0">
+            t.id in
+            <foreach collection="idList" item="item" index="index" separator=","  open=" and (" close=")">
+                #{item}
+            </foreach>
+        </if>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         order by t.update_time desc
...	...	@@ -319,7 +319,7 @@ public class McVisitController extends BaseController {
319	319	* @return
320	320	*/
321	321	@PostMapping("/visitListExport")
322		- public void visitListExport(McVisitVo mcVisitVo, HttpServletResponse response) throws IOException {
	322	+ public void visitListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException {
323	323	List<String> ticketTypeList = new ArrayList<String>();
324	324	ticketTypeList.add("1");
325	325	ticketTypeList.add("3");
...	...	@@ -391,7 +391,7 @@ public class McVisitController extends BaseController {
391	391	* @return
392	392	*/
393	393	@PostMapping("/chargedListExport")
394		- public void chargedListExport(McVisitVo mcVisitVo, HttpServletResponse response) throws IOException {
	394	+ public void chargedListExport(@RequestBody McVisitVo mcVisitVo, HttpServletResponse response) throws IOException {
395	395	List<String> ticketTypeList = new ArrayList<String>();
396	396	ticketTypeList.add("2");
397	397	ticketTypeList.add("3");
...	...
...	...	@@ -61,6 +61,22 @@ public class McVisitVo extends McVisit {
61	61	private String ignCnfStatusCode;
62	62
63	63
	64	+ /**
	65	+ * ids
	66	+ */
	67	+ private List<String> idList = new ArrayList<String>();
	68	+
	69	+ /**
	70	+ * 点火时间-开始时间
	71	+ */
	72	+ private String startIgnTime;
	73	+
	74	+ /**
	75	+ * 点火时间-结束时间
	76	+ */
	77	+ private String finishIgnTime;
	78	+
	79	+
64	80	public Long getStartFiscalYear() {
65	81	return startFiscalYear;
66	82	}
...	...	@@ -141,6 +157,30 @@ public class McVisitVo extends McVisit {
141	157	this.ignCnfStatusCode = ignCnfStatusCode;
142	158	}
143	159
	160	+ public List<String> getIdList() {
	161	+ return idList;
	162	+ }
	163	+
	164	+ public void setIdList(List<String> idList) {
	165	+ this.idList = idList;
	166	+ }
	167	+
	168	+ public String getStartIgnTime() {
	169	+ return startIgnTime;
	170	+ }
	171	+
	172	+ public void setStartIgnTime(String startIgnTime) {
	173	+ this.startIgnTime = startIgnTime;
	174	+ }
	175	+
	176	+ public String getFinishIgnTime() {
	177	+ return finishIgnTime;
	178	+ }
	179	+
	180	+ public void setFinishIgnTime(String finishIgnTime) {
	181	+ this.finishIgnTime = finishIgnTime;
	182	+ }
	183	+
144	184	@Override
145	185	public String toString() {
146	186	return "McVisitVo{" +
...	...	@@ -154,6 +194,9 @@ public class McVisitVo extends McVisit {
154	194	", startUpdateTime='" + startUpdateTime + '\'' +
155	195	", finishUpdateTime='" + finishUpdateTime + '\'' +
156	196	", ignCnfStatusCode='" + ignCnfStatusCode + '\'' +
	197	+ ", idList=" + idList +
	198	+ ", startIgnTime='" + startIgnTime + '\'' +
	199	+ ", finishIgnTime='" + finishIgnTime + '\'' +
157	200	'}';
158	201	}
159	202	}
...	...
...	...	@@ -674,7 +674,7 @@
674	674	</foreach>
675	675	</if>
676	676	</if>
677		- <if test="ticketTypeList != null and ticketTypeList != ''">
	677	+ <if test="ticketTypeList != null and ticketTypeList.size() > 0">
678	678	<foreach collection="ticketTypeList" item="item" index="index" separator="or" open=" and (" close=")">
679	679	t.ticket_type = #{item}
680	680	</foreach>
...	...	@@ -682,6 +682,12 @@
682	682	<if test="startEntryTime != null "> and t.entry_time >= #{startEntryTime} </if>
683	683	<if test="finishEntryTime != null "> and t.entry_time <= #{finishEntryTime} </if>
684	684	<if test="ignCnfStatusCode != null and ignCnfStatusCode != ''"> and i.ign_cnf_status_code = #{ignCnfStatusCode}</if>
	685	+ <if test="idList != null and idList.size() > 0">
	686	+ t.id in
	687	+ <foreach collection="idList" item="item" index="index" separator="," open=" and (" close=")">
	688	+ #{item}
	689	+ </foreach>
	690	+ </if>
685	691	<!-- 数据范围过滤 -->
686	692	${params.dataScope}
687	693	order by t.update_time desc
...	...