update 财务中心查询接口新增字段、增加搜索

This commit is contained in:
Lemon
2023-09-16 13:45:22 +08:00
parent d869c47282
commit e524a81493
8 changed files with 168 additions and 40 deletions

View File

@@ -3,16 +3,14 @@ package com.jsowell.web.controller.pile;
import com.jsowell.common.annotation.Log;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.domain.AjaxResult;
import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
import com.jsowell.common.core.page.TableDataInfo;
import com.jsowell.common.enums.BusinessType;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.PageUtils;
import com.jsowell.common.util.SecurityUtils;
import com.jsowell.common.util.poi.ExcelUtil;
import com.jsowell.pile.domain.PileMerchantInfo;
import com.jsowell.pile.dto.CreateMerchantDTO;
import com.jsowell.pile.dto.PageDTO;
import com.jsowell.pile.dto.QueryMerchantInfoDTO;
import com.jsowell.pile.service.IPileMerchantInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -131,16 +129,10 @@ public class PileMerchantInfoController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('pile:merchant:query')")
@PostMapping("/getFinancialMerchantList")
public TableDataInfo getFinancialMerchantList(@RequestBody PageDTO dto) {
public TableDataInfo getFinancialMerchantList(@RequestBody QueryMerchantInfoDTO dto) {
int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum();
int pageSize = dto.getPageSize() == 0 ? 10 : dto.getPageSize();
// 权限过滤
AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
if (authorizedMap == null) {
// 为空表示没有权限,返回空数组
return new TableDataInfo();
}
PageUtils.startPage(pageNum, pageSize);
return getDataTable(pileMerchantInfoService.queryInfoListByIds(authorizedMap));
return getDataTable(pileMerchantInfoService.queryMerchantInfoListByAuth(dto));
}
}