From 2eaca6eee957d11234959153207c943deea77eae Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 30 Sep 2024 11:57:41 +0800
Subject: [PATCH] 湖北水库：解决审批上报错误
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 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 138a107..9af9a4b 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
@@ -145,6 +145,7 @@
@Transactional
public void add(SgProgressReportDO sgProgressReportDO) {
String resubmitId = sgProgressReportDO.getResubmitId();
+ Long roleId = getRoleId();
if (StringUtils.isNotBlank(resubmitId)){
new LambdaUpdateChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getId,resubmitId).set(SgProgressReportDO::getResubmit,1).update();
}
@@ -238,10 +239,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());
+ //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());
+ //sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
}else {
sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
deviceType = sgDeviceDO.getDeviceType();
@@ -258,9 +259,7 @@
// }
//Map<Long, Long> userMap = personConfigDOS.stream().collect(Collectors.toMap(SgProjectPersonConfigDO::getRoldId, SgProjectPersonConfigDO::getUserId));
//新增审批记录
- if (gxDeviceId != 998 && gxDeviceId != 999){
- sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").roleId(Long.parseLong(AuthUtil.getUser().getRoleId())).approvalStatus(0).approvalOrder(0).approvalTime(now).build());
- }
+ sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").roleId(roleId).approvalStatus(0).approvalOrder(0).approvalTime(now).build());
for (SgGxConfigDO sgGxConfigDO : sgGxConfigDOS) {
//sgGxConfigDO.setUser(userMap.get(Long.parseLong(sgGxConfigDO.getRoleId())));
sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong(sgGxConfigDO.getRoleId())).approvalStatus(0).approvalOrder(sgGxConfigDO.getSgOrder()).build());
@@ -283,7 +282,8 @@
}
}
SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(sgProgressReportDO.getProframId());
- if (sgProjectInfoDO != null && sgProjectInfoDO.getStatus() == 0) {
+ Integer status = sgProjectInfoDO.getStatus();
+ if (sgProjectInfoDO != null && ( Objects.isNull(status)||0 == status)) {
sgProjectInfoDO.setStatus(1);
sgProjectInfoMapper.updateById(sgProjectInfoDO);
}
@@ -512,12 +512,7 @@
public List<SgProgressReportVO> queryList(ProjectSearchDTO searchDTO) {
BladeUser user = AuthUtil.getUser();
Long roleId = getRoleId();
- if(!roleId.equals(1811657352658042882L)){
-
- searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
- }else{
- searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
- }
+ setUnit(searchDTO,user,roleId);
searchDTO.setRoleUnit(roleId);
//searchDTO.setUserId(userId);
List<SgProgressReportVO> list = sgProgressReportMapper.queryList(searchDTO);
@@ -560,12 +555,7 @@
public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
BladeUser user = AuthUtil.getUser();
Long roleId = getRoleId();
- if(!roleId.equals(1811657352658042882L)){
-
- searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
- }else{
- searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
- }
+ setUnit(searchDTO,user,roleId);
searchDTO.setRoleUnit(roleId);
//searchDTO.setUserId(userId);
@@ -651,6 +641,9 @@
roleId = l;
}
}
+ if (Objects.isNull(roleId)){
+ roleId = Long.parseLong(userRole.get(0));
+ }
return roleId;
}
@@ -658,12 +651,7 @@
public IPage<SgProgressReportVO> progressPage(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
BladeUser user = AuthUtil.getUser();
Long roleId = getRoleId();
- //判断是不是县级建办 否的话就是监理单位下人员进行
- if(!roleId.equals(1811657352658042882L)){
- searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
- }else{
- searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
- }
+ setUnit(searchDTO, user, roleId);
searchDTO.setRoleUnit(roleId);
// if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
// searchDTO.setAuditPerson(String.valueOf(userId));
@@ -704,6 +692,24 @@
return page.setRecords(list);
}
+ /**
+ * 设置部门单位查询条件
+ */
+ private void setUnit(ProjectSearchDTO searchDTO, BladeUser user, Long roleId) {
+ List<Long> longList = Arrays.stream(user.getDeptId().split(","))
+ .map(Long::parseLong)
+ .collect(Collectors.toList());
+ //判断是不是省厅建办 否的话就不设置部门
+ if (!roleId.equals(1800820667082948610L)){
+ //判断是不是县级建办 否的话就是监理单位下人员进行
+ if(!roleId.equals(1811657352658042882L)){
+ searchDTO.setUserUnit(longList);
+ }else{
+ searchDTO.setCountryUnit(longList);
+ }
+ }
+ }
+
@Override
public String getDeviceReport(Long gxDeviceId, Long gxStepId) {
QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
--
Gitblit v1.9.3