项目管理

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/controller/BusinessInfoController.java

@@ -47,8 +47,8 @@ public class BusinessInfoController extends BaseController
      * 查询所有项目名称(支持模糊查询)
      */
     @PostMapping("/query/project")
-    public R<List<BusinessLikeProjectNameListVo>> queryprojectName(@RequestBody BusinessListDto dto){
-        return R.ok(businessInfoService.selectProjectName(dto));
+    public R<List<BusinessLikeProjectNameListVo>> queryprojectName(@RequestBody BusinessListDto dto,@RequestBody PageQuery pageQuery){
+        return R.ok(businessInfoService.selectProjectName(dto,pageQuery));
     }
 
     /**

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/service/IBusinessInfoService.java

@@ -57,7 +57,7 @@ public interface IBusinessInfoService
      * 查询所有项目名称(支持模糊查询)
      * @return
      */
-    List<BusinessLikeProjectNameListVo> selectProjectName(BusinessListDto dto);
+    List<BusinessLikeProjectNameListVo> selectProjectName(BusinessListDto dto,PageQuery pageQuery);
 
     /**
      * 项目批量导入

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/service/impl/BusinessInfoServiceImpl.java

@@ -138,11 +138,11 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     }
 
     @Override
-    public List<BusinessLikeProjectNameListVo> selectProjectName(BusinessListDto dto) {
+    public List<BusinessLikeProjectNameListVo> selectProjectName(BusinessListDto dto,PageQuery pageQuery) {
 //        List<BusinessLikeProjectNameListVo> vos = businessInfoMapper.selectProjectName(dto);
         List<BusinessLikeProjectNameListVo> vos = new ArrayList<>();
         try {
-            Map<String, Object> result = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/findByName", toRequestMap(dto));
+            Map<String, Object> result = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/findByName", toRequestMap(dto,pageQuery));
             if (ObjectUtil.isNotEmpty(result.get("data"))) {
                 List<Map<String, Object>> list = (List<Map<String, Object>>) BeanUtil.beanToMap(result.get("data")).get("list");
                 if (!CollectionUtils.isEmpty(list)) {
@@ -169,10 +169,10 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         return vos;
     }
 
-    private Map<String, Object> toRequestMap(BusinessListDto dto) {
+    private Map<String, Object> toRequestMap(BusinessListDto dto,PageQuery pageQuery) {
         Map<String, Object> page = new HashMap<>();
-        page.put("page", 1);
-        page.put("limit", 20);
+        page.put("page", pageQuery.getPageNum());
+        page.put("limit", pageQuery.getPageSize());
         Map<String, Object> map = new HashMap<>();
         map.put("keyword", dto.getProjectName());
         map.put("page", page);