Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/controller/ZhjsGcxmController.java

 package com.elephant.framework.galaxy.aroad.module.zhjs.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.elephant.framework.galaxy.aroad.response.R;
@@ -37,6 +38,14 @@ public class ZhjsGcxmController extends BaseController  {
     return  new R<>(zhjsGcxmService.page(page,Wrappers.query(zhjsGcxm)));
   }
 
+  /**
+   * 根据项目名称分页模糊查询数据
+   */
+  @GetMapping("/getGcxm")
+  public R getZhjsGcxmPageByProName(Page page, String proname) {
+    return new R<>(zhjsGcxmService.getZhjsGcxmPageByProName(page,proname));
+  }
+
   /**
    * 根据项目ID查询项目情况
    * @param xmid

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/service/ZhjsGcxmService.java

 package com.elephant.framework.galaxy.aroad.module.zhjs.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.elephant.framework.galaxy.aroad.module.common.entity.KeyValues;
 import com.elephant.framework.galaxy.aroad.module.zhjs.entity.*;
@@ -36,4 +38,9 @@ public interface ZhjsGcxmService extends IService<ZhjsGcxm> {
      * 查询综合展示图二数据
      */
     List<KeyValues> getZhjsZhzsTwoDatas(String city);
+
+    /**
+     * 根据项目名称分页模糊查询数据
+     */
+    IPage<ZhjsGcxm> getZhjsGcxmPageByProName(Page page, String proname);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/service/impl/ZhjsGcxmServiceImpl.java

 package com.elephant.framework.galaxy.aroad.module.zhjs.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.elephant.framework.galaxy.aroad.module.common.entity.KeyValues;
 import com.elephant.framework.galaxy.aroad.module.zhjs.entity.*;
@@ -131,4 +134,11 @@ public class ZhjsGcxmServiceImpl extends ServiceImpl<ZhjsGcxmMapper, ZhjsGcxm> i
         }
         return zhjsZhzsThrees;
     }
-}
+
+    /**
+     * 根据项目名称分页模糊查询数据
+     */
+    public IPage<ZhjsGcxm> getZhjsGcxmPageByProName(Page page, String proname) {
+        return zhjsGcxmMapper.selectPage(page, Wrappers.<ZhjsGcxm>query().lambda().like(ZhjsGcxm::getProname, proname));
+    }
+}
\ No newline at end of file