zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
dzc committed 2025-06-25 20:58:35 +08:00
1 parent 5cc25a197b
commit 203047f713
5 files changed
+16 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeInvoiceController.java
+6 -2
View File
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.bsd.pjcloud.common.core.util.R;
import com.bsd.pjcloud.common.data.datascope.DataScope;
import com.bsd.pjcloud.common.log.annotation.SysLog;
import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeBindInvoiceDto;
import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeInvoiceEntity;
@@ -51,14 +52,17 @@ public class WalletRechargeInvoiceController {
@Operation(summary = "下拉", description = "下拉")
@GetMapping("/select")
public R select(@ParameterObject Page page, @ParameterObject WalletRechargeBindInvoiceDto dto) {
return R.ok(walletRechargeInvoiceService.scopePageList(page, dto));
DataScope dataScope = null;
return R.ok(walletRechargeInvoiceService.scopePageList(page, dto, dataScope));
}
@Operation(summary = "分页查询", description = "分页查询")
@GetMapping("/page")
@PreAuthorize("@pms.hasPermission('wallet_walletRechargeInvoice_view')")
public R getWalletRechargeInvoicePage(@ParameterObject Page page, @ParameterObject WalletRechargeBindInvoiceDto dto) {
return R.ok(walletRechargeInvoiceService.scopePageList(page, dto));
DataScope dataScope = DataScope.of();
dataScope.setScopeDeptName("apply_dept_id");
return R.ok(walletRechargeInvoiceService.scopePageList(page, dto, dataScope));
}
@Operation(summary = "通过id查询", description = "通过id查询")
pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeApplyMapper.java
+3 -3
View File
@@ -71,9 +71,9 @@ public interface WalletRechargeApplyMapper extends PjcloudBaseMapper<WalletRecha
wrapper.orderByDesc(WalletRechargeApplyEntity::getProcessTime)
.orderByDesc(WalletRechargeApplyEntity::getId);
} else {
// wrapper.orderByDesc(WalletRechargeApplyEntity::getApplyTime)
// .orderByDesc(WalletRechargeApplyEntity::getCreateTime);
wrapper.orderByDesc(WalletRechargeApplyEntity::getCreateTime);
wrapper.orderByDesc(WalletRechargeApplyEntity::getApplyTime)
.orderByDesc(WalletRechargeApplyEntity::getCreateTime);
// wrapper.orderByDesc(WalletRechargeApplyEntity::getCreateTime);
}
Page list = selectPageByScope(page, wrapper, DataScope.of());
pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeInvoiceMapper.java
+2 -1
View File
@@ -1,6 +1,7 @@
package com.bsd.pjcloud.wallet.mapper.recharge;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.bsd.pjcloud.common.data.datascope.DataScope;
import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeBindInvoiceDto;
import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeInvoiceEntity;
@@ -19,7 +20,7 @@ public interface WalletRechargeInvoiceMapper extends PjcloudBaseMapper<WalletRec
/**
* 分页权限查询
*/
Page<WalletRechargeInvoiceVo> scopePageList(Page page, @Param("dto") WalletRechargeBindInvoiceDto dto);
Page<WalletRechargeInvoiceVo> scopePageList(Page page, @Param("dto") WalletRechargeBindInvoiceDto dto, DataScope dataScope);
/**
* 查询详情
pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeInvoiceService.java
+2 -1
View File
@@ -2,6 +2,7 @@ package com.bsd.pjcloud.wallet.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.bsd.pjcloud.common.data.datascope.DataScope;
import com.bsd.pjcloud.common.security.service.PjcloudUser;
import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeBindInvoiceDto;
import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeInvoiceEntity;
@@ -15,7 +16,7 @@ public interface WalletRechargeInvoiceService extends IService<WalletRechargeInv
/**
* 分页查询
*/
Page<WalletRechargeInvoiceVo> scopePageList(Page page, WalletRechargeBindInvoiceDto dto);
Page<WalletRechargeInvoiceVo> scopePageList(Page page, WalletRechargeBindInvoiceDto dto, DataScope dataScope);
/**
* 查询详情
pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java
+3 -2
View File
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.bsd.pjcloud.admin.api.dto.UserInfo;
import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
import com.bsd.pjcloud.common.data.datascope.DataScope;
import com.bsd.pjcloud.common.security.service.PjcloudUser;
import com.bsd.pjcloud.flow.task.constant.TaskCheckStatusEnum;
import com.bsd.pjcloud.wallet.api.constant.WalletBizRechargeEnum;
@@ -53,8 +54,8 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl<WalletRecharge
* 分页查询
*/
@Override
public Page<WalletRechargeInvoiceVo> scopePageList(Page page, WalletRechargeBindInvoiceDto dto) {
return baseMapper.scopePageList(page, dto);
public Page<WalletRechargeInvoiceVo> scopePageList(Page page, WalletRechargeBindInvoiceDto dto, DataScope dataScope) {
return baseMapper.scopePageList(page, dto, dataScope);
}
/**