소스 검색

结算单-未上传账户数据分页

yangzian 3 년 전
부모
커밋
0a05a52643

+ 5 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -1073,13 +1073,17 @@ public class CwjsPolicyInfoController {
 								@RequestParam(name="projectId") String projectId,
 								@RequestParam(name="uploadYears") String uploadYears,
 								@RequestParam(name="mediaId") String mediaId,
-								@RequestParam(name="userId") String userId) {
+								@RequestParam(name="userId") String userId,
+								@RequestParam(name="pageNo") Integer pageNo,
+								@RequestParam(name="pageSize") Integer pageSize){
 		 SettlementFileParamsVo paramsVo = new SettlementFileParamsVo();
 		 paramsVo.setProductId(productId);
 		 paramsVo.setProjectId(projectId);
 		 paramsVo.setUploadYears(uploadYears);
 		 paramsVo.setMediaId(Integer.valueOf(mediaId));
 		 paramsVo.setUserId(userId);
+		 paramsVo.setPageNo(pageNo);
+		 paramsVo.setPageSize(pageSize);
 		 return cwjsPolicyInfoService.getSettlementNoPictureAccountList(paramsVo);
 	 }
 

+ 9 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsPolicyInfoServiceImpl.java

@@ -9,6 +9,7 @@ import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.entity.SysUser;
 import org.jeecg.common.util.DateUtils;
@@ -301,9 +302,15 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
 
        //过滤以上传的账户
        //List<JSONObject> list = policyInfoMapper.getSettlementNoPictureAccountList(productId,projectId,uploadYears,mediaIds);
-       List<JSONObject> list = policyInfoMapper.getSettlementNoPictureAccountAgentList(paramsVo.getProductId(),paramsVo.getProjectId(),paramsVo.getUploadYears(),accountIds);
 
-        return Result.successMsg("未上传结算单账户查询成功。",list);
+       if (Check.isNull(accountIds)){
+           return Result.errorMsg("未上传结算单账户列表查询为空。");
+       }
+
+       PageHelper.startPage(paramsVo.getPageNo(), paramsVo.getPageSize());
+       List<JSONObject> list = policyInfoMapper.getSettlementNoPictureAccountAgentList(paramsVo.getProductId(),paramsVo.getProjectId(),paramsVo.getUploadYears(),accountIds);
+       PageInfo<JSONObject> pageInfo = new PageInfo<>(list);
+       return Result.successMsg("未上传结算单账户查询成功。",pageInfo);
     }
 
 

+ 5 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/entity/vo/SettlementFileParamsVo.java

@@ -81,4 +81,9 @@ public class SettlementFileParamsVo implements Serializable {
     private Set<String> operatorUserIds;
     private Set<String> saleUserIds;
 
+    private Integer pageNo;
+    private Integer pageSize;
+
+
+
 }