renkang/zhst-finance-model
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: renkang/zhst-finance-model:e364fad6456ead769c5ad8768f6535100fbc94d5
Branches Tags
renkang/zhst-finance-model:master
..
compare: renkang/zhst-finance-model:8763fd66e6b7bc3ef4dd3d7ea220437f05776f80
Branches Tags
renkang/zhst-finance-model:master
2 Commits
e364fad645 .. 8763fd66e6
Author SHA1 Message Date
hejiayang 8763fd66e6 流水明细相关鉴权回滚 2025-12-12 12:06:42 +08:00
hejiayang 7ac528635f 消费流水 部门筛选调整 2025-12-12 12:01:27 +08:00
2 changed files with 38 additions and 32 deletions
Expand all files Collapse all files
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java
+32 -32
View File
@@ -435,10 +435,10 @@ public class StClientMemberBalanceController {
query.setStartTime(query.getDates().get(0));
query.setEndTime(query.getDates().get(1));
}
//余: 去掉鉴权, 要能看到所有的
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// String canteenId = sysUser.getCanteenId();
// query.setCanteenId(canteenId);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String canteenId = sysUser.getCanteenId();
query.setCanteenId(canteenId);
//消费=101
query.setStatus(101);
return Result.OK(iStClientMemberTransactionRecordService.pageQueryNew(query));
@@ -457,20 +457,20 @@ public class StClientMemberBalanceController {
query.setStartTime(split[0]);
query.setEndTime(split[1]);
}
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// //餐品总库只查询内置食堂
// if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){
// // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据
//// ScreenVo screenVo = new ScreenVo();
//// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID);
//// canteenIdList.add(screenVo);
// } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) {
// //查询当前登录用户的食堂列表
// String canteenId = sysUser.getCanteenId();
// query.setCanteenId(canteenId);
// } else {
// return Result.OK();
// }
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//餐品总库只查询内置食堂
if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){
// 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据
// ScreenVo screenVo = new ScreenVo();
// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID);
// canteenIdList.add(screenVo);
} else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) {
//查询当前登录用户的食堂列表
String canteenId = sysUser.getCanteenId();
query.setCanteenId(canteenId);
} else {
return Result.OK();
}
query.setStatus(1);//消费=101
List<StClientMemberTransactionRecordVO> statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query);
StClientMemberTransactionRecordVO sumResult = GenericSumUtil.sumList(statisticsCanteenBusiness, StClientMemberTransactionRecordVO.class);
@@ -497,20 +497,20 @@ public class StClientMemberBalanceController {
if(StringUtils.isNotBlank(query.getEndDate())){
query.setEndTime(query.getEndDate());
}
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// //餐品总库只查询内置食堂
// if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){
// // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据
//// ScreenVo screenVo = new ScreenVo();
//// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID);
//// canteenIdList.add(screenVo);
// } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) {
// //查询当前登录用户的食堂列表
// String canteenId = sysUser.getCanteenId();
// query.setCanteenId(canteenId);
// } else {
// return;
// }
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//餐品总库只查询内置食堂
if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){
// 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据
// ScreenVo screenVo = new ScreenVo();
// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID);
// canteenIdList.add(screenVo);
} else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) {
//查询当前登录用户的食堂列表
String canteenId = sysUser.getCanteenId();
query.setCanteenId(canteenId);
} else {
return;
}
query.setStatus(1);//消费=101
List<StClientMemberTransactionRecordVO> statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query);
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StClientMemberTransactionRecordServiceImpl.java
+6
View File
@@ -74,6 +74,12 @@ public class StClientMemberTransactionRecordServiceImpl extends JeecgServiceImpl
public IPage<StClientMemberTransactionRecordVO> pageQueryNew(StClientMemberTransactionRecordDTO query) {
Page<StClientMemberTransactionRecordVO> page = new Page<>(query.getPageNo(), query.getPageSize());
page.setSearchCount(false);
if(StringUtils.isNotBlank(query.getDepartId())){
List<String> allCascadeDeptIds = iSysPayDepartService.getAllCascadeDeptIds(query.getDepartId());
if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(allCascadeDeptIds)){
query.setList(allCascadeDeptIds);
}
}
//计算总数
long l = baseMapper.pageListCount(query);
page.setTotal(l);