From f4bd0aee057469535a859905582ba4e955fbb79d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 08 七月 2025 11:54:15 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
index a2591e1..b6d3c80 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
@@ -233,6 +233,9 @@
.ge(TTask::getImplementTime, startOfMonth)
.le(TTask::getImplementTime, endOfMonth).list();
List<String> taskIds = finishTask.stream().map(TTask::getId).collect(Collectors.toList());
+ if (taskIds.isEmpty()){
+ taskIds.add("-1");
+ }
List<TTaskDetail> taskDetails = taskDetailService.lambdaQuery()
.eq(TTaskDetail::getAuditStatus, 1).in(TTaskDetail::getTaskId, taskIds)
.isNotNull(TTaskDetail::getClearStatus)
@@ -243,7 +246,7 @@
userIndexVO.setFinishCount(size);
List<TTaskDetail> status1 = taskDetails.stream().filter(e -> e.getClearStatus() == 1).collect(Collectors.toList());
List<TTaskDetail> status2 = taskDetails.stream().filter(e -> e.getClearStatus() == 2).collect(Collectors.toList());
- if (status1.size() + status2.size() != 0) {
+ if (!status1.isEmpty()) {
BigDecimal divide = new BigDecimal(status1.size() + status2.size())
.divide(new BigDecimal(status1.size()), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
userIndexVO.setRate(divide);
@@ -457,7 +460,6 @@
Long userRole = sysUserService.getUserRole(userId);
SysRole sysRole = roleService.selectRoleById(userRole);
List<SysUser> sysUsers = sysUserService.selectAllList();
- sysRole.setRoleName("项目负责人");
SysUser auditPerson = sysUserService.selectUserById(999L);
//项目负责人、部门负责人、公司成员提交由最终审批人审批；
if (user.getDeptType() == 2 || sysRole.getRoleName().contains("项目负责人") || sysRole.getRoleName().contains("部门负责人")) {
@@ -546,7 +548,6 @@
leaveDTO.setTemplateId(user.getTemplateId());
leaveDTO.setLeavePerson(userId + "");
leaveService.save(leaveDTO);
- sysRole.setRoleName("项目负责人");
//项目负责人、部门负责人、公司成员提交由最终审批人审批；
if (user.getDeptType() == 2 || sysRole.getRoleName().contains("项目负责人") || sysRole.getRoleName().contains("部门负责人")) {
TLeaveAudit tLeaveAudit1 = new TLeaveAudit();
@@ -622,7 +623,7 @@
dto.setAuditTime(LocalDateTime.now());
leaveService.updateById(dto);
SysUser sysUser = sysUserService.selectUserById(Long.valueOf(dto.getLeavePerson()));
- TLeaveAudit leaveAudit = leaveAuditService.lambdaQuery().eq(TLeaveAudit::getAuditId, dto.getId())
+ TLeaveAudit leaveAudit = leaveAuditService.lambdaQuery().eq(TLeaveAudit::getLeaveId, dto.getId())
.eq(TLeaveAudit::getAuditType, 2).one();
TNotice tNotice = new TNotice();
tNotice.setUserId(leaveAudit.getAuditId().split(",")[0]);
@@ -643,13 +644,12 @@
@ApiOperation(value = "我的审批-详情")
@GetMapping(value = "/leaveDetail")
- public R<LeaveUserDetailVO> leaveDetail(@RequestParam String id) {
+ public R<LeaveUserDetailVO> leaveDetail(@RequestParam String id) {
TLeave leave = leaveService.getById(id);
LeaveUserDetailVO leaveUserDetailVO = new LeaveUserDetailVO();
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(leave.getLeavePerson()));
Long userRole = sysUserService.getUserRole(sysUser.getUserId());
SysRole sysRole = roleService.selectRoleById(userRole);
- sysRole.setRoleName("项目负责人");
if (sysRole.getRoleName().contains("现场负责人") || sysRole.getRoleName().equals("组长")) {
if (sysUser.getDeptType() == 1) {
TProjectDept tProjectDept = projectDeptService.getById(sysUser.getDeptId());
@@ -671,6 +671,15 @@
TDept byId = deptService.getById(sysUser.getDeptId());
leaveUserDetailVO.setDeptName(byId.getDeptName());
}
+ if (sysUser.getDeptType()==1){
+ TProjectDept projectDept = projectDeptService.getById(sysUser.getDeptId());
+ if (projectDept.getParentId().equals("0")){
+ leaveUserDetailVO.setDeptName(projectDept.getProjectName());
+ }else{
+ TProjectDept projectDept1 = projectDeptService.getById(projectDept.getParentId());
+ leaveUserDetailVO.setDeptName(projectDept1.getProjectName()+">"+projectDept.getProjectName());
+ }
+ }
leaveUserDetailVO.setLeavePersonName(sysUser.getNickName());
LeaveAuditListVO leaveAuditListVO = new LeaveAuditListVO();
List<TLeaveAudit> list = leaveAuditService.list(new LambdaQueryWrapper<TLeaveAudit>()
--
Gitblit v1.7.1