From b1415ac2adf2f31f41ea655d1824235f4b0ba1d9 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Sat, 14 Sep 2024 19:16:09 +0800
Subject: [PATCH] 湖北水库：审批驳回修复
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 199 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 173 insertions(+), 26 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 29f564b..17af6ef 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
@@ -16,6 +16,7 @@
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DateUtil;
@@ -71,11 +72,33 @@
List<SgProgressReportVO> list = sgProgressReportMapper.queryPageList(page,searchDTO);
if(list != null){
list.forEach(s ->{
- Long proframId = s.getProframId();
- SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(proframId);
- String controlUnit = sgProjectInfoDO.getControlUnit();
- List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
- s.setUserIDs(users);
+ List<String> resultUsers=new ArrayList<>();
+ if(s.getControlUnit()!=null){
+ String controlUnit = s.getControlUnit();
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ resultUsers.addAll(users);
+ }
+// if(s.getSelfUnit()!=null){
+// String selfUnit = s.getSelfUnit().toString();
+// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
+// resultUsers.addAll(selfUnitusers);
+// }
+
+
+ s.setUserIDs(resultUsers);
+ String gxStepName = s.getGxStepName();
+ String countyCd = s.getCountyCd();
+
+ if("测量定位".equals(gxStepName)){
+
+ if(countyCd!=null){
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ s.setXbUnitIDs(xbUnitIDs);
+ }
+
+ }
+
+
});
}
@@ -86,11 +109,33 @@
List<SgProgressReportVO> list = sgProgressReportMapper.queryPageListAll(page,searchDTO);
if(list != null){
list.forEach(s ->{
- Long proframId = s.getProframId();
- SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(proframId);
- String controlUnit = sgProjectInfoDO.getControlUnit();
- List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
- s.setUserIDs(users);
+ List<String> resultUsers=new ArrayList<>();
+ if(s.getControlUnit()!=null){
+ String controlUnit = s.getControlUnit();
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ resultUsers.addAll(users);
+ }
+// if(s.getSelfUnit()!=null){
+// String selfUnit = s.getSelfUnit().toString();
+// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
+// resultUsers.addAll(selfUnitusers);
+// }
+
+
+ s.setUserIDs(resultUsers);
+ String gxStepName = s.getGxStepName();
+ String countyCd = s.getCountyCd();
+
+ if("测量定位".equals(gxStepName)){
+
+ if(countyCd!=null){
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ s.setXbUnitIDs(xbUnitIDs);
+ }
+
+ }
+
+
});
}
@@ -193,8 +238,10 @@
SgDeviceDO sgDeviceDO = new SgDeviceDO();
if (gxDeviceId == 999){
deviceType = "sgzb";
+ sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
}else if(gxDeviceId == 998){
deviceType = "sgys";
+ sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
}else {
sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
deviceType = sgDeviceDO.getDeviceType();
@@ -250,7 +297,7 @@
sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
}else {
sgProgressReportVO.setDeviceName("");}
- List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getId).list();
+ List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getApprovalTime).list();
List<Long> ids = list.stream().map(s -> s.getUserId()).collect(Collectors.toList());
List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(ids);
for (Map<String, Object> user : users) {
@@ -265,6 +312,23 @@
List<SgStepReportVO> sgStepReportVOS = sgProgressReportMapper.selectByDeviceId(sgProgressReportVO.getGxDeviceId());
sgStepReportVOS = sgStepReportVOS.stream().filter(s -> s.getApprovalStatus() == null || (s.getApprovalStatus() != 4 && !(s.getApprovalStatus() == 3 && s.getResubmit() != 0))).collect(Collectors.toList());
sgProgressReportVO.setSgStepReportVOS(sgStepReportVOS);
+
+ if(sgProgressReportVO.getControlUnit()!=null){
+ String controlUnit = sgProgressReportVO.getControlUnit();
+ List<String> users1=sgProjectInfoMapper.getUserS(controlUnit);
+ sgProgressReportVO.setUserIDs(users1);
+ }
+ String gxStepName = sgProgressReportVO.getGxStepName();
+ String countyCd = sgProgressReportVO.getCountyCd();
+
+ if("测量定位".equals(gxStepName)){
+
+ if(countyCd!=null){
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ sgProgressReportVO.setXbUnitIDs(xbUnitIDs);
+ }
+
+ }
return sgProgressReportVO;
}
@@ -284,12 +348,15 @@
SgProgressReportDO sgProgressReportDOS1 = sgProgressReportMapper.selectOne(wrappers);
//判断当前用户的角色是不是 工序配置的审核的角色
-
- List<SgGxConfigDO> sgGxConfigDOS = new LambdaQueryChainWrapper<>(sgGxConfigMapper)
- .eq(SgGxConfigDO::getGxDeviceType, sgProgressReportDOS1.getDeviceType()).eq(SgGxConfigDO::getGxStepId, sgProgressReportDOS1.getGxStepId()).orderByAsc(SgGxConfigDO::getSgOrder).list();
- List<String> roIds = sgGxConfigDOS.stream().map(SgGxConfigDO::getRoleId).collect(Collectors.toList());
- if (CollectionUtils.isEmpty(roIds)){
- throw new ServiceException("请完成工序角色配置！");
+ Long gxDeviceId = sgProgressReportDOS1.getGxDeviceId();
+ if (gxDeviceId != 998 && gxDeviceId != 999) {
+ List<SgGxConfigDO> sgGxConfigDOS = new LambdaQueryChainWrapper<>(sgGxConfigMapper)
+// .eq(SgGxConfigDO::getGxDeviceType, sgProgressReportDOS1.getDeviceType())
+ .eq(SgGxConfigDO::getGxStepId, sgProgressReportDOS1.getGxStepId()).orderByAsc(SgGxConfigDO::getSgOrder).list();
+ List<String> roIds = sgGxConfigDOS.stream().map(SgGxConfigDO::getRoleId).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(roIds)){
+ throw new ServiceException("请完成工序角色配置！");
+ }
}
SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectById(id);
List<SgReportUserDO> sgReportUserDOS = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).ne(SgReportUserDO::getApprovalOrder,0).eq(SgReportUserDO::getIsHis,0)
@@ -332,6 +399,7 @@
updateChainWrapper.set(SgProgressReportDO::getStatus,3);
updateChainWrapper.set(SgProgressReportDO::getResubmit,0);
userUpdate.set(SgReportUserDO::getApprovalStatus,2);
+ userUpdate.set(SgReportUserDO::getUserId,userId);
if (isReject==1){
userUpdate.set(SgReportUserDO::getUserId,userId);
}
@@ -452,17 +520,60 @@
@Override
public List<SgProgressReportVO> queryList(ProjectSearchDTO searchDTO) {
- Long userId = AuthUtil.getUserId();
- searchDTO.setUserId(userId);
+ BladeUser user = AuthUtil.getUser();
+ if(!user.getRoleId().equals("1811657352658042882")){
+
+ searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+ }
+ searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
+ //searchDTO.setUserId(userId);
List<SgProgressReportVO> list = sgProgressReportMapper.queryList(searchDTO);
+ if(list != null){
+ list.forEach(s ->{
+ List<String> resultUsers=new ArrayList<>();
+ if(s.getControlUnit()!=null){
+ String controlUnit = s.getControlUnit();
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ resultUsers.addAll(users);
+ }
+// if(s.getSelfUnit()!=null){
+// String selfUnit = s.getSelfUnit().toString();
+// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
+// resultUsers.addAll(selfUnitusers);
+// }
+
+
+ s.setUserIDs(resultUsers);
+ String gxStepName = s.getGxStepName();
+ String countyCd = s.getCountyCd();
+
+ if("测量定位".equals(gxStepName)){
+
+ if(countyCd!=null){
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ s.setXbUnitIDs(xbUnitIDs);
+ }
+
+ }
+
+
+ });
+
+ }
return list;
}
@Override
public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
- Long userId = AuthUtil.getUserId();
- searchDTO.setUserId(userId);
- searchDTO.setAuditPerson(userId.toString());
+ BladeUser user = AuthUtil.getUser();
+ if(!user.getRoleId().equals("1811657352658042882")){
+
+ searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+ }
+
+ searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
+ //searchDTO.setUserId(userId);
+ //searchDTO.setAuditPerson(userId.toString());
List<SgProgressReportVO> all = sgProgressReportMapper.queryList(searchDTO);
searchDTO.setApprovalStatus(0);
List<SgProgressReportVO> pending = sgProgressReportMapper.queryList(searchDTO);
@@ -535,12 +646,48 @@
@Override
public IPage<SgProgressReportVO> progressPage(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
- Long userId = AuthUtil.getUserId();
- searchDTO.setUserId(userId);
- if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
- searchDTO.setAuditPerson(String.valueOf(userId));
+ BladeUser user = AuthUtil.getUser();
+ //判断是不是县级建办 否的话就是监理单位下人员进行
+ if(!user.getRoleId().equals("1811657352658042882")){
+ searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
}
+ searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
+// if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
+// searchDTO.setAuditPerson(String.valueOf(userId));
+// }
List<SgProgressReportVO> list = sgProgressReportMapper.queryList(page, searchDTO);
+ if(list != null){
+ list.forEach(s ->{
+ List<String> resultUsers=new ArrayList<>();
+ if(s.getControlUnit()!=null){
+ String controlUnit = s.getControlUnit();
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ resultUsers.addAll(users);
+ }
+// if(s.getSelfUnit()!=null){
+// String selfUnit = s.getSelfUnit().toString();
+// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
+// resultUsers.addAll(selfUnitusers);
+// }
+
+
+ s.setUserIDs(resultUsers);
+ String gxStepName = s.getGxStepName();
+ String countyCd = s.getCountyCd();
+
+ if("测量定位".equals(gxStepName)){
+
+ if(countyCd!=null){
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ s.setXbUnitIDs(xbUnitIDs);
+ }
+
+ }
+
+
+ });
+
+ }
return page.setRecords(list);
}
--
Gitblit v1.9.3