【CHG】修改地面磁感应器检测数据查询方法

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

@@ -178,13 +178,9 @@ public class BusJcbDmcgyqServiceImpl extends BusJcabServiceImpl implements IBusJ
   public String exportExcel(JcebQueryVo query) {
     setJcebQuery(query);
     List<BusJcbDmcgyq> list = busJcbDmcgyqMapper.getJcebList(query);
-    List<BusJcbDmcgyq> resultList = new ArrayList<>();
-    list.forEach(
-        x -> transDataForList(x, resultList)
-    );
     String fileName = "地磁感应器检测记录.xls";
     String templateFileName = "excel/template/地磁感应器检测记录.xls";
-    return new EasyExcelUtil().writeExcel(fileName, templateFileName, resultList);
+    return new EasyExcelUtil().writeExcel(fileName, templateFileName, list);
   }
 
   /**
@@ -193,15 +189,7 @@ public class BusJcbDmcgyqServiceImpl extends BusJcabServiceImpl implements IBusJ
   @Override
   public List<BusJcbDmcgyq> getJcebList(JcebQueryVo query) {
     setJcebQuery(query);
-    List<BusJcbDmcgyq> list = busJcbDmcgyqMapper.getJcebList(query);
-    List<BusJcbDmcgyq> resultList = new ArrayList<>();
-    list.forEach(
-        x -> transDataForList(x, resultList)
-    );
-    PageDomain pageDomain = TableSupport.buildPageRequest();
-    Integer pageNum = pageDomain.getPageNum();
-    Integer pageSize = pageDomain.getPageSize();
-    return resultList.stream().limit((long) pageSize * pageNum).collect(Collectors.toList());
+    return busJcbDmcgyqMapper.getJcebList(query);
   }
 
   /**

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

@@ -46,6 +46,9 @@
     <result column="user_id" property="userId"/>
     <result column="czlc" property="czlc"/>
     <result column="ctl" property="ctl"/>
+    <result column="gyq_number" property="gyqNumber"/>
+    <result column="scz" property="scz"/>
+    <result column="wsjbjsd" property="wsjbjsd"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -495,11 +498,10 @@
   <select id="getJcebList" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,
-    base.czlc as czlc, '>36' as ctl
-    FROM bus_jcb_dmcgyq t
+    t.czlc as czlc, '>36' as ctl, t.gyq_number, t.scz
+    FROM v_jcb_dmcgyq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN base_dmcgyq base ON t.gyq_id = base.id
     <where>
       t.del_flag='0' and t.submit_state = '9'
       <if test="submitState!=null and submitState!=''">
@@ -545,7 +547,8 @@
   <select id="getListByType" resultMap="JcabResultMap">
     SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType,
     #{jcebTypeText} as jcebTypeText
-    FROM bus_jcb_dmcgyq t
+    , t.czlc as czlc, '>36' as ctl, t.gyq_number, t.scz
+    FROM v_jcb_dmcgyq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
       t.del_flag='0'
@@ -586,7 +589,7 @@
 
   <select id="getCountByType" resultMap="JcabCountResultMap">
     SELECT count(*) c, max(t.check_date) as check_date
-    FROM bus_jcb_dmcgyq t
+    FROM v_jcb_dmcgyq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
       t.del_flag='0'