LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:邮寄添加邮寄人

Browse Source
This commit is contained in:
zhangqinlin
2021-10-18 17:05:31 +08:00
parent dfd9ce3470
commit a3224b7704
11 changed files with 126 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+46 -45
View File
@@ -84,19 +84,19 @@ public class AllProjectStatisticsController {
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
idList=null;
//企业职员项目负责人
}else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
}else {
} else {
throw new JeroBootException("权限异常");
}
@@ -161,19 +161,19 @@ public class AllProjectStatisticsController {
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
idList=null;
//企业职员项目负责人
}else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
}else {
} else {
throw new JeroBootException("权限异常");
}
if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
@@ -236,21 +236,21 @@ public class AllProjectStatisticsController {
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
}
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
}
if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
Calendar calendar = Calendar.getInstance();
String year = String.valueOf(calendar.get(Calendar.YEAR));
@@ -276,21 +276,22 @@ public class AllProjectStatisticsController {
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
}
if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
Calendar calendar = Calendar.getInstance();
String year = String.valueOf(calendar.get(Calendar.YEAR));
@@ -331,16 +332,16 @@ public class AllProjectStatisticsController {
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+29 -29
View File
@@ -147,21 +147,21 @@ public class CompanyComeMoneyStatisticsController {
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
idList=null;
//企业职员项目负责人
}else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
String userId = sysUser.getId();
idList.add(userId);
}else {
throw new JeroBootException("权限异常");
}
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
}
Page<CompanyComeMoneyDetail> page = new Page<>(pageNo, pageSize);
IPage<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList);
HashMap<String, Object> hashMap = new HashMap<>();
@@ -215,16 +215,16 @@ public class CompanyComeMoneyStatisticsController {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
@@ -255,16 +255,16 @@ public class CompanyComeMoneyStatisticsController {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
+14 -14
View File
@@ -159,16 +159,16 @@ public class PayWorkingGroupStatisticsController {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
@@ -202,16 +202,16 @@ public class PayWorkingGroupStatisticsController {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+22 -22
View File
@@ -78,21 +78,21 @@ public class PrincipalPeopleStatisticsController {
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
idList=null;
//企业职员项目负责人
}else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
String userId = sysUser.getId();
idList.add(userId);
}else {
throw new JeroBootException("权限异常");
}
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
throw new JeroBootException("权限异常");
}
Page<PrincipalPeopleList> page = new Page<>(pageNo, pageSize);
IPage<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipal(page,principalPeopleSearch,idList);
@@ -197,16 +197,16 @@ public class PrincipalPeopleStatisticsController {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//所领导和admin
if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//科长
} else if (roleCodes.contains(constant.BMFZR)) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) {
idList = null;
//企业职员项目负责人
} else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) {
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {