综合展示技术等级情况农村公路and公路路面情况农村公路 type多条件查询功能

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGljsdjqkController.java

@@ -32,6 +32,12 @@ public class ZhtjGljsdjqkController extends BaseController  {
    */
   @GetMapping("/page")
   public R getZhtjGljsdjqkPage(Page page, ZhtjGljsdjqk zhtjGljsdjqk) {
+
+    if(zhtjGljsdjqk!=null && zhtjGljsdjqk.getType().length()>10){
+      String type = zhtjGljsdjqk.getType();
+      zhtjGljsdjqk.setType(null);
+      return  new R<>(zhtjGljsdjqkService.page(page,Wrappers.query(zhtjGljsdjqk).lambda().inSql(ZhtjGljsdjqk::getType,type)));
+    }
     return  new R<>(zhtjGljsdjqkService.page(page,Wrappers.query(zhtjGljsdjqk)));
   }
 

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGllmqkController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGljsdjqk;
 import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGllmqk;
 import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjGllmqkService;
 import com.elephant.framework.galaxy.aroad.response.R;
@@ -32,6 +33,12 @@ public class ZhtjGllmqkController extends BaseController  {
    */
   @GetMapping("/page")
   public R getZhtjGllmqkPage(Page page, ZhtjGllmqk zhtjGllmqk) {
+
+    if(zhtjGllmqk!=null && zhtjGllmqk.getType().length()>10){
+      String type = zhtjGllmqk.getType();
+      zhtjGllmqk.setType(null);
+      return new R<>(zhtjGllmqkService.page(page,Wrappers.query(zhtjGllmqk).lambda().inSql(ZhtjGllmqk::getType,type)));
+    }
     return  new R<>(zhtjGllmqkService.page(page,Wrappers.query(zhtjGllmqk)));
   }
   /**

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGljsdjqkService.java

@@ -22,4 +22,11 @@ public interface ZhtjGljsdjqkService extends IService<ZhtjGljsdjqk> {
      * @return Echarts格式数据
      */
     BarEchartsVo getZhtjGljsdjqkztqkEchartData(String year, String type);
+
+    /**
+     * 根据types分页查询对应的农村公路数据
+     * @param types
+     * @return
+     */
+    IPage<List<ZhtjGljsdjqk>> getZhtjGljsdjqkNcglListByTypes(Page page,String types);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGljsdjqkServiceImpl.java

 package com.elephant.framework.galaxy.aroad.module.zhtj.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -31,7 +32,7 @@ public class ZhtjGljsdjqkServiceImpl extends ServiceImpl<ZhtjGljsdjqkMapper, Zht
     private final ZhtjGljsdjqkMapper zgtjgljsdjqkMapper;
 
     /**
-     * 根据年份查询公路通车/养护里程列表
+     * 根据年份查询公路等级总体情况柱状图数据
      *
      * @return Echarts格式数据
      */
@@ -91,4 +92,14 @@ public class ZhtjGljsdjqkServiceImpl extends ServiceImpl<ZhtjGljsdjqkMapper, Zht
 
         return echartsVo;
     }
+
+    /**
+     * 根据types分页查询对应的农村公路数据
+     * @param types
+     * @return
+     */
+    public IPage<List<ZhtjGljsdjqk>> getZhtjGljsdjqkNcglListByTypes(Page page,String types){
+        IPage ipage = zgtjgljsdjqkMapper.selectPage(page,Wrappers.<ZhtjGljsdjqk>query().lambda().inSql(ZhtjGljsdjqk::getType,types));
+        return ipage;
+    }
 }