From 685e8c6d6eb33d883f41f4d9470d9909ac074d16 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 10 七月 2025 11:09:28 +0800 Subject: [PATCH] 保洁巡检本周代码 --- ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 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..77c613d 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); @@ -362,6 +365,7 @@ @ApiOperation(value = "获取距离最近的任务列表") @PostMapping(value = "/listAllTask") public R<List<TaskListAllVO>> listAllTask(@RequestBody AppealListDTO appealListDTO) { + appealListDTO.setUserId(tokenService.getLoginUserApplet().getUserId() + ""); List<TaskListAllVO> res = appealService.listAllTask(appealListDTO); return R.ok(res); } @@ -457,7 +461,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("部门负责人")) { @@ -490,7 +493,7 @@ for (SysUser sysUser : collect) { Long userRole1 = sysUserService.getUserRole(sysUser.getUserId()); SysRole sysRole1 = roleService.selectRoleById(userRole1); - if (sysRole1 != null && sysRole1.getRoleName().equals("部门负责人")) { + if (sysRole1 != null && sysRole1.getRoleName().contains("部门负责人")) { LeaveAuditVO tLeaveAudit = new LeaveAuditVO(); tLeaveAudit.setAvatar(sysUser.getAvatar()); tLeaveAudit.setNickName(sysUser.getNickName()); @@ -546,7 +549,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(); @@ -579,7 +581,7 @@ for (SysUser sysUser : collect) { Long userRole1 = sysUserService.getUserRole(sysUser.getUserId()); SysRole sysRole1 = roleService.selectRoleById(userRole1); - if (sysRole1 != null && sysRole1.getRoleName().equals("部门负责人")) { + if (sysRole1 != null && sysRole1.getRoleName().contains("部门负责人")) { TLeaveAudit tLeaveAudit1 = new TLeaveAudit(); tLeaveAudit1.setLeaveId(leaveDTO.getId()); tLeaveAudit1.setAuditStatus(1); @@ -622,7 +624,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 +645,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 +672,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