diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
index 53e38c1..05e143b 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
@@ -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");
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicMoneyVo.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicMoneyVo.java
index 01c2d60..bee01b1 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicMoneyVo.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McBasicMoneyVo.java
@@ -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;
+    }
 }
+
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitVo.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitVo.java
index b3a75c8..0d5855e 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitVo.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitVo.java
@@ -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 +
                 '}';
     }
 }
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 3d7976e..0174c01 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
@@ -503,6 +503,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <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
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicMoneyMapper.xml b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicMoneyMapper.xml
index 5416f9a..829cddd 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicMoneyMapper.xml
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicMoneyMapper.xml
@@ -387,6 +387,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     <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
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
index 7652860..75c2027 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McVisitMapper.xml
@@ -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
--
libgit2 0.21.2