From 9e2da8d29be2a513ceab812d279534814dc545bb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 17 六月 2025 14:50:24 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLeaveController.java | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLeaveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLeaveController.java
index 109d0a4..79210fa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLeaveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLeaveController.java
@@ -1,9 +1,23 @@
package com.ruoyi.web.controller.api;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.LeaveListQuery;
+import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.system.LeaveAuditDetailVO;
+import com.ruoyi.system.vo.system.LeaveDetailVO;
+import com.ruoyi.system.vo.system.LeaveListVO;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
/**
* <p>
@@ -17,6 +31,61 @@
@RestController
@RequestMapping("/t-leave")
public class TLeaveController {
-
+ @Resource
+ private TLeaveService leaveService;
+ @Resource
+ private TLeaveAuditService leaveAuditService;
+ @Resource
+ private TProjectDeptService projectDeptService;
+ @Resource
+ private TDeptService deptService;
+ @Resource
+ private ISysUserService sysUserService;
+ @ApiOperation(value = "请假记录分页列表")
+ @PostMapping(value = "/pageList")
+ public R<PageInfo<LeaveListVO>> pageList(@RequestBody LeaveListQuery query) {
+ return R.ok(leaveService.pageList(query));
+ }
+ @ApiOperation(value = "详情")
+ @GetMapping(value = "/detail")
+ public R<LeaveDetailVO> detail(@RequestParam String id) {
+ LeaveDetailVO leaveDetailVO = new LeaveDetailVO();
+ TLeave byId = leaveService.getById(id);
+ BeanUtils.copyProperties(byId,leaveDetailVO);
+ SysUser sysUser = sysUserService.selectUserById(Long.valueOf(byId.getLeavePerson()));
+ if (sysUser!=null){
+ leaveDetailVO.setNickName(sysUser.getNickName());
+ leaveDetailVO.setPhone(sysUser.getPhonenumber());
+ if (sysUser.getDeptType() == 1){
+ TProjectDept tProjectDept = projectDeptService.getById(sysUser.getDeptId());
+ if (!tProjectDept.getParentId().equals("0")){
+ TProjectDept tProjectDept1 = projectDeptService.getById(tProjectDept.getParentId());
+ leaveDetailVO.setDeptName(tProjectDept1.getProjectName()+">"+tProjectDept.getProjectName());
+ }else{
+ leaveDetailVO.setDeptName(tProjectDept.getProjectName());
+ }
+ }else{
+ TDept tDept = deptService.getById(sysUser.getDeptId());
+ leaveDetailVO.setDeptName(tDept.getDeptName());
+ }
+ }
+ List<TLeaveAudit> list = leaveAuditService.lambdaQuery().eq(TLeaveAudit::getLeaveId, id)
+ .list();
+ List<LeaveAuditDetailVO> leaveAuditDetailVOS = new ArrayList<>();
+ for (TLeaveAudit tLeaveAudit : list) {
+ LeaveAuditDetailVO leaveAuditDetailVO = new LeaveAuditDetailVO();
+ BeanUtils.copyProperties(tLeaveAudit,leaveAuditDetailVO);
+ if (tLeaveAudit.getAuditType()==2){
+ if (sysUser!=null){
+ leaveAuditDetailVO.setNickName(sysUser.getNickName());
+ leaveAuditDetailVO.setAvatar(sysUser.getPhonenumber());
+ }
+ }else{
+ // todo 最终审核人还未确定
+ }
+ }
+ leaveDetailVO.setList(leaveAuditDetailVOS);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1