Bladeren bron

代码修改

wangchangsheng 2 jaren geleden
bovenliggende
commit
2df3e6d28e

+ 2 - 1
web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/WindpowerstationController.java

@@ -138,9 +138,10 @@ public class WindpowerstationController {
                       @RequestParam(value = "name",required = false) String name,
                       @RequestParam(value = "code",required = false) String code,
                       @RequestParam(value = "companyid",required = false) String companyid,
+                      @RequestParam(value = "regionid",required = false) String regionid,
                       @RequestParam(value = "pageNum",required = true) String pageNum,
                       @RequestParam(value = "pageSize",required = true) String pageSize){
-        IPage<Windpowerstation> list = windpowerstationService.getList(id,name,code,companyid,pageNum,pageSize);
+        IPage<Windpowerstation> list = windpowerstationService.getList(id,name,code,companyid,regionid,pageNum,pageSize);
         if (null != list){
             return R.ok().data(list);
         }else {

+ 1 - 1
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IWindpowerstationService.java

@@ -20,7 +20,7 @@ import java.util.List;
 public interface IWindpowerstationService extends IService<Windpowerstation> {
 
 
-    IPage<Windpowerstation> getList(String id, String name, String code, String companyid, String pageNum, String pageSize);
+    IPage<Windpowerstation> getList(String id, String name, String code, String companyid,String regionid, String pageNum, String pageSize);
 
     Windpowerstation getOne(String id);
 

+ 1 - 1
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/CompanysServiceImpl.java

@@ -27,7 +27,7 @@ public class CompanysServiceImpl extends ServiceImpl<CompanysMapper, Companys> i
     public IPage<Companys> list(String id, String name, String aname, String pageNum, String pageSize) {
         QueryWrapper<Companys> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
-            qw.like("id", id);
+            qw.eq("id", id);
         }
         if (StringUtils.isNotEmpty(name)) {
             qw.like("name", name);

+ 1 - 1
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/RegionServiceImpl.java

@@ -37,7 +37,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         }
 
         if (StringUtils.isNotEmpty(companyid)){
-            qw.like("companyid",companyid);
+            qw.eq("companyid",companyid);
         }
         if (StringUtils.isNotEmpty(aname)){
             qw.like("aname",aname);

+ 5 - 2
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/WindpowerstationServiceImpl.java

@@ -41,7 +41,7 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
     private EdosUtil goldenUtil;
 
     @Override
-    public IPage<Windpowerstation> getList(String id, String name, String code, String companyid, String pageNum, String pageSize) {
+    public IPage<Windpowerstation> getList(String id, String name, String code, String companyid, String regionid,String pageNum, String pageSize) {
 
         QueryWrapper<Windpowerstation> qw = new QueryWrapper<>();
 
@@ -58,9 +58,12 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
         }
 
         if (StringUtils.isNotEmpty(companyid)){
-            qw.like("companyid",companyid);
+            qw.eq("companyid",companyid);
         }
 
+        if (StringUtils.isNotEmpty(regionid)){
+            qw.eq("regionid",regionid);
+        }
         Page<Windpowerstation> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         IPage<Windpowerstation> companysPage = getBaseMapper().selectPage(page, qw);
 //        List<Windpowerstation> list = companysPage.getRecords();