分页查询 - 4

mybusiness/src/main/java/com/sooka/system/gas/zenner_gas_purchase_center_infor/controller/TGuijiZennerGasPurchaseCenterInforController.java

@@ -3,7 +3,9 @@ package com.sooka.system.gas.zenner_gas_purchase_center_infor.controller;
 import com.sooka.common.annotation.Log;
 import com.sooka.common.core.controller.BaseController;
 import com.sooka.common.core.domain.AjaxResult;
+import com.sooka.common.core.page.PageDomain;
 import com.sooka.common.core.page.TableDataInfo;
+import com.sooka.common.core.page.TableSupport;
 import com.sooka.common.core.text.Convert;
 import com.sooka.common.enums.BusinessType;
 import com.sooka.common.utils.CacheUtils;
@@ -18,7 +20,9 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 真兰收费系统-中心计费购气信息Controller
@@ -50,9 +54,17 @@ public class TGuijiZennerGasPurchaseCenterInforController extends BaseController
     @ResponseBody
     public TableDataInfo list(TGuijiZennerGasPurchaseCenterInfor param)
     {
-        startPage();
+//        startPage();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        String limit = "limit " + ((pageNum - 1) * pageSize) + ", " + pageSize;
+        Map params = new HashMap();
+        params.put("limit", limit);
+        param.setParams(params);
         List<TGuijiZennerGasPurchaseCenterInfor> list = service.selectList(param);
-        return getDataTable(list, service.getTotal("t_guiji_gas_zenner_gas_purchase_center_infor"));
+        String paramStr = param.getVC_JFH_SKPERSON() + "," + param.getD_JFH_SKDATE();
+        return getDataTable(list, service.getTotal("t_guiji_gas_zenner_gas_purchase_center_infor", paramStr));
     }
 
     /**

mybusiness/src/main/java/com/sooka/system/gas/zenner_gas_purchase_center_infor/service/ITGuijiZennerGasPurchaseCenterInforService.java

@@ -35,7 +35,7 @@ public interface ITGuijiZennerGasPurchaseCenterInforService
      *
      * @return 缓存名(通用)
      */
-    public Long getTotal(String tableName);
+    public Long getTotal(String tableName, String paramStr);
 
     /**
      * 新增真兰收费系统-中心计费购气信息

mybusiness/src/main/java/com/sooka/system/gas/zenner_gas_purchase_center_infor/service/impl/TGuijiZennerGasPurchaseCenterInforServiceImpl.java

@@ -54,14 +54,14 @@ public class TGuijiZennerGasPurchaseCenterInforServiceImpl implements ITGuijiZen
      *
      * @return 缓存名
      */
-    public Long getTotal(String tableName)
+    public Long getTotal(String tableName, String paramStr)
     {
-        Long total = Convert.toLong(CacheUtils.get("guiji-data-count", tableName));//cacheName, cacheKey
+        Long total = Convert.toLong(CacheUtils.get("guiji-data-count", tableName + "," + paramStr));//cacheName, cacheKey
         if(total == null){
             Map map = new HashMap();
             map.put("tableName", tableName);
             total = mapper.getDataCount(map);
-            CacheUtils.put("guiji-data-count", tableName, total);//cacheName, cacheKey
+            CacheUtils.put("guiji-data-count", tableName + "," + paramStr, total);//cacheName, cacheKey
             System.out.println("分页功能 缓存加入成功：" + tableName);
         }else {
             System.out.println("分页功能 根据缓存名称及键值获取缓存：" + tableName);

mybusiness/src/main/java/com/sooka/system/gas/zenner_meter_reading_infor/controller/TGuijiZennerMeterReadingInforController.java

@@ -8,7 +8,9 @@ import com.sooka.common.core.page.TableDataInfo;
 import com.sooka.common.core.page.TableSupport;
 import com.sooka.common.enums.BusinessType;
 import com.sooka.common.utils.poi.ExcelUtil;
+import com.sooka.system.gas.zenner_gas_purchase_center_infor.service.ITGuijiZennerGasPurchaseCenterInforService;
 import com.sooka.system.gas.zenner_meter_reading_infor.domain.TGuijiZennerMeterReadingInfor;
+import com.sooka.system.gas.zenner_meter_reading_infor.mapper.TGuijiZennerMeterReadingMapper;
 import com.sooka.system.gas.zenner_meter_reading_infor.service.ITGuijiZennerMeterReadingInforService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +18,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,6 +38,12 @@ public class TGuijiZennerMeterReadingInforController extends BaseController
     @Autowired
     private ITGuijiZennerMeterReadingInforService service;
 
+    @Autowired
+    private ITGuijiZennerGasPurchaseCenterInforService totalService;
+
+    @Resource
+    private TGuijiZennerMeterReadingMapper mapper;
+
     @RequiresPermissions("system:zenner_meter_reading_infor:view")
     @GetMapping()
     public String zenner_meter_reading_infor()
@@ -60,8 +69,27 @@ public class TGuijiZennerMeterReadingInforController extends BaseController
         Map params = new HashMap();
         params.put("limit", limit);
         param.setParams(params);
-        List<TGuijiZennerMeterReadingInfor> list = service.selectList(param);
-        return getDataTable(list, 10000000L);
+        System.out.println(1111111111);
+        List<TGuijiZennerMeterReadingInfor> idList = mapper.selectIds(param);
+        System.out.println(222222222);
+        String ids = "";
+        for (TGuijiZennerMeterReadingInfor info : idList) {
+            ids += "'" + info.getId() + "',";
+        }
+        ids = ids.length() == 0 ? ids : ids.substring(0, ids.length() - 1);
+        Map map = new HashMap();
+        map.put("ids", ids);
+        System.out.println(333333333);
+//        List<TGuijiZennerMeterReadingInfor> list = service.selectList(param);
+//        return getDataTable(list, 12489514L);
+        String paramStr = param.getVC_WCB_PERSON() + "," + param.getVC_WCB_CODE();
+        Long total = totalService.getTotal("t_guiji_gas_zenner_meter_reading_infor", paramStr);
+        System.out.println("ids=" + ids);
+        List<TGuijiZennerMeterReadingInfor> list = mapper.selectListbyIds(map);
+        System.out.println(list.size() + "=size");
+        System.out.println("total=" + total);
+        return getDataTable(list, total);
+//        return getDataTable(list, 12425878L);
     }
 
     /**

mybusiness/src/main/java/com/sooka/system/gas/zenner_meter_reading_infor/mapper/TGuijiZennerMeterReadingMapper.java

@@ -3,6 +3,7 @@ package com.sooka.system.gas.zenner_meter_reading_infor.mapper;
 import com.sooka.system.gas.zenner_meter_reading_infor.domain.TGuijiZennerMeterReadingInfor;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 真兰收费系统-抄表信息Mapper接口
@@ -21,6 +22,19 @@ public interface TGuijiZennerMeterReadingMapper
     public TGuijiZennerMeterReadingInfor selectById(String id);
 
     /**
+     * @return id结果集
+     */
+    public List<TGuijiZennerMeterReadingInfor> selectIds(TGuijiZennerMeterReadingInfor param);
+
+    /**
+     * 查询真兰收费系统-抄表信息列表
+     *
+     * @param ids ID集合
+     * @return 真兰收费系统-抄表信息集合
+     */
+    public List<TGuijiZennerMeterReadingInfor> selectListbyIds(Map ids);
+
+    /**
      * 查询真兰收费系统-抄表信息列表
      *
      * @param param 真兰收费系统-抄表信息

mybusiness/src/main/resources/mapper/system/TGuijiZennerMeterReadingInforMapper.xml

@@ -10,70 +10,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectList" parameterType="TGuijiZennerMeterReadingInfor" resultType="TGuijiZennerMeterReadingInfor">
         <include refid="selectVo"/>
-        where id in (select t.* from (select id from t_guiji_gas_zenner_meter_reading_infor where 1 = 1
-        <if test="GUID != null  and GUID != ''"> and GUID like concat('%', #{GUID}, '%')</if>
-        <if test="VC_WCB_USERGUID != null  and VC_WCB_USERGUID != ''"> and VC_WCB_USERGUID like concat('%', #{VC_WCB_USERGUID}, '%')</if>
-        <if test="VC_WCB_METERGUID != null  and VC_WCB_METERGUID != ''"> and VC_WCB_METERGUID like concat('%', #{VC_WCB_METERGUID}, '%')</if>
-        <if test="VC_WCB_PERSON != null  and VC_WCB_PERSON != ''"> and VC_WCB_PERSON like concat('%', #{VC_WCB_PERSON}, '%')</if>
-        <if test="D_WCB_OPDATE != null  and D_WCB_OPDATE != ''"> and D_WCB_OPDATE like concat('%', #{D_WCB_OPDATE}, '%')</if>
-        <if test="N_WCB_USED != null  and N_WCB_USED != ''"> and N_WCB_USED like concat('%', #{N_WCB_USED}, '%')</if>
-        <if test="N_WCB_HEJI != null  and N_WCB_HEJI != ''"> and N_WCB_HEJI like concat('%', #{N_WCB_HEJI}, '%')</if>
-        <if test="N_WCB_HEJIEX != null  and N_WCB_HEJIEX != ''"> and N_WCB_HEJIEX like concat('%', #{N_WCB_HEJIEX}, '%')</if>
-        <if test="N_WCB_LEAVE != null  and N_WCB_LEAVE != ''"> and N_WCB_LEAVE like concat('%', #{N_WCB_LEAVE}, '%')</if>
-        <if test="N_WCB_BUY != null  and N_WCB_BUY != ''"> and N_WCB_BUY like concat('%', #{N_WCB_BUY}, '%')</if>
-        <if test="N_WCB_TOTALBUY != null  and N_WCB_TOTALBUY != ''"> and N_WCB_TOTALBUY like concat('%', #{N_WCB_TOTALBUY}, '%')</if>
-        <if test="N_WCB_PRICE != null  and N_WCB_PRICE != ''"> and N_WCB_PRICE like concat('%', #{N_WCB_PRICE}, '%')</if>
-        <if test="I_WCB_BUYCOUNT != null  and I_WCB_BUYCOUNT != ''"> and I_WCB_BUYCOUNT like concat('%', #{I_WCB_BUYCOUNT}, '%')</if>
-        <if test="I_WCB_WLBUYCOUNT != null  and I_WCB_WLBUYCOUNT != ''"> and I_WCB_WLBUYCOUNT like concat('%', #{I_WCB_WLBUYCOUNT}, '%')</if>
-        <if test="VC_WCB_REMOTECLOSEVALVE != null  and VC_WCB_REMOTECLOSEVALVE != ''"> and VC_WCB_REMOTECLOSEVALVE like concat('%', #{VC_WCB_REMOTECLOSEVALVE}, '%')</if>
-        <if test="VC_WCB_REVEAL != null  and VC_WCB_REVEAL != ''"> and VC_WCB_REVEAL like concat('%', #{VC_WCB_REVEAL}, '%')</if>
-        <if test="VC_WCB_COMMUNICATEBAD != null  and VC_WCB_COMMUNICATEBAD != ''"> and VC_WCB_COMMUNICATEBAD like concat('%', #{VC_WCB_COMMUNICATEBAD}, '%')</if>
-        <if test="VC_WCB_MAGNETICDISTURBANCE != null  and VC_WCB_MAGNETICDISTURBANCE != ''"> and VC_WCB_MAGNETICDISTURBANCE like concat('%', #{VC_WCB_MAGNETICDISTURBANCE}, '%')</if>
-        <if test="VC_WCB_VALVESTATE != null  and VC_WCB_VALVESTATE != ''"> and VC_WCB_VALVESTATE like concat('%', #{VC_WCB_VALVESTATE}, '%')</if>
-        <if test="VC_WCB_BATTERY != null  and VC_WCB_BATTERY != ''"> and VC_WCB_BATTERY like concat('%', #{VC_WCB_BATTERY}, '%')</if>
-        <if test="VC_WCB_FLOW != null  and VC_WCB_FLOW != ''"> and VC_WCB_FLOW like concat('%', #{VC_WCB_FLOW}, '%')</if>
-        <if test="VC_WCB_BATTERYPER != null  and VC_WCB_BATTERYPER != ''"> and VC_WCB_BATTERYPER like concat('%', #{VC_WCB_BATTERYPER}, '%')</if>
-        <if test="VC_WCB_BATTERYMILL != null  and VC_WCB_BATTERYMILL != ''"> and VC_WCB_BATTERYMILL like concat('%', #{VC_WCB_BATTERYMILL}, '%')</if>
-        <if test="VC_WCB_SPAREBATTERYMILL != null  and VC_WCB_SPAREBATTERYMILL != ''"> and VC_WCB_SPAREBATTERYMILL like concat('%', #{VC_WCB_SPAREBATTERYMILL}, '%')</if>
-        <if test="VC_WCB_ADDRESS != null  and VC_WCB_ADDRESS != ''"> and VC_WCB_ADDRESS like concat('%', #{VC_WCB_ADDRESS}, '%')</if>
-        <if test="VC_WCB_CODE != null  and VC_WCB_CODE != ''"> and VC_WCB_CODE like concat('%', #{VC_WCB_CODE}, '%')</if>
-        <if test="VC_WCB_VALVEERR != null  and VC_WCB_VALVEERR != ''"> and VC_WCB_VALVEERR like concat('%', #{VC_WCB_VALVEERR}, '%')</if>
-        <if test="VC_WCB_ARREARSCLOSEVALUE != null  and VC_WCB_ARREARSCLOSEVALUE != ''"> and VC_WCB_ARREARSCLOSEVALUE like concat('%', #{VC_WCB_ARREARSCLOSEVALUE}, '%')</if>
-        <if test="VC_WCB_INNERBATERR != null  and VC_WCB_INNERBATERR != ''"> and VC_WCB_INNERBATERR like concat('%', #{VC_WCB_INNERBATERR}, '%')</if>
-        <if test="VC_WCB_DIE != null  and VC_WCB_DIE != ''"> and VC_WCB_DIE like concat('%', #{VC_WCB_DIE}, '%')</if>
-        <if test="VC_WCB_TILT != null  and VC_WCB_TILT != ''"> and VC_WCB_TILT like concat('%', #{VC_WCB_TILT}, '%')</if>
-        <if test="VC_WCB_MONTHVALUE != null  and VC_WCB_MONTHVALUE != ''"> and VC_WCB_MONTHVALUE like concat('%', #{VC_WCB_MONTHVALUE}, '%')</if>
-        <if test="EXECE_DATE != null  and EXECE_DATE != ''"> and EXECE_DATE like concat('%', #{EXECE_DATE}, '%')</if>
-        <if test="EXECE_STATE != null  and EXECE_STATE != ''"> and EXECE_STATE like concat('%', #{EXECE_STATE}, '%')</if>
-        <if test="VC_WCB_USEDATE != null  and VC_WCB_USEDATE != ''"> and VC_WCB_USEDATE like concat('%', #{VC_WCB_USEDATE}, '%')</if>
-        <if test="VC_WCB_USERNAME != null  and VC_WCB_USERNAME != ''"> and VC_WCB_USERNAME like concat('%', #{VC_WCB_USERNAME}, '%')</if>
-        <if test="VC_WCB_ALARMVALUE != null  and VC_WCB_ALARMVALUE != ''"> and VC_WCB_ALARMVALUE like concat('%', #{VC_WCB_ALARMVALUE}, '%')</if>
-        <if test="VC_WCB_SIGNALINTENSITY != null  and VC_WCB_SIGNALINTENSITY != ''"> and VC_WCB_SIGNALINTENSITY like concat('%', #{VC_WCB_SIGNALINTENSITY}, '%')</if>
-        <if test="I_WCB_REPORTCOUNT != null  and I_WCB_REPORTCOUNT != ''"> and I_WCB_REPORTCOUNT like concat('%', #{I_WCB_REPORTCOUNT}, '%')</if>
-        <if test="N_WCB_JTNUM1 != null  and N_WCB_JTNUM1 != ''"> and N_WCB_JTNUM1 like concat('%', #{N_WCB_JTNUM1}, '%')</if>
-        <if test="N_WCB_JTPRICE1 != null  and N_WCB_JTPRICE1 != ''"> and N_WCB_JTPRICE1 like concat('%', #{N_WCB_JTPRICE1}, '%')</if>
-        <if test="N_WCB_JTAMOUNT1 != null  and N_WCB_JTAMOUNT1 != ''"> and N_WCB_JTAMOUNT1 like concat('%', #{N_WCB_JTAMOUNT1}, '%')</if>
-        <if test="N_WCB_JTNUM2 != null  and N_WCB_JTNUM2 != ''"> and N_WCB_JTNUM2 like concat('%', #{N_WCB_JTNUM2}, '%')</if>
-        <if test="N_WCB_JTPRICE2 != null  and N_WCB_JTPRICE2 != ''"> and N_WCB_JTPRICE2 like concat('%', #{N_WCB_JTPRICE2}, '%')</if>
-        <if test="N_WCB_JTAMOUNT2 != null  and N_WCB_JTAMOUNT2 != ''"> and N_WCB_JTAMOUNT2 like concat('%', #{N_WCB_JTAMOUNT2}, '%')</if>
-        <if test="N_WCB_JTNUM3 != null  and N_WCB_JTNUM3 != ''"> and N_WCB_JTNUM3 like concat('%', #{N_WCB_JTNUM3}, '%')</if>
-        <if test="N_WCB_JTPRICE3 != null  and N_WCB_JTPRICE3 != ''"> and N_WCB_JTPRICE3 like concat('%', #{N_WCB_JTPRICE3}, '%')</if>
-        <if test="N_WCB_JTAMOUNT3 != null  and N_WCB_JTAMOUNT3 != ''"> and N_WCB_JTAMOUNT3 like concat('%', #{N_WCB_JTAMOUNT3}, '%')</if>
-        <if test="N_WCB_JTNUM4 != null  and N_WCB_JTNUM4 != ''"> and N_WCB_JTNUM4 like concat('%', #{N_WCB_JTNUM4}, '%')</if>
-        <if test="N_WCB_JTPRICE4 != null  and N_WCB_JTPRICE4 != ''"> and N_WCB_JTPRICE4 like concat('%', #{N_WCB_JTPRICE4}, '%')</if>
-        <if test="N_WCB_JTAMOUNT4 != null  and N_WCB_JTAMOUNT4 != ''"> and N_WCB_JTAMOUNT4 like concat('%', #{N_WCB_JTAMOUNT4}, '%')</if>
-        <if test="N_WCB_JTNUM5 != null  and N_WCB_JTNUM5 != ''"> and N_WCB_JTNUM5 like concat('%', #{N_WCB_JTNUM5}, '%')</if>
-        <if test="N_WCB_JTPRICE5 != null  and N_WCB_JTPRICE5 != ''"> and N_WCB_JTPRICE5 like concat('%', #{N_WCB_JTPRICE5}, '%')</if>
-        <if test="N_WCB_JTAMOUNT5 != null  and N_WCB_JTAMOUNT5 != ''"> and N_WCB_JTAMOUNT5 like concat('%', #{N_WCB_JTAMOUNT5}, '%')</if>
-        <if test="N_WCB_JTNUM6 != null  and N_WCB_JTNUM6 != ''"> and N_WCB_JTNUM6 like concat('%', #{N_WCB_JTNUM6}, '%')</if>
-        <if test="N_WCB_JTPRICE6 != null  and N_WCB_JTPRICE6 != ''"> and N_WCB_JTPRICE6 like concat('%', #{N_WCB_JTPRICE6}, '%')</if>
-        <if test="N_WCB_JTAMOUNT6 != null  and N_WCB_JTAMOUNT6 != ''"> and N_WCB_JTAMOUNT6 like concat('%', #{N_WCB_JTAMOUNT6}, '%')</if>
-        <!-- 数据分页过滤 -->
-        ${params.limit}
-        ) t)
+        <where>
+            <if test="GUID != null  and GUID != ''"> and GUID like concat('%', #{GUID}, '%')</if>
+            <if test="VC_WCB_USERGUID != null  and VC_WCB_USERGUID != ''"> and VC_WCB_USERGUID like concat('%', #{VC_WCB_USERGUID}, '%')</if>
+            <if test="VC_WCB_METERGUID != null  and VC_WCB_METERGUID != ''"> and VC_WCB_METERGUID like concat('%', #{VC_WCB_METERGUID}, '%')</if>
+            <if test="VC_WCB_PERSON != null  and VC_WCB_PERSON != ''"> and VC_WCB_PERSON like concat('%', #{VC_WCB_PERSON}, '%')</if>
+            <if test="D_WCB_OPDATE != null  and D_WCB_OPDATE != ''"> and D_WCB_OPDATE like concat('%', #{D_WCB_OPDATE}, '%')</if>
+            <if test="N_WCB_USED != null  and N_WCB_USED != ''"> and N_WCB_USED like concat('%', #{N_WCB_USED}, '%')</if>
+            <if test="N_WCB_HEJI != null  and N_WCB_HEJI != ''"> and N_WCB_HEJI like concat('%', #{N_WCB_HEJI}, '%')</if>
+            <if test="N_WCB_HEJIEX != null  and N_WCB_HEJIEX != ''"> and N_WCB_HEJIEX like concat('%', #{N_WCB_HEJIEX}, '%')</if>
+            <if test="N_WCB_LEAVE != null  and N_WCB_LEAVE != ''"> and N_WCB_LEAVE like concat('%', #{N_WCB_LEAVE}, '%')</if>
+            <if test="N_WCB_BUY != null  and N_WCB_BUY != ''"> and N_WCB_BUY like concat('%', #{N_WCB_BUY}, '%')</if>
+            <if test="N_WCB_TOTALBUY != null  and N_WCB_TOTALBUY != ''"> and N_WCB_TOTALBUY like concat('%', #{N_WCB_TOTALBUY}, '%')</if>
+            <if test="N_WCB_PRICE != null  and N_WCB_PRICE != ''"> and N_WCB_PRICE like concat('%', #{N_WCB_PRICE}, '%')</if>
+            <if test="I_WCB_BUYCOUNT != null  and I_WCB_BUYCOUNT != ''"> and I_WCB_BUYCOUNT like concat('%', #{I_WCB_BUYCOUNT}, '%')</if>
+            <if test="I_WCB_WLBUYCOUNT != null  and I_WCB_WLBUYCOUNT != ''"> and I_WCB_WLBUYCOUNT like concat('%', #{I_WCB_WLBUYCOUNT}, '%')</if>
+            <if test="VC_WCB_REMOTECLOSEVALVE != null  and VC_WCB_REMOTECLOSEVALVE != ''"> and VC_WCB_REMOTECLOSEVALVE like concat('%', #{VC_WCB_REMOTECLOSEVALVE}, '%')</if>
+            <if test="VC_WCB_REVEAL != null  and VC_WCB_REVEAL != ''"> and VC_WCB_REVEAL like concat('%', #{VC_WCB_REVEAL}, '%')</if>
+            <if test="VC_WCB_COMMUNICATEBAD != null  and VC_WCB_COMMUNICATEBAD != ''"> and VC_WCB_COMMUNICATEBAD like concat('%', #{VC_WCB_COMMUNICATEBAD}, '%')</if>
+            <if test="VC_WCB_MAGNETICDISTURBANCE != null  and VC_WCB_MAGNETICDISTURBANCE != ''"> and VC_WCB_MAGNETICDISTURBANCE like concat('%', #{VC_WCB_MAGNETICDISTURBANCE}, '%')</if>
+            <if test="VC_WCB_VALVESTATE != null  and VC_WCB_VALVESTATE != ''"> and VC_WCB_VALVESTATE like concat('%', #{VC_WCB_VALVESTATE}, '%')</if>
+            <if test="VC_WCB_BATTERY != null  and VC_WCB_BATTERY != ''"> and VC_WCB_BATTERY like concat('%', #{VC_WCB_BATTERY}, '%')</if>
+            <if test="VC_WCB_FLOW != null  and VC_WCB_FLOW != ''"> and VC_WCB_FLOW like concat('%', #{VC_WCB_FLOW}, '%')</if>
+            <if test="VC_WCB_BATTERYPER != null  and VC_WCB_BATTERYPER != ''"> and VC_WCB_BATTERYPER like concat('%', #{VC_WCB_BATTERYPER}, '%')</if>
+            <if test="VC_WCB_BATTERYMILL != null  and VC_WCB_BATTERYMILL != ''"> and VC_WCB_BATTERYMILL like concat('%', #{VC_WCB_BATTERYMILL}, '%')</if>
+            <if test="VC_WCB_SPAREBATTERYMILL != null  and VC_WCB_SPAREBATTERYMILL != ''"> and VC_WCB_SPAREBATTERYMILL like concat('%', #{VC_WCB_SPAREBATTERYMILL}, '%')</if>
+            <if test="VC_WCB_ADDRESS != null  and VC_WCB_ADDRESS != ''"> and VC_WCB_ADDRESS like concat('%', #{VC_WCB_ADDRESS}, '%')</if>
+            <if test="VC_WCB_CODE != null  and VC_WCB_CODE != ''"> and VC_WCB_CODE like concat('%', #{VC_WCB_CODE}, '%')</if>
+            <if test="VC_WCB_VALVEERR != null  and VC_WCB_VALVEERR != ''"> and VC_WCB_VALVEERR like concat('%', #{VC_WCB_VALVEERR}, '%')</if>
+            <if test="VC_WCB_ARREARSCLOSEVALUE != null  and VC_WCB_ARREARSCLOSEVALUE != ''"> and VC_WCB_ARREARSCLOSEVALUE like concat('%', #{VC_WCB_ARREARSCLOSEVALUE}, '%')</if>
+            <if test="VC_WCB_INNERBATERR != null  and VC_WCB_INNERBATERR != ''"> and VC_WCB_INNERBATERR like concat('%', #{VC_WCB_INNERBATERR}, '%')</if>
+            <if test="VC_WCB_DIE != null  and VC_WCB_DIE != ''"> and VC_WCB_DIE like concat('%', #{VC_WCB_DIE}, '%')</if>
+            <if test="VC_WCB_TILT != null  and VC_WCB_TILT != ''"> and VC_WCB_TILT like concat('%', #{VC_WCB_TILT}, '%')</if>
+            <if test="VC_WCB_MONTHVALUE != null  and VC_WCB_MONTHVALUE != ''"> and VC_WCB_MONTHVALUE like concat('%', #{VC_WCB_MONTHVALUE}, '%')</if>
+            <if test="EXECE_DATE != null  and EXECE_DATE != ''"> and EXECE_DATE like concat('%', #{EXECE_DATE}, '%')</if>
+            <if test="EXECE_STATE != null  and EXECE_STATE != ''"> and EXECE_STATE like concat('%', #{EXECE_STATE}, '%')</if>
+            <if test="VC_WCB_USEDATE != null  and VC_WCB_USEDATE != ''"> and VC_WCB_USEDATE like concat('%', #{VC_WCB_USEDATE}, '%')</if>
+            <if test="VC_WCB_USERNAME != null  and VC_WCB_USERNAME != ''"> and VC_WCB_USERNAME like concat('%', #{VC_WCB_USERNAME}, '%')</if>
+            <if test="VC_WCB_ALARMVALUE != null  and VC_WCB_ALARMVALUE != ''"> and VC_WCB_ALARMVALUE like concat('%', #{VC_WCB_ALARMVALUE}, '%')</if>
+            <if test="VC_WCB_SIGNALINTENSITY != null  and VC_WCB_SIGNALINTENSITY != ''"> and VC_WCB_SIGNALINTENSITY like concat('%', #{VC_WCB_SIGNALINTENSITY}, '%')</if>
+            <if test="I_WCB_REPORTCOUNT != null  and I_WCB_REPORTCOUNT != ''"> and I_WCB_REPORTCOUNT like concat('%', #{I_WCB_REPORTCOUNT}, '%')</if>
+            <if test="N_WCB_JTNUM1 != null  and N_WCB_JTNUM1 != ''"> and N_WCB_JTNUM1 like concat('%', #{N_WCB_JTNUM1}, '%')</if>
+            <if test="N_WCB_JTPRICE1 != null  and N_WCB_JTPRICE1 != ''"> and N_WCB_JTPRICE1 like concat('%', #{N_WCB_JTPRICE1}, '%')</if>
+            <if test="N_WCB_JTAMOUNT1 != null  and N_WCB_JTAMOUNT1 != ''"> and N_WCB_JTAMOUNT1 like concat('%', #{N_WCB_JTAMOUNT1}, '%')</if>
+            <if test="N_WCB_JTNUM2 != null  and N_WCB_JTNUM2 != ''"> and N_WCB_JTNUM2 like concat('%', #{N_WCB_JTNUM2}, '%')</if>
+            <if test="N_WCB_JTPRICE2 != null  and N_WCB_JTPRICE2 != ''"> and N_WCB_JTPRICE2 like concat('%', #{N_WCB_JTPRICE2}, '%')</if>
+            <if test="N_WCB_JTAMOUNT2 != null  and N_WCB_JTAMOUNT2 != ''"> and N_WCB_JTAMOUNT2 like concat('%', #{N_WCB_JTAMOUNT2}, '%')</if>
+            <if test="N_WCB_JTNUM3 != null  and N_WCB_JTNUM3 != ''"> and N_WCB_JTNUM3 like concat('%', #{N_WCB_JTNUM3}, '%')</if>
+            <if test="N_WCB_JTPRICE3 != null  and N_WCB_JTPRICE3 != ''"> and N_WCB_JTPRICE3 like concat('%', #{N_WCB_JTPRICE3}, '%')</if>
+            <if test="N_WCB_JTAMOUNT3 != null  and N_WCB_JTAMOUNT3 != ''"> and N_WCB_JTAMOUNT3 like concat('%', #{N_WCB_JTAMOUNT3}, '%')</if>
+            <if test="N_WCB_JTNUM4 != null  and N_WCB_JTNUM4 != ''"> and N_WCB_JTNUM4 like concat('%', #{N_WCB_JTNUM4}, '%')</if>
+            <if test="N_WCB_JTPRICE4 != null  and N_WCB_JTPRICE4 != ''"> and N_WCB_JTPRICE4 like concat('%', #{N_WCB_JTPRICE4}, '%')</if>
+            <if test="N_WCB_JTAMOUNT4 != null  and N_WCB_JTAMOUNT4 != ''"> and N_WCB_JTAMOUNT4 like concat('%', #{N_WCB_JTAMOUNT4}, '%')</if>
+            <if test="N_WCB_JTNUM5 != null  and N_WCB_JTNUM5 != ''"> and N_WCB_JTNUM5 like concat('%', #{N_WCB_JTNUM5}, '%')</if>
+            <if test="N_WCB_JTPRICE5 != null  and N_WCB_JTPRICE5 != ''"> and N_WCB_JTPRICE5 like concat('%', #{N_WCB_JTPRICE5}, '%')</if>
+            <if test="N_WCB_JTAMOUNT5 != null  and N_WCB_JTAMOUNT5 != ''"> and N_WCB_JTAMOUNT5 like concat('%', #{N_WCB_JTAMOUNT5}, '%')</if>
+            <if test="N_WCB_JTNUM6 != null  and N_WCB_JTNUM6 != ''"> and N_WCB_JTNUM6 like concat('%', #{N_WCB_JTNUM6}, '%')</if>
+            <if test="N_WCB_JTPRICE6 != null  and N_WCB_JTPRICE6 != ''"> and N_WCB_JTPRICE6 like concat('%', #{N_WCB_JTPRICE6}, '%')</if>
+            <if test="N_WCB_JTAMOUNT6 != null  and N_WCB_JTAMOUNT6 != ''"> and N_WCB_JTAMOUNT6 like concat('%', #{N_WCB_JTAMOUNT6}, '%')</if>
+        </where>
+    </select>
+
+    <select id="selectListbyIds" parameterType="java.util.Map" resultType="TGuijiZennerMeterReadingInfor">
+        <include refid="selectVo"/>
+        where id in (${ids})
     </select>
 
-    <select id="selectTotal666666666666666666666666666" parameterType="TGuijiZennerMeterReadingInfor" resultType="TGuijiZennerMeterReadingInfor">
+    <select id="selectIds" parameterType="TGuijiZennerMeterReadingInfor" resultType="TGuijiZennerMeterReadingInfor">
         select id from t_guiji_gas_zenner_meter_reading_infor
         where 1 = 1
         <if test="GUID != null  and GUID != ''"> and GUID like concat('%', #{GUID}, '%')</if>

mybusiness/src/main/resources/templates/system/gas/zenner_meter_reading_infor/zenner_meter_reading_infor.html

@@ -299,9 +299,13 @@
                     field: 'vcwcbuserguid',
                     title: '用户GUID'
                 },*/
-                {
+                /*{
                     field: 'vcwcbmeterguid',
                     title: '气表GUID'
+                },*/
+                {
+                    field: 'vcwcbcode',
+                    title: '条形码'
                 },
                 {
                     field: 'vcwcbperson',
@@ -315,7 +319,7 @@
                     field: 'nwcbused',
                     title: '累计用气量'
                 },
-                {
+                /*{
                     field: 'nwcbheji',
                     title: '累计用气量'
                 },
@@ -326,7 +330,7 @@
                 {
                     field: 'nwcbleave',
                     title: '剩余气量|金额'
-                },
+                },*/
                 /*{
                     field: 'nwcbbuy',
                     title: '总购气量|金额'
@@ -351,7 +355,7 @@
                     field: 'vcwcbremoteclosevalve',
                     title: '是否远程关阀'
                 },
-                {
+                /*{
                     field: 'vcwcbreveal',
                     title: '是否泄漏'
                 },
@@ -362,19 +366,19 @@
                 {
                     field: 'vcwcbmagneticdisturbance',
                     title: '磁干扰'
-                },
+                },*/
                 {
                     field: 'vcwcbvalvestate',
                     title: '阀门状态'
                 },
-                {
+                /*{
                     field: 'vcwcbbattery',
                     title: '电池电量高低'
                 },
                 {
                     field: 'vcwcbflow',
                     title: '是否过流'
-                },
+                },*/
                 {
                     field: 'vcwcbbatteryper',
                     title: '电池百分比'
@@ -391,30 +395,26 @@
                     field: 'vcwcbaddress',
                     title: '地址'
                 },*/
-                {
-                    field: 'vcwcbcode',
-                    title: '条形码'
-                },
-                {
+                /*{
                     field: 'vcwcbvalveerr',
                     title: '阀门故障'
                 },
                 {
                     field: 'vcwcbarrearsclosevalue',
                     title: '欠费关阀'
-                },
+                },*/
                 /*{
                     field: 'vcwcbinnerbaterr',
                     title: '内电低电'
                 },*/
-                {
+                /*{
                     field: 'vcwcbdie',
                     title: '死表故障'
                 },
                 {
                     field: 'vcwcbtilt',
                     title: '倾斜故障'
-                },
+                },*/
                 /*{
                     field: 'vcwcbmonthvalue',
                     title: '月冻结气量'
@@ -429,7 +429,7 @@
                 },*/
                 {
                     field: 'vcwcbusedate',
-                    title: '用气日期YYYYMMDD'
+                    title: '用气日期'
                 },
                 /*{
                     field: 'vcwcbusername',