From abfbf712ed0599b3e0be3c1e502b0141de162ed1 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 10:31:29 +0800
Subject: [PATCH] 修改我的审核和代办数量流程逻辑
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 35 +++++++++++++++++++++++++----------
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java | 11 +++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml | 6 ++++--
3 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
index 5a87ab9..dee056b 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
@@ -5,6 +5,7 @@
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
import java.util.List;
@@ -48,6 +49,16 @@
* 用户名
*/
private Long userId;
+
+ /**
+ * 用户所在单位
+ */
+ private Long userUnit;
+
+ /**
+ * 用户角色
+ */
+ private Long roleUnit;
/**
*
*/
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
index 614bb45..3a744ca 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -82,14 +82,16 @@
de.device_name,
de.device_type,
<!-- userR.approval_status, -->
- dict."DICT_VALUE" as typeName
+ dict."DICT_VALUE" as typeName,
+ si.
FROM
ywxt.SG_PROGRESS_REPORT report
+ LEFT JOIN ywxt.SG_PROJECT_INFO si ON report.profram_id = si.id
LEFT JOIN ywxt.sg_device de ON report.gx_device_id = de.id
left join YWXT."BLADE_DICT_BIZ" as dict on de.device_type=dict.DICT_KEY and dict.CODE='SG_DEVICE_TYPE'
LEFT JOIN ywxt.sg_report_user userR ON report.id = userR.report_id
WHERE
- 1 = 1 and report."STATUS" != 4
+ 1 = 1 and report."STATUS" != 4 and si.CONTROL_UNIT=#{dto.userUnit} and userR.roleId=#{dto.roleUnit}
<!-- AND userR.is_his = 0 -->
<if test="dto.projectName != null and dto.projectName != ''">
and report.PROGRAM_NAME like CONCAT(CONCAT('%',#{dto.projectName}),'%')
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..b3be869 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;
@@ -75,6 +76,9 @@
SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(proframId);
String controlUnit = sgProjectInfoDO.getControlUnit();
List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ String selfUnit = sgProjectInfoDO.getSelfUnit();
+ List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
+ users.addAll(selfUnitusers);
s.setUserIDs(users);
});
@@ -90,6 +94,9 @@
SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(proframId);
String controlUnit = sgProjectInfoDO.getControlUnit();
List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ String selfUnit = sgProjectInfoDO.getSelfUnit();
+ List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
+ users.addAll(selfUnitusers);
s.setUserIDs(users);
});
@@ -452,17 +459,23 @@
@Override
public List<SgProgressReportVO> queryList(ProjectSearchDTO searchDTO) {
- Long userId = AuthUtil.getUserId();
- searchDTO.setUserId(userId);
+ BladeUser user = AuthUtil.getUser();
+ //Long userId = user.getUserId();
+ searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+ searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
+ //searchDTO.setUserId(userId);
List<SgProgressReportVO> list = sgProgressReportMapper.queryList(searchDTO);
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();
+ //Long userId = user.getUserId();
+ 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,11 +548,13 @@
@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();
+ //Long userId = user.getUserId();
+ 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);
return page.setRecords(list);
}
--
Gitblit v1.9.3