Merge remote-tracking branch 'origin/master'

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbGlkgController.java

@@ -117,9 +117,9 @@ public class BusJcbGlkgController extends BaseController {
         WordUtils wordUtil = new WordUtils();
         //填充变量
         Map<String, Object> params = new HashMap<>();
-        params.put("${kgh}", info.getKgbh());
-        params.put("${qj}", info.getStationName());
-        params.put("${wd}", info.getTemperature());
+        params.put("${kgh}", info.getKgbh() == null ? "" : info.getKgbh());
+        params.put("${qj}", info.getStationName() == null ? "" : info.getStationName());
+        params.put("${wd}", info.getTemperature() == null ? "" : info.getTemperature());
         params.put("${jcrq}", DateUtils.parseCheckDate(info.getCheckDate()));
         params.put("${jgxA}", StringUtils.yesOrNo(info.getJgxA()));
         params.put("${jgxB}", StringUtils.yesOrNo(info.getJgxB()));
@@ -151,9 +151,9 @@ public class BusJcbGlkgController extends BaseController {
         params.put("${kgjgxjdztA}", StringUtils.yesOrNo(info.getKgjgxjdztA()));
         params.put("${kgjgxjdztDzz}", StringUtils.getSlash(info.getKgjgxjdztDzz()));
         params.put("${sbzt}", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
-        params.put("${jcr}", info.getCheckUser());
-        params.put("${qrr}", info.getConfirmUser());
-        params.put("${czwt}", info.getCzwt());
+        params.put("${jcr}", info.getCheckUser() == null ? "" : info.getCheckUser());
+        params.put("${qrr}", info.getConfirmUser() == null ? "" : info.getConfirmUser());
+        params.put("${czwt}", info.getCzwt() == null ? "" : info.getCzwt());
 
         //生成word文件的文件名
         String fileName = "隔离开关手册.docx";

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcebController.java

@@ -3,6 +3,12 @@ package com.railway.web.controller.business.catenary;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebTypeEnum;
+import com.railway.business.catenary.service.IBusJcbBlqService;
+import com.railway.business.catenary.service.IBusJcbDmcgyqService;
+import com.railway.business.catenary.service.IBusJcbFdfxjyqService;
+import com.railway.business.catenary.service.IBusJcbGlkgService;
+import com.railway.business.catenary.service.IBusJcbJcxcService;
+import com.railway.business.catenary.service.IBusJcbWjcxcService;
 import com.railway.business.catenary.service.IBusJcebGjsfxService;
 import com.railway.business.catenary.service.IBusJcebJddzService;
 import com.railway.business.catenary.service.IBusJcebJyzqsjlService;
@@ -39,19 +45,38 @@ public class BusJcebController extends BaseController {
   private final IBusJcebJddzService jddzService;
   private final IBusJcebGjsfxService gjsfxService;
 
+  private final IBusJcbBlqService blqService;
+  private final IBusJcbDmcgyqService dmcgyqService;
+  private final IBusJcbFdfxjyqService fdfxjyqService;
+  private final IBusJcbGlkgService glkgService;
+  private final IBusJcbJcxcService jcxcService;
+  private final IBusJcbWjcxcService wjcxcService;
+
   public BusJcebController(
       IBusJcebXsjcjlService xsjcjlService,
       IBusJcebQmjcjlService qmjcjlService,
       IBusJcebLbjghjlService lbjghjlService,
       IBusJcebJyzqsjlService jyzqsjlService,
       IBusJcebJddzService jddzService,
-      IBusJcebGjsfxService gjsfxService) {
+      IBusJcebGjsfxService gjsfxService,
+      IBusJcbBlqService blqService,
+      IBusJcbDmcgyqService dmcgyqService,
+      IBusJcbFdfxjyqService fdfxjyqService,
+      IBusJcbGlkgService glkgService,
+      IBusJcbJcxcService jcxcService,
+      IBusJcbWjcxcService wjcxcService) {
     this.xsjcjlService = xsjcjlService;
     this.qmjcjlService = qmjcjlService;
     this.lbjghjlService = lbjghjlService;
     this.jyzqsjlService = jyzqsjlService;
     this.jddzService = jddzService;
     this.gjsfxService = gjsfxService;
+    this.blqService = blqService;
+    this.dmcgyqService = dmcgyqService;
+    this.fdfxjyqService = fdfxjyqService;
+    this.glkgService = glkgService;
+    this.jcxcService = jcxcService;
+    this.wjcxcService = wjcxcService;
   }
 
 
@@ -88,6 +113,24 @@ public class BusJcebController extends BaseController {
       case Lbjghjl:
         list = lbjghjlService.getListByType(query);
         break;
+      case Blq:
+        list = blqService.getListByType(query);
+        break;
+      case Dmcgyq:
+        list = dmcgyqService.getListByType(query);
+        break;
+      case Fdfxjyq:
+        list = fdfxjyqService.getListByType(query);
+        break;
+      case Glkg:
+        list = glkgService.getListByType(query);
+        break;
+      case Jcxc:
+        list = jcxcService.getListByType(query);
+        break;
+      case Wjcxc:
+        list = wjcxcService.getListByType(query);
+        break;
       default:
         break;
     }
@@ -120,6 +163,24 @@ public class BusJcebController extends BaseController {
         case Lbjghjl:
           jcebRecordVo = lbjghjlService.getCountByType(query);
           break;
+        case Blq:
+          jcebRecordVo = blqService.getCountByType(query);
+          break;
+        case Dmcgyq:
+          jcebRecordVo = dmcgyqService.getCountByType(query);
+          break;
+        case Fdfxjyq:
+          jcebRecordVo = fdfxjyqService.getCountByType(query);
+          break;
+        case Glkg:
+          jcebRecordVo = glkgService.getCountByType(query);
+          break;
+        case Jcxc:
+          jcebRecordVo = jcxcService.getCountByType(query);
+          break;
+        case Wjcxc:
+          jcebRecordVo = wjcxcService.getCountByType(query);
+          break;
         default:
           break;
       }

railway-business/src/main/java/com/railway/business/catenary/domain/vo/JcebRecordVo.java

@@ -16,6 +16,9 @@ public class JcebRecordVo implements Serializable {
 
   private static final long serialVersionUID = 1L;
 
+  @ApiModelProperty(value = "主键", hidden = true)
+  private Long id;
+
   @ApiModelProperty(value = "所属部门")
   private String deptName;
 

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbBlqMapper.java

@@ -2,6 +2,8 @@ package com.railway.business.catenary.mapper;
 
 import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcbBlq;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -45,4 +47,18 @@ public interface BusJcbBlqMapper {
      */
     BusJcbBlq getLastOne(BusJcbBlq busJcbBlq);
 
+    /**
+     * 查询明细列表
+     * @param query 查询参数
+     * @return 数据记录明细
+     */
+    Page<JcebRecordVo> getListByType(JcebQueryVo query);
+
+    /**
+     * 查询汇总列表
+     * @param query 查询参数
+     * @return 汇总数据
+     */
+    JcebRecordVo getCountByType(JcebQueryVo query);
+
 }

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbDmcgyqMapper.java

@@ -2,6 +2,8 @@ package com.railway.business.catenary.mapper;
 
 import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcbDmcgyq;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -44,4 +46,19 @@ public interface BusJcbDmcgyqMapper {
      * 获取上次检查记录
      */
     BusJcbDmcgyq getLastRecord(Long userId);
+
+    /**
+     * 查询明细列表
+     * @param query 查询参数
+     * @return 数据记录明细
+     */
+    Page<JcebRecordVo> getListByType(JcebQueryVo query);
+
+    /**
+     * 查询汇总列表
+     * @param query 查询参数
+     * @return 汇总数据
+     */
+    JcebRecordVo getCountByType(JcebQueryVo query);
+
 }

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbFdfxjyqMapper.java

@@ -2,6 +2,8 @@ package com.railway.business.catenary.mapper;
 
 import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcbFdfxjyq;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -45,4 +47,18 @@ public interface BusJcbFdfxjyqMapper {
     */
     BusJcbFdfxjyq getLastOne(BusJcbFdfxjyq busJcbFdfxjyq);
 
+    /**
+     * 查询明细列表
+     * @param query 查询参数
+     * @return 数据记录明细
+     */
+    Page<JcebRecordVo> getListByType(JcebQueryVo query);
+
+    /**
+     * 查询汇总列表
+     * @param query 查询参数
+     * @return 汇总数据
+     */
+    JcebRecordVo getCountByType(JcebQueryVo query);
+
 }

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbGlkgMapper.java

@@ -2,6 +2,8 @@ package com.railway.business.catenary.mapper;
 
 import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcbGlkg;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -46,4 +48,19 @@ public interface BusJcbGlkgMapper {
      * @return
      */
     BusJcbGlkg getLastOne(BusJcbGlkg busJcbGlkg);
+
+    /**
+     * 查询明细列表
+     * @param query 查询参数
+     * @return 数据记录明细
+     */
+    Page<JcebRecordVo> getListByType(JcebQueryVo query);
+
+    /**
+     * 查询汇总列表
+     * @param query 查询参数
+     * @return 汇总数据
+     */
+    JcebRecordVo getCountByType(JcebQueryVo query);
+
 }

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbJcxcMapper.java

@@ -2,6 +2,8 @@ package com.railway.business.catenary.mapper;
 
 import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcbJcxc;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -44,4 +46,19 @@ public interface BusJcbJcxcMapper {
      * 获取上次检查记录
      */
     BusJcbJcxc getLastRecord(Long userId);
+
+    /**
+     * 查询明细列表
+     * @param query 查询参数
+     * @return 数据记录明细
+     */
+    Page<JcebRecordVo> getListByType(JcebQueryVo query);
+
+    /**
+     * 查询汇总列表
+     * @param query 查询参数
+     * @return 汇总数据
+     */
+    JcebRecordVo getCountByType(JcebQueryVo query);
+
 }

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbWjcxcMapper.java

@@ -2,6 +2,8 @@ package com.railway.business.catenary.mapper;
 
 import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcbWjcxc;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -45,4 +47,18 @@ public interface BusJcbWjcxcMapper {
      */
     BusJcbWjcxc getLastRecord(Long userId);
 
+    /**
+     * 查询明细列表
+     * @param query 查询参数
+     * @return 数据记录明细
+     */
+    Page<JcebRecordVo> getListByType(JcebQueryVo query);
+
+    /**
+     * 查询汇总列表
+     * @param query 查询参数
+     * @return 汇总数据
+     */
+    JcebRecordVo getCountByType(JcebQueryVo query);
+
 }

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbBlqService.java

@@ -1,6 +1,9 @@
 package com.railway.business.catenary.service;
 
+import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcbBlq;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import java.util.List;
 /**
 * 检查表-避雷器
@@ -60,4 +63,18 @@ public interface IBusJcbBlqService{
      */
     int confirm(BusJcbBlq busJcbBlq);
 
+    /**
+     * 查询明细列表
+     * @param query 查询参数
+     * @return 数据记录明细
+     */
+    Page<JcebRecordVo> getListByType(JcebQueryVo query);
+
+    /**
+     * 查询汇总列表
+     * @param query 查询参数
+     * @return 汇总数据
+     */
+    JcebRecordVo getCountByType(JcebQueryVo query);
+
 }

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbDmcgyqService.java

@@ -1,6 +1,9 @@
 package com.railway.business.catenary.service;
 
+import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcbDmcgyq;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import java.util.List;
 /**
 * 检查表-地面磁感应器
@@ -54,4 +57,18 @@ public interface IBusJcbDmcgyqService{
      */
     int confirm(BusJcbDmcgyq busJcbDmcgyq);
 
+    /**
+     * 查询明细列表
+     * @param query 查询参数
+     * @return 数据记录明细
+     */
+    Page<JcebRecordVo> getListByType(JcebQueryVo query);
+
+    /**
+     * 查询汇总列表
+     * @param query 查询参数
+     * @return 汇总数据
+     */
+    JcebRecordVo getCountByType(JcebQueryVo query);
+
 }

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbFdfxjyqService.java

@@ -1,8 +1,11 @@
 package com.railway.business.catenary.service;
 
+import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcbFdfxjyq;
 import com.railway.business.catenary.domain.BusJcbGlkg;
 
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import java.util.List;
 /**
 * dxf分选绝缘器检查表 
@@ -62,4 +65,18 @@ public interface IBusJcbFdfxjyqService{
      */
     int confirm(BusJcbFdfxjyq busJcbFdfxjyq);
 
+    /**
+     * 查询明细列表
+     * @param query 查询参数
+     * @return 数据记录明细
+     */
+    Page<JcebRecordVo> getListByType(JcebQueryVo query);
+
+    /**
+     * 查询汇总列表
+     * @param query 查询参数
+     * @return 汇总数据
+     */
+    JcebRecordVo getCountByType(JcebQueryVo query);
+
 }

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbGlkgService.java

@@ -1,6 +1,9 @@
 package com.railway.business.catenary.service;
 
+import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcbGlkg;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import java.util.List;
 /**
 * 隔离开关检查表
@@ -62,4 +65,18 @@ public interface IBusJcbGlkgService{
      */
     BusJcbGlkg getLastOne(BusJcbGlkg busJcbGlkg);
 
+    /**
+     * 查询明细列表
+     * @param query 查询参数
+     * @return 数据记录明细
+     */
+    Page<JcebRecordVo> getListByType(JcebQueryVo query);
+
+    /**
+     * 查询汇总列表
+     * @param query 查询参数
+     * @return 汇总数据
+     */
+    JcebRecordVo getCountByType(JcebQueryVo query);
+
 }

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbJcxcService.java

@@ -1,7 +1,10 @@
 package com.railway.business.catenary.service;
 
+import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcbJcxc;
 
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import java.util.List;
 /**
 * 检查表-交叉线岔
@@ -55,4 +58,18 @@ public interface IBusJcbJcxcService{
      */
     int confirm(BusJcbJcxc busJcbJcxc);
 
+    /**
+     * 查询明细列表
+     * @param query 查询参数
+     * @return 数据记录明细
+     */
+    Page<JcebRecordVo> getListByType(JcebQueryVo query);
+
+    /**
+     * 查询汇总列表
+     * @param query 查询参数
+     * @return 汇总数据
+     */
+    JcebRecordVo getCountByType(JcebQueryVo query);
+
 }

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbWjcxcService.java

@@ -1,6 +1,9 @@
 package com.railway.business.catenary.service;
 
+import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcbWjcxc;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import java.util.List;
 /**
 * 检查表-无交叉线岔
@@ -54,4 +57,18 @@ public interface IBusJcbWjcxcService{
      */
     int confirm(BusJcbWjcxc busJcbWjcxc);
 
+    /**
+     * 查询明细列表
+     * @param query 查询参数
+     * @return 数据记录明细
+     */
+    Page<JcebRecordVo> getListByType(JcebQueryVo query);
+
+    /**
+     * 查询汇总列表
+     * @param query 查询参数
+     * @return 汇总数据
+     */
+    JcebRecordVo getCountByType(JcebQueryVo query);
+
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcabServiceImpl.java

@@ -3,6 +3,8 @@ package com.railway.business.catenary.service.impl;
 import com.railway.business.baseinfo.domain.BaseDeptStation;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.catenary.domain.BusJcab;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.common.core.domain.entity.SysUser;
 import com.railway.common.enums.DelFlagEnum;
@@ -28,6 +30,18 @@ public abstract class BusJcabServiceImpl {
     this.stationService = stationService;
   }
 
+  protected void setQuery(JcebQueryVo query) {
+    SysUser user = SecurityUtils.getLoginUser().getUser();
+    String post = user.getPost();
+    PostTypeEnum postType = PostTypeEnum.ofValue(post);
+    if(postType == PostTypeEnum.LEADER){
+      query.setSubmitState(JcebStatusEnum.REPORTED.getCode());
+      query.setDeptId(user.getDeptId());
+    }else {
+      query.setCreateBy(user.getUserName());
+    }
+  }
+
   /**
    * 列表
    */

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbBlqServiceImpl.java

@@ -1,7 +1,10 @@
 package com.railway.business.catenary.service.impl;
 
+import com.github.pagehelper.Page;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.catenary.domain.BusJcbBlq;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbBlqMapper;
 import com.railway.business.catenary.service.IBusJcbBlqService;
@@ -128,4 +131,25 @@ public class BusJcbBlqServiceImpl extends BusJcabServiceImpl implements IBusJcbB
     return update(busJcbBlq);
   }
 
+  /**
+   * 查询明细列表
+   * @param query 查询参数
+   * @return 数据记录明细
+   */
+  @Override
+  public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
+    setQuery(query);
+    return busJcbBlqMapper.getListByType(query);
+  }
+
+  /**
+   * 查询汇总列表
+   * @param query 查询参数
+   * @return 汇总数据
+   */
+  @Override
+  public JcebRecordVo getCountByType(JcebQueryVo query) {
+    setQuery(query);
+    return busJcbBlqMapper.getCountByType(query);
+  }
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbDmcgyqServiceImpl.java

@@ -1,7 +1,10 @@
 package com.railway.business.catenary.service.impl;
 
+import com.github.pagehelper.Page;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.catenary.domain.BusJcbDmcgyq;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbDmcgyqMapper;
 import com.railway.business.catenary.service.IBusJcbDmcgyqService;
@@ -124,4 +127,26 @@ public class BusJcbDmcgyqServiceImpl extends BusJcabServiceImpl implements IBusJ
     return update(busJcbDmcgyq);
   }
 
+  /**
+   * 查询明细列表
+   * @param query 查询参数
+   * @return 数据记录明细
+   */
+  @Override
+  public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
+    setQuery(query);
+    return busJcbDmcgyqMapper.getListByType(query);
+  }
+
+  /**
+   * 查询汇总列表
+   * @param query 查询参数
+   * @return 汇总数据
+   */
+  @Override
+  public JcebRecordVo getCountByType(JcebQueryVo query) {
+    setQuery(query);
+    return busJcbDmcgyqMapper.getCountByType(query);
+  }
+
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbFdfxjyqServiceImpl.java

@@ -1,7 +1,10 @@
 package com.railway.business.catenary.service.impl;
 
+import com.github.pagehelper.Page;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.catenary.domain.BusJcbFdfxjyq;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbFdfxjyqMapper;
 import com.railway.business.catenary.service.IBusJcbFdfxjyqService;
@@ -131,4 +134,25 @@ public class BusJcbFdfxjyqServiceImpl extends BusJcabServiceImpl implements IBus
     return update(busJcbFdfxjyq);
   }
 
+  /**
+   * 查询明细列表
+   * @param query 查询参数
+   * @return 数据记录明细
+   */
+  @Override
+  public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
+    setQuery(query);
+    return busJcbFdfxjyqMapper.getListByType(query);
+  }
+
+  /**
+   * 查询汇总列表
+   * @param query 查询参数
+   * @return 汇总数据
+   */
+  @Override
+  public JcebRecordVo getCountByType(JcebQueryVo query) {
+    setQuery(query);
+    return busJcbFdfxjyqMapper.getCountByType(query);
+  }
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbGlkgServiceImpl.java

@@ -1,7 +1,10 @@
 package com.railway.business.catenary.service.impl;
 
+import com.github.pagehelper.Page;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.catenary.domain.BusJcbGlkg;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbGlkgMapper;
 import com.railway.business.catenary.service.IBusJcbGlkgService;
@@ -122,4 +125,26 @@ public class BusJcbGlkgServiceImpl extends BusJcabServiceImpl implements IBusJcb
 	public BusJcbGlkg getLastOne(BusJcbGlkg busJcbGlkg) {
 		return busJcbGlkgMapper.getLastOne(busJcbGlkg);
 	}
+
+	/**
+	 * 查询明细列表
+	 * @param query 查询参数
+	 * @return 数据记录明细
+	 */
+	@Override
+	public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
+		setQuery(query);
+		return busJcbGlkgMapper.getListByType(query);
+	}
+
+	/**
+	 * 查询汇总列表
+	 * @param query 查询参数
+	 * @return 汇总数据
+	 */
+	@Override
+	public JcebRecordVo getCountByType(JcebQueryVo query) {
+		setQuery(query);
+		return busJcbGlkgMapper.getCountByType(query);
+	}
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbJcxcServiceImpl.java

@@ -1,7 +1,10 @@
 package com.railway.business.catenary.service.impl;
 
+import com.github.pagehelper.Page;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.catenary.domain.BusJcbJcxc;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbJcxcMapper;
 import com.railway.business.catenary.service.IBusJcbJcxcService;
@@ -122,4 +125,25 @@ public class BusJcbJcxcServiceImpl extends BusJcabServiceImpl implements IBusJcb
     return update(busJcbJcxc);
   }
 
+  /**
+   * 查询明细列表
+   * @param query 查询参数
+   * @return 数据记录明细
+   */
+  @Override
+  public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
+    setQuery(query);
+    return busJcbJcxcMapper.getListByType(query);
+  }
+
+  /**
+   * 查询汇总列表
+   * @param query 查询参数
+   * @return 汇总数据
+   */
+  @Override
+  public JcebRecordVo getCountByType(JcebQueryVo query) {
+    setQuery(query);
+    return busJcbJcxcMapper.getCountByType(query);
+  }
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbWjcxcServiceImpl.java

@@ -1,7 +1,10 @@
 package com.railway.business.catenary.service.impl;
 
+import com.github.pagehelper.Page;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.catenary.domain.BusJcbWjcxc;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbWjcxcMapper;
 import com.railway.business.catenary.service.IBusJcbWjcxcService;
@@ -121,4 +124,26 @@ public class BusJcbWjcxcServiceImpl extends BusJcabServiceImpl implements IBusJc
     setConfirm(busJcbWjcxc);
     return busJcbWjcxcMapper.update(busJcbWjcxc);
   }
+
+  /**
+   * 查询明细列表
+   * @param query 查询参数
+   * @return 数据记录明细
+   */
+  @Override
+  public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
+    setQuery(query);
+    return busJcbWjcxcMapper.getListByType(query);
+  }
+
+  /**
+   * 查询汇总列表
+   * @param query 查询参数
+   * @return 汇总数据
+   */
+  @Override
+  public JcebRecordVo getCountByType(JcebQueryVo query) {
+    setQuery(query);
+    return busJcbWjcxcMapper.getCountByType(query);
+  }
 }

railway-business/src/main/resources/mapper/catenary/BusJcbBlqMapper.xml

@@ -511,4 +511,60 @@
     LIMIT 1
   </select>
 
+  <resultMap id="JcabResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
+    <result column="dept_name" property="deptName"/>
+    <result column="station_name" property="stationName"/>
+    <result column="check_date" property="operationDate"/>
+    <result column="check_user" property="operator"/>
+    <result column="jcebType" property="jcebType"/>
+  </resultMap>
+
+  <select id="getListByType" resultMap="JcabResultMap">
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
+    FROM bus_jcb_blq t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.submit_state = '9'
+      <if test="stationId!=null and stationId!=''">
+        and v.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_code=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.check_user=#{operator}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
+
+  <resultMap id="JcabCountResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="c" property="count"/>
+    <result column="check_date" property="operationDate"/>
+  </resultMap>
+
+  <select id="getCountByType" resultMap="JcabCountResultMap">
+    SELECT count(*) c, max(t.check_date) as check_date
+    FROM bus_jcb_blq t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.submit_state = '9'
+      <if test="stationId!=null and stationId!=''">
+        and v.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_code=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.check_user=#{operator}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
+
 </mapper>

railway-business/src/main/resources/mapper/catenary/BusJcbDmcgyqMapper.xml

@@ -457,4 +457,60 @@
     </if>
   </select>
 
+  <resultMap id="JcabResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
+    <result column="dept_name" property="deptName"/>
+    <result column="station_name" property="stationName"/>
+    <result column="check_date" property="operationDate"/>
+    <result column="check_user" property="operator"/>
+    <result column="jcebType" property="jcebType"/>
+  </resultMap>
+
+  <select id="getListByType" resultMap="JcabResultMap">
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
+    FROM bus_jcb_dmcgyq t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.submit_state = '9'
+      <if test="stationId!=null and stationId!=''">
+        and v.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_code=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.check_user=#{operator}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
+
+  <resultMap id="JcabCountResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="c" property="count"/>
+    <result column="check_date" property="operationDate"/>
+  </resultMap>
+
+  <select id="getCountByType" resultMap="JcabCountResultMap">
+    SELECT count(*) c, max(t.check_date) as check_date
+    FROM bus_jcb_dmcgyq t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.submit_state = '9'
+      <if test="stationId!=null and stationId!=''">
+        and v.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_code=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.check_user=#{operator}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
+
 </mapper>

railway-business/src/main/resources/mapper/catenary/BusJcbFdfxjyqMapper.xml

@@ -674,5 +674,61 @@
     LIMIT 1
   </select>
 
+  <resultMap id="JcabResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
+    <result column="dept_name" property="deptName"/>
+    <result column="station_name" property="stationName"/>
+    <result column="check_date" property="operationDate"/>
+    <result column="check_user" property="operator"/>
+    <result column="jcebType" property="jcebType"/>
+  </resultMap>
+
+  <select id="getListByType" resultMap="JcabResultMap">
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
+    FROM bus_jcb_fdfxjyq t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.submit_state = '9'
+      <if test="stationId!=null and stationId!=''">
+        and v.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_code=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.check_user=#{operator}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
+
+  <resultMap id="JcabCountResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="c" property="count"/>
+    <result column="check_date" property="operationDate"/>
+  </resultMap>
+
+  <select id="getCountByType" resultMap="JcabCountResultMap">
+    SELECT count(*) c, max(t.check_date) as check_date
+    FROM bus_jcb_fdfxjyq t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.submit_state = '9'
+      <if test="stationId!=null and stationId!=''">
+        and v.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_code=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.check_user=#{operator}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
+
 
 </mapper>

railway-business/src/main/resources/mapper/catenary/BusJcbGlkgMapper.xml

@@ -930,4 +930,61 @@
     LIMIT 1
   </select>
 
+  <resultMap id="JcabResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
+    <result column="dept_name" property="deptName"/>
+    <result column="station_name" property="stationName"/>
+    <result column="check_date" property="operationDate"/>
+    <result column="check_user" property="operator"/>
+    <result column="jcebType" property="jcebType"/>
+  </resultMap>
+
+  <select id="getListByType" resultMap="JcabResultMap">
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
+    FROM bus_jcb_glkg t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.submit_state = '9'
+      <if test="stationId!=null and stationId!=''">
+        and v.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_code=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.check_user=#{operator}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
+
+  <resultMap id="JcabCountResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="c" property="count"/>
+    <result column="check_date" property="operationDate"/>
+  </resultMap>
+
+  <select id="getCountByType" resultMap="JcabCountResultMap">
+    SELECT count(*) c, max(t.check_date) as check_date
+    FROM bus_jcb_glkg t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.submit_state = '9'
+      <if test="stationId!=null and stationId!=''">
+        and v.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_code=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.check_user=#{operator}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
+
+
 </mapper>

railway-business/src/main/resources/mapper/catenary/BusJcbJcxcMapper.xml

@@ -634,4 +634,61 @@
     </if>
   </select>
 
+  <resultMap id="JcabResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
+    <result column="dept_name" property="deptName"/>
+    <result column="station_name" property="stationName"/>
+    <result column="check_date" property="operationDate"/>
+    <result column="check_user" property="operator"/>
+    <result column="jcebType" property="jcebType"/>
+  </resultMap>
+
+  <select id="getListByType" resultMap="JcabResultMap">
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
+    FROM bus_jcb_jcxc t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.submit_state = '9'
+      <if test="stationId!=null and stationId!=''">
+        and v.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_code=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.check_user=#{operator}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
+
+  <resultMap id="JcabCountResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="c" property="count"/>
+    <result column="check_date" property="operationDate"/>
+  </resultMap>
+
+  <select id="getCountByType" resultMap="JcabCountResultMap">
+    SELECT count(*) c, max(t.check_date) as check_date
+    FROM bus_jcb_jcxc t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.submit_state = '9'
+      <if test="stationId!=null and stationId!=''">
+        and v.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_code=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.check_user=#{operator}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
+
+
 </mapper>

railway-business/src/main/resources/mapper/catenary/BusJcbWjcxcMapper.xml

@@ -563,4 +563,61 @@
     </if>
   </select>
 
+  <resultMap id="JcabResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
+    <result column="dept_name" property="deptName"/>
+    <result column="station_name" property="stationName"/>
+    <result column="check_date" property="operationDate"/>
+    <result column="check_user" property="operator"/>
+    <result column="jcebType" property="jcebType"/>
+  </resultMap>
+
+  <select id="getListByType" resultMap="JcabResultMap">
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
+    FROM bus_jcb_wjcxc t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.submit_state = '9'
+      <if test="stationId!=null and stationId!=''">
+        and v.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_code=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.check_user=#{operator}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
+
+  <resultMap id="JcabCountResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="c" property="count"/>
+    <result column="check_date" property="operationDate"/>
+  </resultMap>
+
+  <select id="getCountByType" resultMap="JcabCountResultMap">
+    SELECT count(*) c, max(t.check_date) as check_date
+    FROM bus_jcb_wjcxc t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.submit_state = '9'
+      <if test="stationId!=null and stationId!=''">
+        and v.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_code=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.check_user=#{operator}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
+
+
 </mapper>

railway-business/src/main/resources/mapper/catenary/BusJcebGjsfxMapper.xml

@@ -369,6 +369,7 @@
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="operation_date" property="operationDate"/>
@@ -377,7 +378,7 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
     FROM bus_jceb_gjsfx t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebJddzMapper.xml

@@ -287,6 +287,7 @@
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="operation_date" property="operationDate"/>
@@ -295,7 +296,7 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
     FROM bus_jceb_jddz t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebJyzqsjlMapper.xml

@@ -256,6 +256,7 @@
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="operation_date" property="operationDate"/>
@@ -264,7 +265,7 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
     FROM bus_jceb_jyzqsjl t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebLbjghjlMapper.xml

@@ -293,6 +293,7 @@
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="operation_date" property="operationDate"/>
@@ -301,7 +302,7 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
     FROM bus_jceb_lbjghjl t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebQmjcjlMapper.xml

@@ -333,6 +333,7 @@
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="operation_date" property="operationDate"/>
@@ -341,7 +342,7 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
     FROM bus_jceb_qmjcjl t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebXsjcjlMapper.xml

@@ -317,6 +317,7 @@
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="id" property="id"/>
     <result column="dept_name" property="deptName"/>
     <result column="station_name" property="stationName"/>
     <result column="operation_date" property="operationDate"/>
@@ -325,7 +326,7 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
     FROM bus_jceb_xsjcjl t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>