增加分页,增加根据用户选择再用钢瓶

src/main/java/com/sooka/sponest/mobile/data/housingconstruction/HousingconstructionEnterpriseController.java

@@ -1,6 +1,9 @@
 package com.sooka.sponest.mobile.data.housingconstruction;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageDomain;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.core.web.page.TableSupport;
 import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionEnterpriseService;
 import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionEnterprise;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,11 +20,21 @@ public class HousingconstructionEnterpriseController {
 
     /**
      * 获取企业列表
+     *
      * @param enterprise
      * @return
      */
     @GetMapping("/enterprise/getListAll")
     public AjaxResult afforestationList(HousingconstructionEnterprise enterprise) {
-        return housingconstructionEnterpriseService.getListAll();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        String enterpriseName = enterprise.getEnterpriseName();
+        TableDataInfo listAll = housingconstructionEnterpriseService.getListAll(pageNum, pageSize, enterpriseName);
+        if (200 == listAll.getCode()) {
+            return AjaxResult.success(listAll.getRows());
+        } else {
+            return AjaxResult.error(listAll.getCode(), listAll.getMsg());
+        }
     }
 }

src/main/java/com/sooka/sponest/mobile/data/housingconstruction/HousingconstructionRealnameuserController.java

@@ -1,6 +1,9 @@
 package com.sooka.sponest.mobile.data.housingconstruction;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageDomain;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.core.web.page.TableSupport;
 import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionRealnameuser;
 import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionEnterpriseService;
 import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionRealnameuserService;
@@ -19,7 +22,17 @@ public class HousingconstructionRealnameuserController {
 
     @GetMapping("/realnameuser/getRealNameUserListAllByType")
     public AjaxResult getRealNameUserListAllByType(HousingconstructionRealnameuser realnameuser){
-        return housingconstructionRealnameuserService.getRealNameUserListAllByType(realnameuser.getEnterpriseUserType());
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        String userName = realnameuser.getUserName();
+        TableDataInfo list = housingconstructionRealnameuserService.getRealNameUserListAllByType(realnameuser.getEnterpriseUserType(), userName, pageNum, pageSize);
+        System.out.println("list = " + list);
+        if(200== list.getCode()){
+            return AjaxResult.success(list.getRows());
+        }else{
+            return AjaxResult.error(list.getCode(), list.getMsg());
+        }
     }
 
 

src/main/java/com/sooka/sponest/mobile/data/housingconstruction/HousingconstructionSteelcylinderController.java

@@ -1,8 +1,10 @@
 package com.sooka.sponest.mobile.data.housingconstruction;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionRealnameuser;
-import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionRealnameuserService;
+import com.ruoyi.common.core.web.page.PageDomain;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.core.web.page.TableSupport;
+import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSteelcylinderLog;
 import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionSteelcylinderService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,7 +25,17 @@ public class HousingconstructionSteelcylinderController{
     RemoteHousingconstructionSteelcylinderService steelcylinderService;
 
     @GetMapping("/steelcylinder/getSteelcylinderList")
-    public AjaxResult getRealNameUserListAllByType(HousingconstructionRealnameuser realnameuser){
-        return steelcylinderService.getSteelcylinderList();
+    public AjaxResult getRealNameUserListAllByType(HousingconstructionSteelcylinderLog steelcy){
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        String steelcylinderName = steelcy.getSteelcylinderName();
+        String joinHouseId = steelcy.getJoinHouseId();
+        TableDataInfo resultData = steelcylinderService.getSteelcylinderList(pageNum, pageSize, steelcylinderName, joinHouseId);
+        if(200 == resultData.getCode()){
+            return AjaxResult.success(resultData.getRows());
+        }else{
+            return AjaxResult.error(resultData.getCode(), resultData.getMsg());
+        }
     }
 }