From 8d491a439cd84ec8667e140a853040e591107fdf Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 23 Sep 2024 18:20:04 +0800
Subject: [PATCH] 湖北水库：审批流程问题整改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
index 83ef140..138a107 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -354,7 +354,7 @@
Integer isReject = approvalDTO.getIsReject();
Long userId = approvalDTO.getUserId();
Long id = approvalDTO.getId();
- String roleId = AuthUtil.getUser().getRoleId();
+ Long roleId = getRoleId();
QueryWrapper<SgProgressReportDO> wrappers = new QueryWrapper<>();
wrappers.eq("id", id);
SgProgressReportDO sgProgressReportDOS1 = sgProgressReportMapper.selectOne(wrappers);
@@ -377,7 +377,7 @@
//审批者
SgReportUserDO sgReportUserDO = new SgReportUserDO();
if (isReject==1){
- sgReportUserDO = SgReportUserDO.builder().reportId(approvalDTO.getId()).approvalOrder(sgReportUserDOS.get(sgReportUserDOS.size() - 1).getApprovalOrder()+1).roleId(Long.valueOf(roleId)).build();
+ sgReportUserDO = SgReportUserDO.builder().reportId(approvalDTO.getId()).approvalOrder(sgReportUserDOS.get(sgReportUserDOS.size() - 1).getApprovalOrder()+1).roleId(roleId).build();
sgReportUserMapper.insert(sgReportUserDO);
}else {
sgReportUserDO = sgReportUserDOS.stream().filter(s -> s.getRoleId().equals(Long.parseLong(sgProgressReportDO.getAuditPerson()))).findFirst().get();
@@ -511,13 +511,14 @@
@Override
public List<SgProgressReportVO> queryList(ProjectSearchDTO searchDTO) {
BladeUser user = AuthUtil.getUser();
- if(!user.getRoleId().equals("1811657352658042882")){
+ Long roleId = getRoleId();
+ if(!roleId.equals(1811657352658042882L)){
searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
}else{
searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
}
- searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
+ searchDTO.setRoleUnit(roleId);
//searchDTO.setUserId(userId);
List<SgProgressReportVO> list = sgProgressReportMapper.queryList(searchDTO);
if(list != null){
@@ -558,14 +559,15 @@
@Override
public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
BladeUser user = AuthUtil.getUser();
- if(!user.getRoleId().equals("1811657352658042882")){
+ Long roleId = getRoleId();
+ if(!roleId.equals(1811657352658042882L)){
searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
}else{
searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
}
- searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
+ searchDTO.setRoleUnit(roleId);
//searchDTO.setUserId(userId);
//searchDTO.setAuditPerson(userId.toString());
List<SgProgressReportVO> all = sgProgressReportMapper.queryList(searchDTO);
@@ -638,16 +640,31 @@
return true;
}
+ public Long getRoleId(){
+ BladeUser user = AuthUtil.getUser();
+ List<String> userRole = Arrays.asList(user.getRoleId().split(","));
+ List<Long> roleList = sgProgressReportMapper.getSgEngineerRole();
+ Long roleId = null;
+ for (String s : userRole) {
+ long l = Long.parseLong(s);
+ if (roleList.contains(l)){
+ roleId = l;
+ }
+ }
+ return roleId;
+ }
+
@Override
public IPage<SgProgressReportVO> progressPage(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
BladeUser user = AuthUtil.getUser();
+ Long roleId = getRoleId();
//判断是不是县级建办 否的话就是监理单位下人员进行
- if(!user.getRoleId().equals("1811657352658042882")){
+ if(!roleId.equals(1811657352658042882L)){
searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
}else{
searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
}
- searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
+ searchDTO.setRoleUnit(roleId);
// if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
// searchDTO.setAuditPerson(String.valueOf(userId));
// }
--
Gitblit v1.9.3