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 6eb588b..ded3d96 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
@@ -1,7 +1,10 @@
 package com.chinagas.modules.schsf.controller;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.util.MapUtils;
 import com.alibaba.excel.util.StringUtils;
+import com.alibaba.fastjson2.JSON;
 import com.chinagas.common.core.domain.AjaxResult;
 import com.chinagas.common.core.web.controller.BaseController;
 import com.chinagas.common.core.web.page.TableDataInfo;
@@ -10,7 +13,10 @@ import com.chinagas.common.log.enums.BusinessType;
 import com.chinagas.common.security.annotation.RequirePermission;
 import com.chinagas.common.security.enums.Logical;
 import com.chinagas.modules.schsf.domain.McVisit;
+import com.chinagas.modules.schsf.domain.McVisitAndIgnition;
+import com.chinagas.modules.schsf.domain.dto.ChargedListDto;
 import com.chinagas.modules.schsf.domain.dto.NodeUsersDto;
+import com.chinagas.modules.schsf.domain.dto.VisitListDto;
 import com.chinagas.modules.schsf.domain.vo.McVisitAuditVo;
 import com.chinagas.modules.schsf.domain.vo.McVisitModificationVo;
 import com.chinagas.modules.schsf.domain.vo.McVisitVo;
@@ -21,7 +27,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -86,14 +97,14 @@ public class McVisitController extends BaseController {
     }
 
     private AjaxResult getMcVisitValidate(McVisit mcVisit) {
-        if (StringUtils.isEmpty(mcVisit.getHasDm()) || !mcVisit.getHasDm().equals(YesNoEnums.Y.getName()) ){
+        if (StringUtils.isEmpty(mcVisit.getHasDm()) || !mcVisit.getHasDm().equals(YesNoEnums.Y.getName())) {
             //非决策人信息
             mcVisit.setHasDm("N");
             mcVisit.setDmAge(null);
             mcVisit.setDmIncomeSrc(null);
             mcVisit.setDmPhone(null);
         }
-        if (StringUtils.isEmpty(mcVisit.getIsCharged()) || !mcVisit.getIsCharged().equals(YesNoEnums.Y.getName()) ){
+        if (StringUtils.isEmpty(mcVisit.getIsCharged()) || !mcVisit.getIsCharged().equals(YesNoEnums.Y.getName())) {
             //不是收费
             mcVisit.setUserCode(null);
             mcVisit.setUserIdCard(null);
@@ -102,7 +113,7 @@ public class McVisitController extends BaseController {
             mcVisit.setPaymentMeth(null);
             mcVisit.setChargeType(null);
         }
-        if (StringUtils.isEmpty(mcVisit.getIsVisited()) || !mcVisit.getIsVisited().equals(YesNoEnums.Y.getName()) ){
+        if (StringUtils.isEmpty(mcVisit.getIsVisited()) || !mcVisit.getIsVisited().equals(YesNoEnums.Y.getName())) {
             //不是拜访
             mcVisit.setIsIntent(null);
             mcVisit.setHouseCondition(null);
@@ -116,7 +127,7 @@ public class McVisitController extends BaseController {
             mcVisit.setWaterHeaterStatus(null);
             mcVisit.setPvSystemStatus(null);
         }
-        if (StringUtils.isEmpty(mcVisit.getIsCharged()) && StringUtils.isEmpty(mcVisit.getIsVisited()) ) {
+        if (StringUtils.isEmpty(mcVisit.getIsCharged()) && StringUtils.isEmpty(mcVisit.getIsVisited())) {
             return AjaxResult.error("是否拜访 与 是否收费 不可同时为空");
         }
         if (BeanUtil.isEmpty(mcVisit)) {
@@ -237,8 +248,8 @@ public class McVisitController extends BaseController {
     }
 
     /**
-     *
      * 作废工作单
+     *
      * @param mcVisit
      * @return
      * @throws CloneNotSupportedException
@@ -256,11 +267,203 @@ public class McVisitController extends BaseController {
      *
      * @return
      */
-//    @RequirePermission("schsf:mcVisit:currentFiscalYear")
     @GetMapping(value = "getCurrentFiscalYear")
     public AjaxResult getCurrentFiscalYear() {
         return AjaxResult.success(mcVisitService.getCurrentFiscalYear());
     }
 
 
+    /**
+     * 拜访报表
+     *
+     * @param mcVisitVo
+     * @return
+     */
+    @GetMapping("/visitList")
+    public TableDataInfo visitList(McVisitVo mcVisitVo) {
+        startPage();
+        List<String> ticketTypeList = new ArrayList<String>();
+        ticketTypeList.add("1");
+        ticketTypeList.add("3");
+        mcVisitVo.setTicketTypeList(ticketTypeList);
+        mcVisitVo.setDefFlag("0");
+        mcVisitVo.setStatusCode("APPROVED");
+        List<McVisitAndIgnition> list = mcVisitService.selectMcVisitAndIgnitionList(mcVisitVo);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 收费报表
+     *
+     * @param mcVisitVo
+     * @return
+     */
+    @GetMapping("/chargedList")
+    public TableDataInfo chargedList(McVisitVo mcVisitVo) {
+        startPage();
+        List<String> ticketTypeList = new ArrayList<String>();
+        ticketTypeList.add("2");
+        ticketTypeList.add("3");
+        mcVisitVo.setTicketTypeList(ticketTypeList);
+        mcVisitVo.setDefFlag("0");
+        mcVisitVo.setStatusCode("APPROVED");
+        List<McVisitAndIgnition> list = mcVisitService.selectMcVisitAndIgnitionList(mcVisitVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 拜访报表-导出
+     *
+     * @param mcVisitVo
+     * @return
+     */
+    @PostMapping("/visitListExport")
+    public void visitListExport(McVisitVo mcVisitVo, HttpServletResponse response) throws IOException {
+        List<String> ticketTypeList = new ArrayList<String>();
+        ticketTypeList.add("1");
+        ticketTypeList.add("3");
+        mcVisitVo.setTicketTypeList(ticketTypeList);
+        mcVisitVo.setDefFlag("0");
+        mcVisitVo.setStatusCode("APPROVED");
+        List<McVisitAndIgnition> data = mcVisitService.selectMcVisitAndIgnitionList(mcVisitVo);
+        List<VisitListDto> list = new ArrayList<VisitListDto>();
+        for (McVisitAndIgnition datum : data) {
+            VisitListDto visitListDto = new VisitListDto(
+                    datum.getEntryTime(),
+                    datum.getBillingPersonName(),
+                    datum.getJobNature(),
+                    datum.getCompanyName(),
+                    datum.getUserProvince(),
+                    datum.getUserCity(),
+                    datum.getUserDistrict(),
+                    datum.getUserStreet(),
+                    datum.getVlgOrCmty(),
+                    datum.getUserDetailedAddress(),
+                    datum.getUserName(),
+                    datum.getUserPhone(),
+                    datum.getIsIntent(),
+                    datum.getHouseCondition(),
+                    datum.getCurrentCookingEnergy(),
+                    datum.getCurrentHeatingEnergy(),
+                    datum.getFamilyMembers(),
+                    datum.getFridgeStatus(),
+                    datum.getAcStatus(),
+                    datum.getTvStatus(),
+                    datum.getWasherStatus(),
+                    datum.getWaterHeaterStatus(),
+                    datum.getPvSystemStatus(),
+                    StringUtils.isNotBlank(datum.getHasDm()) && datum.getHasDm().equals("Y") ? "是" : "否",
+                    datum.getDmAge(),
+                    datum.getDmIncomeSrc(),
+                    datum.getDmPhone(),
+                    datum.getRemark(),
+                    datum.getUpdateTime()
+            );
+            list.add(visitListDto);
+        }
+        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(), VisitListDto.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));
+        }
+    }
+
+
+    /**
+     * 收费报表-导出
+     *
+     * @param mcVisitVo
+     * @return
+     */
+    @PostMapping("/chargedListExport")
+    public void chargedListExport(McVisitVo mcVisitVo, HttpServletResponse response) throws IOException {
+
+
+
+
+
+        List<String> ticketTypeList = new ArrayList<String>();
+        ticketTypeList.add("2");
+        ticketTypeList.add("3");
+        mcVisitVo.setTicketTypeList(ticketTypeList);
+        mcVisitVo.setDefFlag("0");
+        mcVisitVo.setStatusCode("APPROVED");
+        List<McVisitAndIgnition> data = mcVisitService.selectMcVisitAndIgnitionList(mcVisitVo);
+        List<ChargedListDto> list = new ArrayList<ChargedListDto>();
+        for (McVisitAndIgnition datum : data) {
+            String chargeType="其他";
+            if (StringUtils.isEmpty(datum.getChargeType())){
+                chargeType="其他";
+            }else  if (datum.getChargeType().equals("1")){
+                chargeType="定金";
+            }else  if (datum.getChargeType().equals("2")){
+                chargeType="全款";
+            }else  if (datum.getChargeType().equals("4")){
+                chargeType="分期";
+            }
+
+
+
+
+            ChargedListDto chargedListDto = new ChargedListDto(
+                    datum.getEntryTime(),
+                    datum.getBillingPersonName(),
+                    datum.getJobNature(),
+                    datum.getCompanyName(),
+                    datum.getUserProvince(),
+                    datum.getUserCity(),
+                    datum.getUserDistrict(),
+                    datum.getUserStreet(),
+                    datum.getVlgOrCmty(),
+                    datum.getUserDetailedAddress(),
+                    datum.getUserName(),
+                    datum.getUserPhone(),
+                    datum.getUserIdCard(),
+                    datum.getInvoiceNo(),
+                    datum.getChargeAmt(),
+                    datum.getPaymentMeth(),
+                    chargeType,
+                    StringUtils.isEmpty(datum.getIgnCnfStatusCode())?"-":datum.getIgnCnfStatusCode().equals("Y")?"是":"否",
+                    datum.getIgnTime(),
+                    datum.getnIgnRsn(),
+                    datum.getUpdateTime()
+            );
+            list.add(chargedListDto);
+        }
+        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(), ChargedListDto.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/domain/McVisitAndIgnition.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McVisitAndIgnition.java
new file mode 100644
index 0000000..3cbe8c2
--- /dev/null
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McVisitAndIgnition.java
@@ -0,0 +1,803 @@
+package com.chinagas.modules.schsf.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.chinagas.common.core.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 拜访工单对象 mc_visit
+ *
+ * @author cw
+ * @date 2024-05-30
+ */
+public class McVisitAndIgnition extends BaseEntity  implements Cloneable
+{
+
+    /** 主键id */
+    private Long id;
+
+    /** 工单单号 */
+    @ExcelProperty(value = "工单单号")
+    private String ticketNumber;
+
+    /** 财年 */
+    @ExcelProperty(value = "财年")
+    private Long fiscalYear;
+
+    /** 区域名称 */
+    @ExcelProperty(value = "区域名称")
+    private String regionName;
+
+    /** 集团名称 */
+    @ExcelProperty(value = "集团名称")
+    private String groupName;
+
+    /** 公司名称 */
+    @ExcelProperty(value = "公司名称")
+    private String companyName;
+
+    /** 公司代码 */
+    @ExcelProperty(value = "公司代码")
+    private String companyCode;
+
+    /** 收费人ID */
+    @ExcelProperty(value = "收费人ID")
+    private Long billingPersonId;
+
+    /** 收费人名称 */
+    @ExcelProperty(value = "收费人名称")
+    private String billingPersonName;
+
+    /** 收费人账号 */
+    @ExcelProperty(value = "收费人账号")
+    private String billingPersonAccount;
+
+    /** 工作性质(兼职/全职) */
+    @ExcelProperty(value = "工作性质(兼职/全职)")
+    private String jobNature;
+
+    /** 入户时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "入户时间")
+    private LocalDateTime entryTime;
+
+    /** 村(小区) */
+    @ExcelProperty(value = "村(小区)")
+    private String vlgOrCmty;
+
+    /** 城乡分类 */
+    @ExcelProperty(value = "城乡分类")
+    private String urbRurCls;
+
+    /** 客户-户名 */
+    @ExcelProperty(value = "客户-户名")
+    private String userName;
+
+    /** 客户-电话 */
+    @ExcelProperty(value = "客户-电话")
+    private String userPhone;
+
+    /** 客户-省 */
+    @ExcelProperty(value = "客户-省")
+    private String userProvince;
+
+    /** 客户-市 */
+    @ExcelProperty(value = "客户-市")
+    private String userCity;
+
+    /** 客户-区 */
+    @ExcelProperty(value = "客户-区")
+    private String userDistrict;
+
+    /** 客户-街道 */
+    @ExcelProperty(value = "客户-街道")
+    private String userStreet;
+
+    /** 客户-详细地址 */
+    @ExcelProperty(value = "客户-详细地址")
+    private String userDetailedAddress;
+
+
+
+
+
+
+
+    /** 是否获取决策人信息 */
+    @ExcelProperty(value = "是否获取决策人信息")
+    private String hasDm;
+
+    /** 决策人年龄 */
+    @ExcelProperty(value = "决策人年龄")
+    private String dmAge;
+
+    /** 决策人收入来源 */
+    @ExcelProperty(value = "决策人收入来源")
+    private String dmIncomeSrc;
+
+    /** 决策人联系方式 */
+    @ExcelProperty(value = "决策人联系方式")
+    private String dmPhone;
+
+
+
+
+
+
+    /** 是否收费 */
+    @ExcelProperty(value = "是否收费")
+    private String isCharged;
+
+    /** 客户-用户编号 */
+    @ExcelProperty(value = "客户-用户编号")
+    private String userCode;
+
+    /** 身份证号 */
+    @ExcelProperty(value = "身份证号")
+    private String userIdCard;
+
+    /** 票据单号 */
+    @ExcelProperty(value = "票据单号")
+    private String invoiceNo;
+
+    /** 收费金额(元) */
+    @ExcelProperty(value = "收费金额(元)")
+    private BigDecimal chargeAmt;
+
+    /** 缴费方式 */
+    @ExcelProperty(value = "缴费方式")
+    private String paymentMeth;
+
+    /** 收费类型 */
+    @ExcelProperty(value = "收费类型")
+    private String chargeType;
+
+
+
+
+    /** 是否拜访 */
+    @ExcelProperty(value = "是否拜访")
+    private String isVisited;
+
+    /** 是否有意向 */
+    @ExcelProperty(value = "是否有意向")
+    private String isIntent;
+
+    /** 房屋情况 */
+    @ExcelProperty(value = "房屋情况")
+    private String houseCondition;
+
+    /** 现用做饭能源 */
+    @ExcelProperty(value = "现用做饭能源")
+    private String currentCookingEnergy;
+
+    /** 现用取暖能源 */
+    @ExcelProperty(value = "现用取暖能源")
+    private String currentHeatingEnergy;
+
+    /** 家庭人口情况 */
+    @ExcelProperty(value = "家庭人口情况")
+    private String familyMembers;
+
+    /** 电冰箱 */
+    @ExcelProperty(value = "电冰箱")
+    private String fridgeStatus;
+
+    /** 空调 */
+    @ExcelProperty(value = "空调")
+    private String acStatus;
+
+    /** 电视 */
+    @ExcelProperty(value = "电视")
+    private String tvStatus;
+
+    /** 洗衣机 */
+    @ExcelProperty(value = "洗衣机")
+    private String washerStatus;
+
+    /** 热水器 */
+    @ExcelProperty(value = "热水器")
+    private String waterHeaterStatus;
+
+    /** 光伏 */
+    @ExcelProperty(value = "光伏")
+    private String pvSystemStatus;
+
+    /** 拜访_省 */
+    @ExcelProperty(value = "拜访_省")
+    private String visitProvince;
+
+    /** 拜访_市 */
+    @ExcelProperty(value = "拜访_市")
+    private String visitCity;
+
+    /** 拜访_区 */
+    @ExcelProperty(value = "拜访_区")
+    private String visitDistrict;
+
+    /** 拜访_街道 */
+    @ExcelProperty(value = "拜访_街道")
+    private String visitStreet;
+
+    /** 拜访_详细地址 */
+    @ExcelProperty(value = "拜访_详细地址")
+    private String visitDetailedAddress;
+
+    /** 拜访_经度 */
+    @ExcelProperty(value = "拜访_经度")
+    private BigDecimal visitLongitude;
+
+    /** 拜访_纬度 */
+    @ExcelProperty(value = "拜访_纬度")
+    private BigDecimal visitLatitude;
+
+    /** 拜访现场照片(文件id，逗号分隔) */
+    @ExcelProperty(value = "拜访现场照片(文件id，逗号分隔)")
+    private String fieldPhotoFile;
+
+    /** 附件(文件id，逗号分隔) */
+    @ExcelProperty(value = "附件(文件id，逗号分隔)")
+    private String attachmentFile;
+
+
+    /** 删除标志（0：未删除，1：已删除） */
+    @ExcelProperty(value = "删除标志")
+    private String defFlag;
+
+    /** 工单类型 */
+    @ExcelProperty(value = "工单类型")
+    private String ticketType;
+
+    /** 发布状态 */
+    private String publishStatus;
+    /** 修改状态 */
+    private String modificationStatus;
+    /** 状态节点名称 */
+    private String statusNodeName;
+
+    /** 状态名称 */
+    private String statusName;
+    /** 状态名称 */
+    private String statusCode;
+
+    /**
+     * 应收年份类型(往年应收/本年新增)
+     */
+    private String invoiceYearType;
+
+
+    /**
+     * 点火确认状态代码(NULL：未确认，Y：是，N：否)
+     */
+    @ExcelProperty(value = "点火确认状态代码(NULL：未确认，Y：是，N：否)")
+    private String ignCnfStatusCode;
+
+    /**
+     * 点火时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "点火时间")
+    private LocalDateTime ignTime;
+
+    /**
+     * 未点火原因
+     */
+    @ExcelProperty(value = "未点火原因")
+    private String nIgnRsn;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTicketNumber() {
+        return ticketNumber;
+    }
+
+    public void setTicketNumber(String ticketNumber) {
+        this.ticketNumber = ticketNumber;
+    }
+
+    public Long getFiscalYear() {
+        return fiscalYear;
+    }
+
+    public void setFiscalYear(Long fiscalYear) {
+        this.fiscalYear = fiscalYear;
+    }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public Long getBillingPersonId() {
+        return billingPersonId;
+    }
+
+    public void setBillingPersonId(Long billingPersonId) {
+        this.billingPersonId = billingPersonId;
+    }
+
+    public String getBillingPersonName() {
+        return billingPersonName;
+    }
+
+    public void setBillingPersonName(String billingPersonName) {
+        this.billingPersonName = billingPersonName;
+    }
+
+    public String getBillingPersonAccount() {
+        return billingPersonAccount;
+    }
+
+    public void setBillingPersonAccount(String billingPersonAccount) {
+        this.billingPersonAccount = billingPersonAccount;
+    }
+
+    public String getJobNature() {
+        return jobNature;
+    }
+
+    public void setJobNature(String jobNature) {
+        this.jobNature = jobNature;
+    }
+
+    public LocalDateTime getEntryTime() {
+        return entryTime;
+    }
+
+    public void setEntryTime(LocalDateTime entryTime) {
+        this.entryTime = entryTime;
+    }
+
+    public String getVlgOrCmty() {
+        return vlgOrCmty;
+    }
+
+    public void setVlgOrCmty(String vlgOrCmty) {
+        this.vlgOrCmty = vlgOrCmty;
+    }
+
+    public String getUrbRurCls() {
+        return urbRurCls;
+    }
+
+    public void setUrbRurCls(String urbRurCls) {
+        this.urbRurCls = urbRurCls;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserPhone() {
+        return userPhone;
+    }
+
+    public void setUserPhone(String userPhone) {
+        this.userPhone = userPhone;
+    }
+
+    public String getUserProvince() {
+        return userProvince;
+    }
+
+    public void setUserProvince(String userProvince) {
+        this.userProvince = userProvince;
+    }
+
+    public String getUserCity() {
+        return userCity;
+    }
+
+    public void setUserCity(String userCity) {
+        this.userCity = userCity;
+    }
+
+    public String getUserDistrict() {
+        return userDistrict;
+    }
+
+    public void setUserDistrict(String userDistrict) {
+        this.userDistrict = userDistrict;
+    }
+
+    public String getUserStreet() {
+        return userStreet;
+    }
+
+    public void setUserStreet(String userStreet) {
+        this.userStreet = userStreet;
+    }
+
+    public String getUserDetailedAddress() {
+        return userDetailedAddress;
+    }
+
+    public void setUserDetailedAddress(String userDetailedAddress) {
+        this.userDetailedAddress = userDetailedAddress;
+    }
+
+    public String getHasDm() {
+        return hasDm;
+    }
+
+    public void setHasDm(String hasDm) {
+        this.hasDm = hasDm;
+    }
+
+    public String getDmAge() {
+        return dmAge;
+    }
+
+    public void setDmAge(String dmAge) {
+        this.dmAge = dmAge;
+    }
+
+    public String getDmIncomeSrc() {
+        return dmIncomeSrc;
+    }
+
+    public void setDmIncomeSrc(String dmIncomeSrc) {
+        this.dmIncomeSrc = dmIncomeSrc;
+    }
+
+    public String getDmPhone() {
+        return dmPhone;
+    }
+
+    public void setDmPhone(String dmPhone) {
+        this.dmPhone = dmPhone;
+    }
+
+    public String getIsCharged() {
+        return isCharged;
+    }
+
+    public void setIsCharged(String isCharged) {
+        this.isCharged = isCharged;
+    }
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
+    public String getUserIdCard() {
+        return userIdCard;
+    }
+
+    public void setUserIdCard(String userIdCard) {
+        this.userIdCard = userIdCard;
+    }
+
+    public String getInvoiceNo() {
+        return invoiceNo;
+    }
+
+    public void setInvoiceNo(String invoiceNo) {
+        this.invoiceNo = invoiceNo;
+    }
+
+    public BigDecimal getChargeAmt() {
+        return chargeAmt;
+    }
+
+    public void setChargeAmt(BigDecimal chargeAmt) {
+        this.chargeAmt = chargeAmt;
+    }
+
+    public String getPaymentMeth() {
+        return paymentMeth;
+    }
+
+    public void setPaymentMeth(String paymentMeth) {
+        this.paymentMeth = paymentMeth;
+    }
+
+    public String getChargeType() {
+        return chargeType;
+    }
+
+    public void setChargeType(String chargeType) {
+        this.chargeType = chargeType;
+    }
+
+    public String getIsVisited() {
+        return isVisited;
+    }
+
+    public void setIsVisited(String isVisited) {
+        this.isVisited = isVisited;
+    }
+
+    public String getIsIntent() {
+        return isIntent;
+    }
+
+    public void setIsIntent(String isIntent) {
+        this.isIntent = isIntent;
+    }
+
+    public String getHouseCondition() {
+        return houseCondition;
+    }
+
+    public void setHouseCondition(String houseCondition) {
+        this.houseCondition = houseCondition;
+    }
+
+    public String getCurrentCookingEnergy() {
+        return currentCookingEnergy;
+    }
+
+    public void setCurrentCookingEnergy(String currentCookingEnergy) {
+        this.currentCookingEnergy = currentCookingEnergy;
+    }
+
+    public String getCurrentHeatingEnergy() {
+        return currentHeatingEnergy;
+    }
+
+    public void setCurrentHeatingEnergy(String currentHeatingEnergy) {
+        this.currentHeatingEnergy = currentHeatingEnergy;
+    }
+
+    public String getFamilyMembers() {
+        return familyMembers;
+    }
+
+    public void setFamilyMembers(String familyMembers) {
+        this.familyMembers = familyMembers;
+    }
+
+    public String getFridgeStatus() {
+        return fridgeStatus;
+    }
+
+    public void setFridgeStatus(String fridgeStatus) {
+        this.fridgeStatus = fridgeStatus;
+    }
+
+    public String getAcStatus() {
+        return acStatus;
+    }
+
+    public void setAcStatus(String acStatus) {
+        this.acStatus = acStatus;
+    }
+
+    public String getTvStatus() {
+        return tvStatus;
+    }
+
+    public void setTvStatus(String tvStatus) {
+        this.tvStatus = tvStatus;
+    }
+
+    public String getWasherStatus() {
+        return washerStatus;
+    }
+
+    public void setWasherStatus(String washerStatus) {
+        this.washerStatus = washerStatus;
+    }
+
+    public String getWaterHeaterStatus() {
+        return waterHeaterStatus;
+    }
+
+    public void setWaterHeaterStatus(String waterHeaterStatus) {
+        this.waterHeaterStatus = waterHeaterStatus;
+    }
+
+    public String getPvSystemStatus() {
+        return pvSystemStatus;
+    }
+
+    public void setPvSystemStatus(String pvSystemStatus) {
+        this.pvSystemStatus = pvSystemStatus;
+    }
+
+    public String getVisitProvince() {
+        return visitProvince;
+    }
+
+    public void setVisitProvince(String visitProvince) {
+        this.visitProvince = visitProvince;
+    }
+
+    public String getVisitCity() {
+        return visitCity;
+    }
+
+    public void setVisitCity(String visitCity) {
+        this.visitCity = visitCity;
+    }
+
+    public String getVisitDistrict() {
+        return visitDistrict;
+    }
+
+    public void setVisitDistrict(String visitDistrict) {
+        this.visitDistrict = visitDistrict;
+    }
+
+    public String getVisitStreet() {
+        return visitStreet;
+    }
+
+    public void setVisitStreet(String visitStreet) {
+        this.visitStreet = visitStreet;
+    }
+
+    public String getVisitDetailedAddress() {
+        return visitDetailedAddress;
+    }
+
+    public void setVisitDetailedAddress(String visitDetailedAddress) {
+        this.visitDetailedAddress = visitDetailedAddress;
+    }
+
+    public BigDecimal getVisitLongitude() {
+        return visitLongitude;
+    }
+
+    public void setVisitLongitude(BigDecimal visitLongitude) {
+        this.visitLongitude = visitLongitude;
+    }
+
+    public BigDecimal getVisitLatitude() {
+        return visitLatitude;
+    }
+
+    public void setVisitLatitude(BigDecimal visitLatitude) {
+        this.visitLatitude = visitLatitude;
+    }
+
+    public String getFieldPhotoFile() {
+        return fieldPhotoFile;
+    }
+
+    public void setFieldPhotoFile(String fieldPhotoFile) {
+        this.fieldPhotoFile = fieldPhotoFile;
+    }
+
+    public String getAttachmentFile() {
+        return attachmentFile;
+    }
+
+    public void setAttachmentFile(String attachmentFile) {
+        this.attachmentFile = attachmentFile;
+    }
+
+    public String getDefFlag() {
+        return defFlag;
+    }
+
+    public void setDefFlag(String defFlag) {
+        this.defFlag = defFlag;
+    }
+
+    public String getTicketType() {
+        return ticketType;
+    }
+
+    public void setTicketType(String ticketType) {
+        this.ticketType = ticketType;
+    }
+
+    public String getPublishStatus() {
+        return publishStatus;
+    }
+
+    public void setPublishStatus(String publishStatus) {
+        this.publishStatus = publishStatus;
+    }
+
+    public String getModificationStatus() {
+        return modificationStatus;
+    }
+
+    public void setModificationStatus(String modificationStatus) {
+        this.modificationStatus = modificationStatus;
+    }
+
+    public String getStatusNodeName() {
+        return statusNodeName;
+    }
+
+    public void setStatusNodeName(String statusNodeName) {
+        this.statusNodeName = statusNodeName;
+    }
+
+    public String getStatusName() {
+        return statusName;
+    }
+
+    public void setStatusName(String statusName) {
+        this.statusName = statusName;
+    }
+
+    public String getStatusCode() {
+        return statusCode;
+    }
+
+    public void setStatusCode(String statusCode) {
+        this.statusCode = statusCode;
+    }
+
+    public String getInvoiceYearType() {
+        return invoiceYearType;
+    }
+
+    public void setInvoiceYearType(String invoiceYearType) {
+        this.invoiceYearType = invoiceYearType;
+    }
+
+    public String getIgnCnfStatusCode() {
+        return ignCnfStatusCode;
+    }
+
+    public void setIgnCnfStatusCode(String ignCnfStatusCode) {
+        this.ignCnfStatusCode = ignCnfStatusCode;
+    }
+
+    public LocalDateTime getIgnTime() {
+        return ignTime;
+    }
+
+    public void setIgnTime(LocalDateTime ignTime) {
+        this.ignTime = ignTime;
+    }
+
+    public String getnIgnRsn() {
+        return nIgnRsn;
+    }
+
+    public void setnIgnRsn(String nIgnRsn) {
+        this.nIgnRsn = nIgnRsn;
+    }
+}
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/dto/ChargedListDto.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/dto/ChargedListDto.java
new file mode 100644
index 0000000..457b26e
--- /dev/null
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/dto/ChargedListDto.java
@@ -0,0 +1,354 @@
+package com.chinagas.modules.schsf.domain.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@ExcelIgnoreUnannotated
+public class ChargedListDto {
+    /**
+     * 入户时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "入户时间")
+    @ColumnWidth(26)
+    @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime entryTime;
+
+    /**
+     * 收费人名称
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "收费人员")
+    private String billingPersonName;
+
+
+    /**
+     * 工作性质(兼职/全职)
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "兼职/全职")
+    private String jobNature;
+
+    /**
+     * 公司名称
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "项目公司")
+    private String companyName;
+
+
+    /**
+     * 客户-省
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "省")
+    private String userProvince;
+
+    /**
+     * 客户-市
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "市")
+    private String userCity;
+
+    /**
+     * 客户-区
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "县/区")
+    private String userDistrict;
+
+    /**
+     * 客户-街道
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "乡镇/街道")
+    private String userStreet;
+
+    /**
+     * 村(小区)
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "村/小区")
+    private String vlgOrCmty;
+
+    /**
+     * 客户-详细地址
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "详细地址")
+    private String userDetailedAddress;
+
+
+    /**
+     * 客户-户名
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "户名")
+    private String userName;
+
+    /**
+     * 客户-电话
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "联系电话")
+    private String userPhone;
+
+    /** 身份证号 */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "身份证号")
+    private String userIdCard;
+
+    /** 票据单号 */
+    @ColumnWidth(20)
+    @ExcelProperty(value = {"收费阶段","票据单号"})
+    private String invoiceNo;
+
+    /** 收费金额(元) */
+    @ColumnWidth(20)
+    @ExcelProperty(value = {"收费阶段","收费金额(元)"})
+    private BigDecimal chargeAmt;
+
+    /** 缴费方式 */
+    @ColumnWidth(20)
+    @ExcelProperty(value = {"收费阶段","缴费方式"})
+    private String paymentMeth;
+
+    /** 收费类型 */
+    @ColumnWidth(20)
+    @ExcelProperty(value = {"收费阶段","收费类型"})
+    private String chargeType;
+
+
+
+    /**
+     * 点火确认状态代码(NULL：未确认，Y：是，N：否)
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "点火确认")
+    private String ignCnfStatusCode;
+
+    /**
+     * 点火时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "点火时间")
+    @ColumnWidth(26)
+    @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime ignTime;
+
+    /**
+     * 未点火原因
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "未点火原因")
+    private String nIgnRsn;
+
+
+    @ExcelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ColumnWidth(26)
+    @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    public LocalDateTime getEntryTime() {
+        return entryTime;
+    }
+
+    public void setEntryTime(LocalDateTime entryTime) {
+        this.entryTime = entryTime;
+    }
+
+    public String getBillingPersonName() {
+        return billingPersonName;
+    }
+
+    public void setBillingPersonName(String billingPersonName) {
+        this.billingPersonName = billingPersonName;
+    }
+
+    public String getJobNature() {
+        return jobNature;
+    }
+
+    public void setJobNature(String jobNature) {
+        this.jobNature = jobNature;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getUserProvince() {
+        return userProvince;
+    }
+
+    public void setUserProvince(String userProvince) {
+        this.userProvince = userProvince;
+    }
+
+    public String getUserCity() {
+        return userCity;
+    }
+
+    public void setUserCity(String userCity) {
+        this.userCity = userCity;
+    }
+
+    public String getUserDistrict() {
+        return userDistrict;
+    }
+
+    public void setUserDistrict(String userDistrict) {
+        this.userDistrict = userDistrict;
+    }
+
+    public String getUserStreet() {
+        return userStreet;
+    }
+
+    public void setUserStreet(String userStreet) {
+        this.userStreet = userStreet;
+    }
+
+    public String getVlgOrCmty() {
+        return vlgOrCmty;
+    }
+
+    public void setVlgOrCmty(String vlgOrCmty) {
+        this.vlgOrCmty = vlgOrCmty;
+    }
+
+    public String getUserDetailedAddress() {
+        return userDetailedAddress;
+    }
+
+    public void setUserDetailedAddress(String userDetailedAddress) {
+        this.userDetailedAddress = userDetailedAddress;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserPhone() {
+        return userPhone;
+    }
+
+    public void setUserPhone(String userPhone) {
+        this.userPhone = userPhone;
+    }
+
+    public String getUserIdCard() {
+        return userIdCard;
+    }
+
+    public void setUserIdCard(String userIdCard) {
+        this.userIdCard = userIdCard;
+    }
+
+    public String getInvoiceNo() {
+        return invoiceNo;
+    }
+
+    public void setInvoiceNo(String invoiceNo) {
+        this.invoiceNo = invoiceNo;
+    }
+
+    public BigDecimal getChargeAmt() {
+        return chargeAmt;
+    }
+
+    public void setChargeAmt(BigDecimal chargeAmt) {
+        this.chargeAmt = chargeAmt;
+    }
+
+    public String getPaymentMeth() {
+        return paymentMeth;
+    }
+
+    public void setPaymentMeth(String paymentMeth) {
+        this.paymentMeth = paymentMeth;
+    }
+
+    public String getChargeType() {
+        return chargeType;
+    }
+
+    public void setChargeType(String chargeType) {
+        this.chargeType = chargeType;
+    }
+
+    public String getIgnCnfStatusCode() {
+        return ignCnfStatusCode;
+    }
+
+    public void setIgnCnfStatusCode(String ignCnfStatusCode) {
+        this.ignCnfStatusCode = ignCnfStatusCode;
+    }
+
+    public LocalDateTime getIgnTime() {
+        return ignTime;
+    }
+
+    public void setIgnTime(LocalDateTime ignTime) {
+        this.ignTime = ignTime;
+    }
+
+    public String getnIgnRsn() {
+        return nIgnRsn;
+    }
+
+    public void setnIgnRsn(String nIgnRsn) {
+        this.nIgnRsn = nIgnRsn;
+    }
+
+    public LocalDateTime getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(LocalDateTime updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public ChargedListDto() {
+    }
+
+    public ChargedListDto(LocalDateTime entryTime, String billingPersonName, String jobNature, String companyName, String userProvince, String userCity, String userDistrict, String userStreet, String vlgOrCmty, String userDetailedAddress, String userName, String userPhone, String userIdCard, String invoiceNo, BigDecimal chargeAmt, String paymentMeth, String chargeType, String ignCnfStatusCode, LocalDateTime ignTime, String nIgnRsn, LocalDateTime updateTime) {
+        this.entryTime = entryTime;
+        this.billingPersonName = billingPersonName;
+        this.jobNature = jobNature;
+        this.companyName = companyName;
+        this.userProvince = userProvince;
+        this.userCity = userCity;
+        this.userDistrict = userDistrict;
+        this.userStreet = userStreet;
+        this.vlgOrCmty = vlgOrCmty;
+        this.userDetailedAddress = userDetailedAddress;
+        this.userName = userName;
+        this.userPhone = userPhone;
+        this.userIdCard = userIdCard;
+        this.invoiceNo = invoiceNo;
+        this.chargeAmt = chargeAmt;
+        this.paymentMeth = paymentMeth;
+        this.chargeType = chargeType;
+        this.ignCnfStatusCode = ignCnfStatusCode;
+        this.ignTime = ignTime;
+        this.nIgnRsn = nIgnRsn;
+        this.updateTime = updateTime;
+    }
+}
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/dto/VisitListDto.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/dto/VisitListDto.java
new file mode 100644
index 0000000..a5c7b3b
--- /dev/null
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/dto/VisitListDto.java
@@ -0,0 +1,544 @@
+package com.chinagas.modules.schsf.domain.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalDateTime;
+
+@ExcelIgnoreUnannotated
+public class VisitListDto {
+    /**
+     * 入户时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "入户时间")
+    @ColumnWidth(26)
+    @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime entryTime;
+
+    /**
+     * 收费人名称
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "收费人员")
+    private String billingPersonName;
+
+
+    /**
+     * 工作性质(兼职/全职)
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "兼职/全职")
+    private String jobNature;
+
+    /**
+     * 公司名称
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "项目公司")
+    private String companyName;
+
+
+    /**
+     * 客户-省
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "省")
+    private String userProvince;
+
+    /**
+     * 客户-市
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "市")
+    private String userCity;
+
+    /**
+     * 客户-区
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "县/区")
+    private String userDistrict;
+
+    /**
+     * 客户-街道
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "乡镇/街道")
+    private String userStreet;
+
+    /**
+     * 村(小区)
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "村/小区")
+    private String vlgOrCmty;
+
+    /**
+     * 客户-详细地址
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "详细地址")
+    private String userDetailedAddress;
+
+
+    /**
+     * 客户-户名
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "户名")
+    private String userName;
+
+    /**
+     * 客户-电话
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "联系电话")
+    private String userPhone;
+
+    /**
+     * 是否有意向
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "是否有意向")
+    private String isIntent;
+
+
+    /**
+     * 房屋情况
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "房屋情况")
+    private String houseCondition;
+
+    /**
+     * 现用做饭能源
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "现用做饭能源")
+    private String currentCookingEnergy;
+
+    /**
+     * 现用取暖能源
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "现用取暖能源")
+    private String currentHeatingEnergy;
+
+    /**
+     * 家庭人口情况
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "家庭人口情况")
+    private String familyMembers;
+
+    /**
+     * 电冰箱
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = {"家电配置", "电冰箱"})
+    private String fridgeStatus;
+
+    /**
+     * 空调
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = {"家电配置", "空调"})
+    private String acStatus;
+
+    /**
+     * 电视
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = {"家电配置", "电视"})
+    private String tvStatus;
+
+    /**
+     * 洗衣机
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = {"家电配置", "洗衣机"})
+    private String washerStatus;
+
+    /**
+     * 热水器
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = {"家电配置", "热水器"})
+    private String waterHeaterStatus;
+
+    /**
+     * 光伏
+     */
+    @ExcelProperty(value = {"家电配置", "光伏"})
+    private String pvSystemStatus;
+
+    /**
+     * 是否获取决策人信息
+     */
+    @ExcelProperty(value = "是否获取决策人信息")
+    private String hasDm;
+
+    /**
+     * 决策人年龄
+     */
+    @ExcelProperty(value = "决策人年龄")
+    private String dmAge;
+
+    /**
+     * 决策人收入来源
+     */
+    @ExcelProperty(value = "决策人收入来源")
+    private String dmIncomeSrc;
+
+    /**
+     * 决策人联系方式
+     */
+    @ExcelProperty(value = "决策人联系方式")
+    private String dmPhone;
+
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    @ExcelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ColumnWidth(26)
+    @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+
+    public LocalDateTime getEntryTime() {
+        return entryTime;
+    }
+
+    public void setEntryTime(LocalDateTime entryTime) {
+        this.entryTime = entryTime;
+    }
+
+    public String getBillingPersonName() {
+        return billingPersonName;
+    }
+
+    public void setBillingPersonName(String billingPersonName) {
+        this.billingPersonName = billingPersonName;
+    }
+
+    public String getJobNature() {
+        return jobNature;
+    }
+
+    public void setJobNature(String jobNature) {
+        this.jobNature = jobNature;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getUserProvince() {
+        return userProvince;
+    }
+
+    public void setUserProvince(String userProvince) {
+        this.userProvince = userProvince;
+    }
+
+    public String getUserCity() {
+        return userCity;
+    }
+
+    public void setUserCity(String userCity) {
+        this.userCity = userCity;
+    }
+
+    public String getUserDistrict() {
+        return userDistrict;
+    }
+
+    public void setUserDistrict(String userDistrict) {
+        this.userDistrict = userDistrict;
+    }
+
+    public String getUserStreet() {
+        return userStreet;
+    }
+
+    public void setUserStreet(String userStreet) {
+        this.userStreet = userStreet;
+    }
+
+
+    public String getVlgOrCmty() {
+        return vlgOrCmty;
+    }
+
+    public void setVlgOrCmty(String vlgOrCmty) {
+        this.vlgOrCmty = vlgOrCmty;
+    }
+
+    public String getUserDetailedAddress() {
+        return userDetailedAddress;
+    }
+
+    public void setUserDetailedAddress(String userDetailedAddress) {
+        this.userDetailedAddress = userDetailedAddress;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserPhone() {
+        return userPhone;
+    }
+
+    public void setUserPhone(String userPhone) {
+        this.userPhone = userPhone;
+    }
+
+    public String getIsIntent() {
+        return isIntent;
+    }
+
+    public void setIsIntent(String isIntent) {
+        this.isIntent = isIntent;
+    }
+
+    public String getHouseCondition() {
+        return houseCondition;
+    }
+
+    public void setHouseCondition(String houseCondition) {
+        this.houseCondition = houseCondition;
+    }
+
+    public String getCurrentCookingEnergy() {
+        return currentCookingEnergy;
+    }
+
+    public void setCurrentCookingEnergy(String currentCookingEnergy) {
+        this.currentCookingEnergy = currentCookingEnergy;
+    }
+
+    public String getCurrentHeatingEnergy() {
+        return currentHeatingEnergy;
+    }
+
+    public void setCurrentHeatingEnergy(String currentHeatingEnergy) {
+        this.currentHeatingEnergy = currentHeatingEnergy;
+    }
+
+    public String getFamilyMembers() {
+        return familyMembers;
+    }
+
+    public void setFamilyMembers(String familyMembers) {
+        this.familyMembers = familyMembers;
+    }
+
+    public String getFridgeStatus() {
+        return fridgeStatus;
+    }
+
+    public void setFridgeStatus(String fridgeStatus) {
+        this.fridgeStatus = fridgeStatus;
+    }
+
+    public String getAcStatus() {
+        return acStatus;
+    }
+
+    public void setAcStatus(String acStatus) {
+        this.acStatus = acStatus;
+    }
+
+    public String getTvStatus() {
+        return tvStatus;
+    }
+
+    public void setTvStatus(String tvStatus) {
+        this.tvStatus = tvStatus;
+    }
+
+    public String getWasherStatus() {
+        return washerStatus;
+    }
+
+    public void setWasherStatus(String washerStatus) {
+        this.washerStatus = washerStatus;
+    }
+
+    public String getWaterHeaterStatus() {
+        return waterHeaterStatus;
+    }
+
+    public void setWaterHeaterStatus(String waterHeaterStatus) {
+        this.waterHeaterStatus = waterHeaterStatus;
+    }
+
+    public String getPvSystemStatus() {
+        return pvSystemStatus;
+    }
+
+    public void setPvSystemStatus(String pvSystemStatus) {
+        this.pvSystemStatus = pvSystemStatus;
+    }
+
+    public String getHasDm() {
+        return hasDm;
+    }
+
+    public void setHasDm(String hasDm) {
+        this.hasDm = hasDm;
+    }
+
+    public String getDmAge() {
+        return dmAge;
+    }
+
+    public void setDmAge(String dmAge) {
+        this.dmAge = dmAge;
+    }
+
+    public String getDmIncomeSrc() {
+        return dmIncomeSrc;
+    }
+
+    public void setDmIncomeSrc(String dmIncomeSrc) {
+        this.dmIncomeSrc = dmIncomeSrc;
+    }
+
+    public String getDmPhone() {
+        return dmPhone;
+    }
+
+    public void setDmPhone(String dmPhone) {
+        this.dmPhone = dmPhone;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public LocalDateTime getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(LocalDateTime updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        return "visitListDto{" +
+                "entryTime=" + entryTime +
+                ", billingPersonName='" + billingPersonName + '\'' +
+                ", jobNature='" + jobNature + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", userProvince='" + userProvince + '\'' +
+                ", userCity='" + userCity + '\'' +
+                ", userDistrict='" + userDistrict + '\'' +
+                ", userStreet='" + userStreet + '\'' +
+                ", vlgOrCmty='" + vlgOrCmty + '\'' +
+                ", userDetailedAddress='" + userDetailedAddress + '\'' +
+                ", userName='" + userName + '\'' +
+                ", userPhone='" + userPhone + '\'' +
+                ", isIntent='" + isIntent + '\'' +
+                ", houseCondition='" + houseCondition + '\'' +
+                ", currentCookingEnergy='" + currentCookingEnergy + '\'' +
+                ", currentHeatingEnergy='" + currentHeatingEnergy + '\'' +
+                ", familyMembers='" + familyMembers + '\'' +
+                ", fridgeStatus='" + fridgeStatus + '\'' +
+                ", acStatus='" + acStatus + '\'' +
+                ", tvStatus='" + tvStatus + '\'' +
+                ", washerStatus='" + washerStatus + '\'' +
+                ", waterHeaterStatus='" + waterHeaterStatus + '\'' +
+                ", pvSystemStatus='" + pvSystemStatus + '\'' +
+                ", hasDm='" + hasDm + '\'' +
+                ", dmAge='" + dmAge + '\'' +
+                ", dmIncomeSrc='" + dmIncomeSrc + '\'' +
+                ", dmPhone='" + dmPhone + '\'' +
+                ", remark='" + remark + '\'' +
+                ", updateTime=" + updateTime +
+                '}';
+    }
+
+    public VisitListDto() {
+    }
+
+    public VisitListDto(
+            LocalDateTime entryTime,
+            String billingPersonName,
+            String jobNature,
+            String companyName,
+            String userProvince,
+            String userCity,
+            String userDistrict,
+            String userStreet,
+            String vlgOrCmty,
+            String userDetailedAddress,
+            String userName,
+            String userPhone,
+            String isIntent,
+            String houseCondition,
+            String currentCookingEnergy,
+            String currentHeatingEnergy,
+            String familyMembers,
+            String fridgeStatus,
+            String acStatus,
+            String tvStatus,
+            String washerStatus,
+            String waterHeaterStatus,
+            String pvSystemStatus,
+            String hasDm,
+            String dmAge,
+            String dmIncomeSrc,
+            String dmPhone,
+            String remark,
+            LocalDateTime updateTime) {
+        this.entryTime = entryTime;
+        this.billingPersonName = billingPersonName;
+        this.jobNature = jobNature;
+        this.companyName = companyName;
+        this.userProvince = userProvince;
+        this.userCity = userCity;
+        this.userDistrict = userDistrict;
+        this.userStreet = userStreet;
+        this.vlgOrCmty = vlgOrCmty;
+        this.userDetailedAddress = userDetailedAddress;
+        this.userName = userName;
+        this.userPhone = userPhone;
+        this.isIntent = isIntent;
+        this.houseCondition = houseCondition;
+        this.currentCookingEnergy = currentCookingEnergy;
+        this.currentHeatingEnergy = currentHeatingEnergy;
+        this.familyMembers = familyMembers;
+        this.fridgeStatus = fridgeStatus;
+        this.acStatus = acStatus;
+        this.tvStatus = tvStatus;
+        this.washerStatus = washerStatus;
+        this.waterHeaterStatus = waterHeaterStatus;
+        this.pvSystemStatus = pvSystemStatus;
+        this.hasDm = hasDm;
+        this.dmAge = dmAge;
+        this.dmIncomeSrc = dmIncomeSrc;
+        this.dmPhone = dmPhone;
+        this.remark = remark;
+        this.updateTime = updateTime;
+    }
+}
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 2a3c3a8..4ef1791 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
@@ -17,11 +17,50 @@ public class McVisitVo extends McVisit {
      */
     private Long finishFiscalYear;
 
+    /**
+     * 是否我的节点（待我审核）
+     */
     private String isMyAuditing;
 
+    /**
+     * 状态
+     */
     private List<HashMap> statusMapList = new ArrayList<HashMap>();
 
 
+    /**
+     * 工单类型
+     */
+    private List<String> ticketTypeList = new ArrayList<String>();
+
+
+    /**
+     * 入户时间-起始时间
+     */
+    private String startEntryTime;
+
+
+    /**
+     * 入户时间-结束时间
+     */
+    private String finishEntryTime;
+
+    /**
+     * 修改时间-起始时间
+     */
+    private String startUpdateTime;
+
+    /**
+     * 修改时间-起始时间
+     */
+    private String finishUpdateTime;
+
+    /**
+     * 点火确认状态代码(NULL：未确认，Y：是，N：否)
+     */
+    private String ignCnfStatusCode;
+
+
     public Long getStartFiscalYear() {
         return startFiscalYear;
     }
@@ -38,6 +77,13 @@ public class McVisitVo extends McVisit {
         this.finishFiscalYear = finishFiscalYear;
     }
 
+    public String getIsMyAuditing() {
+        return isMyAuditing;
+    }
+
+    public void setIsMyAuditing(String isMyAuditing) {
+        this.isMyAuditing = isMyAuditing;
+    }
 
     public List<HashMap> getStatusMapList() {
         return statusMapList;
@@ -47,12 +93,52 @@ public class McVisitVo extends McVisit {
         this.statusMapList = statusMapList;
     }
 
-    public String getIsMyAuditing() {
-        return isMyAuditing;
+    public List<String> getTicketTypeList() {
+        return ticketTypeList;
     }
 
-    public void setIsMyAuditing(String isMyAuditing) {
-        this.isMyAuditing = isMyAuditing;
+    public void setTicketTypeList(List<String> ticketTypeList) {
+        this.ticketTypeList = ticketTypeList;
+    }
+
+    public String getStartEntryTime() {
+        return startEntryTime;
+    }
+
+    public void setStartEntryTime(String startEntryTime) {
+        this.startEntryTime = startEntryTime;
+    }
+
+    public String getFinishEntryTime() {
+        return finishEntryTime;
+    }
+
+    public void setFinishEntryTime(String finishEntryTime) {
+        this.finishEntryTime = finishEntryTime;
+    }
+
+    public String getStartUpdateTime() {
+        return startUpdateTime;
+    }
+
+    public void setStartUpdateTime(String startUpdateTime) {
+        this.startUpdateTime = startUpdateTime;
+    }
+
+    public String getFinishUpdateTime() {
+        return finishUpdateTime;
+    }
+
+    public void setFinishUpdateTime(String finishUpdateTime) {
+        this.finishUpdateTime = finishUpdateTime;
+    }
+
+    public String getIgnCnfStatusCode() {
+        return ignCnfStatusCode;
+    }
+
+    public void setIgnCnfStatusCode(String ignCnfStatusCode) {
+        this.ignCnfStatusCode = ignCnfStatusCode;
     }
 
     @Override
@@ -62,6 +148,12 @@ public class McVisitVo extends McVisit {
                 ", finishFiscalYear=" + finishFiscalYear +
                 ", isMyAuditing='" + isMyAuditing + '\'' +
                 ", statusMapList=" + statusMapList +
+                ", ticketTypeList=" + ticketTypeList +
+                ", startEntryTime='" + startEntryTime + '\'' +
+                ", finishEntryTime='" + finishEntryTime + '\'' +
+                ", startUpdateTime='" + startUpdateTime + '\'' +
+                ", finishUpdateTime='" + finishUpdateTime + '\'' +
+                ", ignCnfStatusCode='" + ignCnfStatusCode + '\'' +
                 '}';
     }
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McVisitMapper.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McVisitMapper.java
index 0c31a94..6277ef0 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McVisitMapper.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McVisitMapper.java
@@ -1,6 +1,7 @@
 package com.chinagas.modules.schsf.mapper;
 
 import com.chinagas.modules.schsf.domain.McVisit;
+import com.chinagas.modules.schsf.domain.McVisitAndIgnition;
 import com.chinagas.modules.schsf.domain.dto.NodeUsersDto;
 import com.chinagas.modules.schsf.domain.vo.McVisitVo;
 import org.apache.ibatis.annotations.Param;
@@ -81,4 +82,11 @@ public interface McVisitMapper
      */
     List<McVisit> selectMcVisitByData(McVisit mcVisit);
 
+    /**
+     * 拜访+点火信息
+     *
+     * @param mcVisitVo
+     * @return
+     */
+    List<McVisitAndIgnition> selectMcVisitAndIgnitionList(McVisitVo mcVisitVo);
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java
index 61d5fe0..a7c1245 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java
@@ -1,6 +1,7 @@
 package com.chinagas.modules.schsf.service;
 
 import com.chinagas.modules.schsf.domain.McVisit;
+import com.chinagas.modules.schsf.domain.McVisitAndIgnition;
 import com.chinagas.modules.schsf.domain.dto.NodeUsersDto;
 import com.chinagas.modules.schsf.domain.vo.McVisitAuditVo;
 import com.chinagas.modules.schsf.domain.vo.McVisitModificationVo;
@@ -97,4 +98,12 @@ public interface IMcVisitService {
      */
     List<NodeUsersDto> selectStatusNodeUserList(Long id);
 
+    /**
+     * 查询拜访+点火维护信息
+     * @param mcVisitVo
+     * @return
+     */
+    List<McVisitAndIgnition> selectMcVisitAndIgnitionList(McVisitVo mcVisitVo);
+
+
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
index b484dda..f9279b9 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
@@ -9,10 +9,7 @@ import com.chinagas.common.core.utils.DateUtils;
 import com.chinagas.common.core.utils.StringUtils;
 import com.chinagas.common.datascope.annotation.DataScope;
 import com.chinagas.common.security.utils.SecurityUtils;
-import com.chinagas.modules.schsf.domain.McBasicCmty;
-import com.chinagas.modules.schsf.domain.McOperationLog;
-import com.chinagas.modules.schsf.domain.McVisit;
-import com.chinagas.modules.schsf.domain.McVisitStatusNodeInfo;
+import com.chinagas.modules.schsf.domain.*;
 import com.chinagas.modules.schsf.domain.dto.NodeUsersDto;
 import com.chinagas.modules.schsf.domain.notice.McVisitTemplate;
 import com.chinagas.modules.schsf.domain.vo.McVisitAuditVo;
@@ -627,6 +624,11 @@ public class McVisitServiceImpl implements IMcVisitService {
         return Collections.emptyList();
     }
 
+    @Override
+    public List<McVisitAndIgnition> selectMcVisitAndIgnitionList(McVisitVo mcVisitVo) {
+        return mcVisitMapper.selectMcVisitAndIgnitionList(mcVisitVo);
+    }
+
     /**
      * 消息通知
      *
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 b6fe4f0..3d9400e 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
@@ -73,6 +73,83 @@
         <result property="invoiceYearType" column="invoice_year_type"/>
     </resultMap>
 
+
+
+    <resultMap type="com.chinagas.modules.schsf.domain.McVisitAndIgnition" id="McVisitAndIgnition">
+        <result property="id"    column="id"    />
+        <result property="ticketNumber"    column="ticket_number"    />
+        <result property="fiscalYear"    column="fiscal_year"    />
+        <result property="regionName"    column="region_name"    />
+        <result property="groupName"    column="group_name"    />
+        <result property="companyName"    column="company_name"    />
+        <result property="companyCode"    column="company_code"    />
+        <result property="billingPersonId"    column="billing_person_id"    />
+        <result property="billingPersonName"    column="billing_person_name"    />
+        <result property="billingPersonAccount"    column="billing_person_account"    />
+        <result property="jobNature"    column="job_nature"    />
+        <result property="entryTime"    column="entry_time"    />
+        <result property="vlgOrCmty"    column="vlg_or_cmty"    />
+        <result property="urbRurCls"    column="urb_rur_cls"    />
+        <result property="userName"    column="user_name"    />
+        <result property="userPhone"    column="user_phone"    />
+        <result property="userProvince"    column="user_province"    />
+        <result property="userCity"    column="user_city"    />
+        <result property="userDistrict"    column="user_district"    />
+        <result property="userStreet"    column="user_street"    />
+        <result property="userDetailedAddress"    column="user_detailed_address"    />
+        <result property="hasDm"    column="has_dm"    />
+        <result property="dmAge"    column="dm_age"    />
+        <result property="dmIncomeSrc"    column="dm_income_src"    />
+        <result property="dmPhone"    column="dm_phone"    />
+        <result property="isCharged"    column="is_charged"    />
+        <result property="userCode"    column="user_code"    />
+        <result property="userIdCard"    column="user_id_card"    />
+        <result property="invoiceNo"    column="invoice_no"    />
+        <result property="chargeAmt"    column="charge_amt"    />
+        <result property="paymentMeth"    column="payment_meth"    />
+        <result property="chargeType"    column="charge_type"    />
+        <result property="isVisited"    column="is_visited"    />
+        <result property="isIntent"    column="is_intent"    />
+        <result property="houseCondition"    column="house_condition"    />
+        <result property="currentCookingEnergy"    column="current_cooking_energy"    />
+        <result property="currentHeatingEnergy"    column="current_heating_energy"    />
+        <result property="familyMembers"    column="family_members"    />
+        <result property="fridgeStatus"    column="fridge_status"    />
+        <result property="acStatus"    column="ac_status"    />
+        <result property="tvStatus"    column="tv_status"    />
+        <result property="washerStatus"    column="washer_status"    />
+        <result property="waterHeaterStatus"    column="water_heater_status"    />
+        <result property="pvSystemStatus"    column="pv_system_status"    />
+        <result property="visitProvince"    column="visit_province"    />
+        <result property="visitCity"    column="visit_city"    />
+        <result property="visitDistrict"    column="visit_district"    />
+        <result property="visitStreet"    column="visit_street"    />
+        <result property="visitDetailedAddress"    column="visit_detailed_address"    />
+        <result property="visitLongitude"    column="visit_longitude"    />
+        <result property="visitLatitude"    column="visit_latitude"    />
+        <result property="fieldPhotoFile"    column="field_photo_file"    />
+        <result property="attachmentFile"    column="attachment_file"    />
+        <result property="remark"    column="remark"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="defFlag"    column="def_flag"    />
+        <result property="ticketType"    column="ticket_type"    />
+        <result property="publishStatus"    column="publish_status"    />
+        <result property="modificationStatus"    column="modification_status"    />
+        <result property="statusNodeName"    column="status_node_name"    />
+        <result property="statusName"   column="status_name" />
+        <result property="statusCode"   column="status_code" />
+        <result property="invoiceYearType" column="invoice_year_type"/>
+
+        <result property="ignCnfStatusCode"    column="ign_cnf_status_code"    />
+        <result property="ignTime"    column="ign_time"    />
+        <result property="nIgnRsn"    column="n_ign_rsn"    />
+
+    </resultMap>
+
+
     <sql id="selectMcVisitVo">
         select t.id, t.ticket_number, t.fiscal_year, t.region_name, t.group_name, t.company_name, t.company_code,
                t.billing_person_id, t.billing_person_name, t.billing_person_account, t.job_nature, t.entry_time, t.vlg_or_cmty,
@@ -170,6 +247,13 @@
                     </foreach>
                 </if>
             </if>
+            <if test="ticketTypeList != null  and ticketTypeList != ''">
+                <foreach collection="ticketTypeList" item="item" index="index" separator="or"  open=" and (" close=")">
+                    t.ticket_type = #{item}
+                </foreach>
+            </if>
+            <if test="startEntryTime != null "> and t.entry_time &gt;= #{startEntryTime} </if>
+            <if test="finishEntryTime != null "> and t.entry_time &lt;= #{finishEntryTime} </if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
             order by t.update_time desc
@@ -490,4 +574,116 @@
         and (t.def_flag !='1' or t.status_code !='CANCEL')
         <if test="id != null ">and t.id != #{id} </if>
     </select>
+
+
+    <select id="selectMcVisitAndIgnitionList" parameterType="com.chinagas.modules.schsf.domain.vo.McVisitVo"  resultMap="McVisitAndIgnition">
+        select t.id, t.ticket_number, t.fiscal_year, t.region_name, t.group_name, t.company_name, t.company_code,
+        t.billing_person_id, t.billing_person_name, t.billing_person_account, t.job_nature, t.entry_time, t.vlg_or_cmty,
+        t.urb_rur_cls, t.user_name, t.user_phone, t.user_province, t.user_city,
+        t.user_district, t.user_street, t.user_detailed_address, t.has_dm, t.dm_age,
+        t.dm_income_src, t.dm_phone, t.is_charged, t.user_code, t.user_id_card,
+        t.invoice_no, t.charge_amt, t.payment_meth, t.charge_type, t.is_visited,
+        t.is_intent, t.house_condition, t.current_cooking_energy, t.current_heating_energy,
+        t.family_members, t.fridge_status, t.ac_status, t.tv_status, t.washer_status,
+        t.water_heater_status, t.pv_system_status, t.visit_province, t.visit_city,
+        t.visit_district, t.visit_street, t.visit_detailed_address,
+        t.visit_longitude, t.visit_latitude,
+        t.field_photo_file, t.attachment_file, t.remark, t.create_time, t.create_by,
+        t.update_by, t.def_flag, t.ticket_type, t.publish_status,
+        t.modification_status, t.status_node_name,t.status_name,t.status_code,t.invoice_year_type,
+        i.ign_cnf_status_code,i.ign_time,i.n_ign_rsn,
+        CASE WHEN i.update_time is null  THEN	t.update_time
+        WHEN t.update_time > i.update_time  THEN	t.update_time
+        ELSE i.update_time END update_time
+        from mc_visit t
+        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
+        <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>
+        <if test="groupName != null  and groupName != ''"> and t.group_name like concat('%', #{groupName}, '%')</if>
+        <if test="companyName != null  and companyName != ''"> and t.company_name like concat('%', #{companyName}, '%')</if>
+        <if test="companyCode != null  and companyCode != ''"> and t.company_code = #{companyCode}</if>
+        <if test="billingPersonId != null "> and t.billing_person_id = #{billingPersonId}</if>
+        <if test="billingPersonName != null  and billingPersonName != ''"> and t.billing_person_name like concat('%', #{billingPersonName}, '%')</if>
+        <if test="billingPersonAccount != null  and billingPersonAccount != ''"> and t.billing_person_account = #{billingPersonAccount}</if>
+        <if test="jobNature != null  and jobNature != ''"> and t.job_nature = #{jobNature}</if>
+        <if test="entryTime != null "> and t.entry_time = #{entryTime}</if>
+        <if test="vlgOrCmty != null  and vlgOrCmty != ''"> and t.vlg_or_cmty = #{vlgOrCmty}</if>
+        <if test="urbRurCls != null  and urbRurCls != ''"> and t.urb_rur_cls = #{urbRurCls}</if>
+        <if test="userName != null  and userName != ''"> and t.user_name like concat('%', #{userName}, '%')</if>
+        <if test="userPhone != null  and userPhone != ''"> and t.user_phone = #{userPhone}</if>
+        <if test="userProvince != null  and userProvince != ''"> and t.user_province = #{userProvince}</if>
+        <if test="userCity != null  and userCity != ''"> and t.user_city = #{userCity}</if>
+        <if test="userDistrict != null  and userDistrict != ''"> and t.user_district = #{userDistrict}</if>
+        <if test="userStreet != null  and userStreet != ''"> and t.user_street = #{userStreet}</if>
+        <if test="userDetailedAddress != null  and userDetailedAddress != ''"> and t.user_detailed_address = #{userDetailedAddress}</if>
+        <if test="hasDm != null  and hasDm != ''"> and t.has_dm = #{hasDm}</if>
+        <if test="dmAge != null  and dmAge != ''"> and t.dm_age = #{dmAge}</if>
+        <if test="dmIncomeSrc != null  and dmIncomeSrc != ''"> and t.dm_income_src = #{dmIncomeSrc}</if>
+        <if test="dmPhone != null  and dmPhone != ''"> and t.dm_phone = #{dmPhone}</if>
+        <if test="isCharged != null  and isCharged != ''"> and t.is_charged = #{isCharged}</if>
+        <if test="userCode != null  and userCode != ''"> and t.user_code = #{userCode}</if>
+        <if test="userIdCard != null  and userIdCard != ''"> and t.user_id_card  like concat('%', #{userIdCard}, '%')</if>
+        <if test="invoiceNo != null  and invoiceNo != ''"> and t.invoice_no = #{invoiceNo}</if>
+        <if test="chargeAmt != null "> and  t.charge_amt = #{chargeAmt}</if>
+        <if test="paymentMeth != null  and paymentMeth != ''"> and t.payment_meth = #{paymentMeth}</if>
+        <if test="chargeType != null  and chargeType != ''"> and t.charge_type = #{chargeType}</if>
+        <if test="isVisited != null  and isVisited != ''"> and t.is_visited = #{isVisited}</if>
+        <if test="isIntent != null  and isIntent != ''"> and t.is_intent = #{isIntent}</if>
+        <if test="houseCondition != null  and houseCondition != ''"> and t.house_condition = #{houseCondition}</if>
+        <if test="currentCookingEnergy != null  and currentCookingEnergy != ''"> and t.current_cooking_energy = #{currentCookingEnergy}</if>
+        <if test="currentHeatingEnergy != null  and currentHeatingEnergy != ''"> and t.current_heating_energy = #{currentHeatingEnergy}</if>
+        <if test="familyMembers != null  and familyMembers != ''"> and t.family_members = #{familyMembers}</if>
+        <if test="fridgeStatus != null  and fridgeStatus != ''"> and t.fridge_status = #{fridgeStatus}</if>
+        <if test="acStatus != null  and acStatus != ''"> and t.ac_status = #{acStatus}</if>
+        <if test="tvStatus != null  and tvStatus != ''"> and t.tv_status = #{tvStatus}</if>
+        <if test="washerStatus != null  and washerStatus != ''"> and t.washer_status = #{washerStatus}</if>
+        <if test="waterHeaterStatus != null  and waterHeaterStatus != ''"> and t.water_heater_status = #{waterHeaterStatus}</if>
+        <if test="pvSystemStatus != null  and pvSystemStatus != ''"> and t.pv_system_status = #{pvSystemStatus}</if>
+        <if test="visitProvince != null  and visitProvince != ''"> and t.visit_province = #{visitProvince}</if>
+        <if test="visitCity != null  and visitCity != ''"> and t.visit_city = #{visitCity}</if>
+        <if test="visitDistrict != null  and visitDistrict != ''"> and t.visit_district = #{visitDistrict}</if>
+        <if test="visitStreet != null  and visitStreet != ''"> and t.visit_street = #{visitStreet}</if>
+        <if test="visitDetailedAddress != null  and visitDetailedAddress != ''"> and t.visit_detailed_address = #{visitDetailedAddress}</if>
+        <if test="visitLongitude != null "> and t.visit_longitude = #{visitLongitude}</if>
+        <if test="visitLatitude != null "> and t.visit_latitude = #{visitLatitude}</if>
+        <if test="fieldPhotoFile != null  and fieldPhotoFile != ''"> and t.field_photo_file = #{fieldPhotoFile}</if>
+        <if test="attachmentFile != null  and attachmentFile != ''"> and t.attachment_file = #{attachmentFile}</if>
+        <if test="defFlag != null  and defFlag != ''"> and t.def_flag = #{defFlag}</if>
+        <if test="ticketType != null  and ticketType != ''"> and t.ticket_type = #{ticketType}</if>
+        <if test="publishStatus != null  and publishStatus != ''"> and t.publish_status = #{publishStatus}</if>
+        <if test="modificationStatus != null  and modificationStatus != ''"> and t.modification_status = #{modificationStatus}</if>
+        <if test="statusNodeName != null  and statusNodeName != ''"> and t.status_node_name = #{statusNodeName} </if>
+        <if test="statusName != null  and statusName != ''"> and t.status_name = #{statusName} </if>
+        <if test="statusCode != null  and statusCode != ''"> and t.status_code = #{statusCode} </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="invoiceYearType != null  and invoiceYearType != ''"> and t.invoice_year_type = #{invoiceYearType}</if>
+        <if test="isMyAuditing != null  and isMyAuditing != ''">
+            <if test="statusMapList != null and statusMapList.size() > 0">
+                <foreach collection="statusMapList" item="item" index="index" separator="or" open=" and (" close=")">
+                    <if test="item.publishStatus != null  and item.publishStatus != ''">
+                        t.publish_status = #{item.publishStatus}
+                    </if>
+                    <if test="item.modificationStatus != null  and item.modificationStatus != ''">
+                        t.modification_status = #{item.modificationStatus}
+                    </if>
+                </foreach>
+            </if>
+        </if>
+        <if test="ticketTypeList != null  and ticketTypeList != ''">
+            <foreach collection="ticketTypeList" item="item" index="index" separator="or"  open=" and (" close=")">
+                t.ticket_type = #{item}
+            </foreach>
+        </if>
+        <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>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by t.update_time desc
+    </select>
 </mapper>
--
libgit2 0.21.2