From 1dfb91db022f6cfa4bcb9d953ca9aa8a503e1ca5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 12 七月 2025 11:47:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java | 279 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 224 insertions(+), 55 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 0273f65..4360667 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
@@ -35,15 +35,13 @@
import javax.annotation.Resource;
import javax.validation.Valid;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -183,6 +181,8 @@
@PostMapping(value = "/userIndex")
public R<UserIndexVO> userIndex() {
UserIndexVO userIndexVO = new UserIndexVO();
+ List<SysUser> userAll = sysUserService.selectAllList();
+ List<SysUser> users = userAll.stream().filter(e -> e.getUserId() != 1).collect(Collectors.toList());
Long userId = tokenService.getLoginUserApplet().getUserId();
SysUser sysUser = sysUserService.selectUserById(userId);
@@ -233,25 +233,89 @@
.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)
+ .in(TTaskDetail::getTaskId, taskIds)
+ .eq(TTaskDetail::getAuditStatus, 1)
+ .eq(TTaskDetail::getHandleType,1)
.isNotNull(TTaskDetail::getClearStatus)
- .groupBy(TTaskDetail::getTaskId)
.orderByDesc(TTaskDetail::getCreateTime).list();
+ // 使用 stream 去重，保留每个 taskId 最新的一条
+ taskDetails = new ArrayList<>(taskDetails.stream()
+ .collect(Collectors.groupingBy(
+ TTaskDetail::getTaskId,
+ Collectors.collectingAndThen(
+ Collectors.toList(),
+ listAll -> listAll.get(0)
+ )
+ ))
+ .values());
int size = (int) finishTask.stream().filter(e -> e.getStatus() == 5 || e.getStatus() == 6).count();
+ List<String> taskIdsStatus = finishTask.stream().map(TTask::getId).collect(Collectors.toList());
+ if (taskIdsStatus.isEmpty()){
+ taskIdsStatus.add("-1");
+ }
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());
+ List<TTaskDetail> status1 = taskDetails.stream().filter(e -> e.getClearStatus() == 1&&taskIdsStatus.contains(e.getTaskId())).collect(Collectors.toList());
+ List<TTaskDetail> status2 = taskDetails.stream().filter(e -> e.getClearStatus() == 2&&taskIdsStatus.contains(e.getTaskId())).collect(Collectors.toList());
if (!status1.isEmpty()) {
- BigDecimal divide = new BigDecimal(status1.size() + status2.size())
- .divide(new BigDecimal(status1.size()), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
+ BigDecimal divide = new BigDecimal(status1.size())
+ .divide(new BigDecimal(status1.size()+status2.size()), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
userIndexVO.setRate(divide);
} else {
userIndexVO.setRate(new BigDecimal(0));
}
- // todo 月排名
- userIndexVO.setRanking(0);
+
+ // 判断时间
+ String startTime = "";
+ String endTime = "";
+ Map<String, Date> monthDate = DateUtils.getMonthDate(new Date());
+ startTime = new SimpleDateFormat("yyyy-MM-dd").format((monthDate.get("first"))) + " 00:00:00";
+ endTime = new SimpleDateFormat("yyyy-MM-dd").format((monthDate.get("last"))) + " 23:59:59";
+ List<TTask> taskRank = taskCleanerService.lambdaQuery().between(TTask::getImplementTime, startTime, endTime).list();
+ List<String> taskIdsRank = taskRank.stream().map(TTask::getId).collect(Collectors.toList());
+ if (taskIdsRank.isEmpty()){
+ userIndexVO.setRanking(0);
+ }else{
+
+ for (SysUser user : users) {
+ int finishCount = (int) taskRank.stream().filter(e->e.getPatrolInspector().equals(user.getUserId()+"")&&e.getStatus() == 5 || e.getStatus() == 6).count();
+ int totalCount = (int) taskRank.stream().filter(e->e.getPatrolInspector().equals(user.getUserId()+"")).count();
+ if (totalCount!=0){
+ user.setFinish(new BigDecimal(finishCount).divide(new BigDecimal(totalCount),2, RoundingMode.HALF_DOWN));
+ }else{
+ user.setFinish(BigDecimal.ZERO);
+ }
+ List<TTaskDetail> status1User = taskDetails.stream().filter(e -> e.getClearStatus() == 1).collect(Collectors.toList());
+ List<TTaskDetail> status2User = taskDetails.stream().filter(e -> e.getClearStatus() == 2).collect(Collectors.toList());
+ if (!status1User.isEmpty()) {
+ BigDecimal divide = new BigDecimal(status1User.size() + status2User.size())
+ .divide(new BigDecimal(status1User.size()), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
+ user.setRate(divide);
+ } else {
+ user.setRate(new BigDecimal(0));
+ }
+ }
+ // 将users进行排序，优先根据rate倒叙排序，如果rate相同 再finish倒叙排序
+ users.sort((o1, o2) -> {
+ if (o1.getRate().compareTo(o2.getRate()) == 0) {
+ return o2.getFinish().compareTo(o1.getFinish());
+ } else {
+ return o2.getRate().compareTo(o1.getRate());
+ }
+ });
+ // 查询当前登陆人处于哪一个排名
+ for (int i = 0; i < users.size(); i++) {
+ if (users.get(i).getUserId().equals(userId)) {
+ userIndexVO.setRanking(i + 1);
+ break;
+ }
+ }
+
+ }
return R.ok(userIndexVO);
}
@@ -273,22 +337,35 @@
BeanUtils.copyProperties(byId, taskDetailVO);
TLocation byId1 = locationService.getById(byId.getLocationId());
TLocationType byId2 = locationTypeService.getById(byId1.getLocationType());
+ taskDetailVO.setLocationName(byId1.getLocationName());
taskDetailVO.setLocationAddress(byId1.getLocationAddress());
+ taskDetailVO.setLocationAddressEnd(byId1.getLocationAddressEnd());
taskDetailVO.setLocationIcon(byId2.getLocationIcon());
- taskDetailVO.setLocationName(byId2.getLocationName());
+ taskDetailVO.setLocationTypeName(byId2.getLocationName());
+ taskDetailVO.setLocationLon(byId1.getLocationLon());
+ taskDetailVO.setLocationLat(byId1.getLocationLat());
+ taskDetailVO.setLocationLatEnd(byId1.getLocationLatEnd());
+ taskDetailVO.setLocationLonEnd(byId1.getLocationLonEnd());
TTaskDetail tTaskDetail = list.stream().filter(e -> e.getHandleType() == 1).findFirst().orElse(null);
- TTaskDetail tTaskDetailFinish = list.stream().filter(e -> e.getHandleType() == 2).findFirst().orElse(null);
if (tTaskDetail != null && tTaskDetail.getUnqualified() != null) {
TDictData byId3 = dictDataService.getById(tTaskDetail.getUnqualified());
if (byId3 != null) {
tTaskDetail.setUnqualifiedName(byId3.getDataContent());
}
}
- if (tTaskDetailFinish != null) {
- tTaskDetailFinish.setFinishTime(tTaskDetailFinish.getCreateTime());
+ if (tTaskDetail != null) {
+ tTaskDetail.setFinishTime(tTaskDetail.getCreateTime());
}
taskDetailVO.setTaskDetail(tTaskDetail);
taskDetailVO.setRecords(list);
+ if (byId.getStatus()==4){
+ TTaskDetail reject = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, id)
+ .eq(TTaskDetail::getHandleType,3)
+ .orderByDesc(BaseModel::getCreateTime).last("limit 1").one();
+ if (reject!=null){
+ taskDetailVO.setRejectRemark(reject.getAuditRemark());
+ }
+ }
return R.ok(taskDetailVO);
}
@@ -310,6 +387,7 @@
byId4.setUnqualifiedName(byId3.getDataContent());
}
}
+ byId4.setFinishTime(byId4.getCreateTime());
SysUser sysUser = sysUserService.selectUserById(Long.valueOf(byId4.getAuditPerson()));
if (sysUser != null) {
byId4.setAuditPersonName(sysUser.getUserName());
@@ -336,8 +414,9 @@
TLocationType byId2 = locationTypeService.getById(byId1.getLocationType());
appealDetailVO.setLocationAddress(byId1.getLocationAddress());
appealDetailVO.setLocationIcon(byId2.getLocationIcon());
- appealDetailVO.setLocationName(byId2.getLocationName());
+ appealDetailVO.setLocationName(byId1.getLocationName());
appealDetailVO.setTaskId(byId.getId());
+ appealDetailVO.setLocationTypeName(byId2.getLocationName());
if (StringUtils.hasLength(appeal.getAuditPerson())) {
SysUser sysUser = sysUserService.selectUserById(Long.valueOf(appeal.getAuditPerson()));
if (sysUser != null) {
@@ -362,6 +441,12 @@
@ApiOperation(value = "获取距离最近的任务列表")
@PostMapping(value = "/listAllTask")
public R<List<TaskListAllVO>> listAllTask(@RequestBody AppealListDTO appealListDTO) {
+ appealListDTO.setUserId(tokenService.getLoginUserApplet().getUserId() + "");
+ SysUser sysUser = sysUserService.selectUserById(tokenService.getLoginUserApplet().getUserId());
+ if (sysUser.getDeptType()==2){
+ // 公司部门查询所有任务
+ appealListDTO.setUserId(null);
+ }
List<TaskListAllVO> res = appealService.listAllTask(appealListDTO);
return R.ok(res);
}
@@ -458,8 +543,10 @@
SysRole sysRole = roleService.selectRoleById(userRole);
List<SysUser> sysUsers = sysUserService.selectAllList();
SysUser auditPerson = sysUserService.selectUserById(999L);
- //项目负责人、部门负责人、公司成员提交由最终审批人审批；
- if (user.getDeptType() == 2 || sysRole.getRoleName().contains("项目负责人") || sysRole.getRoleName().contains("部门负责人")) {
+
+ List<TProjectDept> paojectList = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, "0").list();
+ //项目部负责人、部门负责人、公司成员提交由最终审批人审批；
+ if (user.getDeptType() == 2 || sysRole.getRoleName().contains("项目部负责人") || sysRole.getRoleName().contains("部门负责人")) {
LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
tLeaveAudit.setAvatar(auditPerson.getAvatar());
tLeaveAudit.setNickName(auditPerson.getNickName());
@@ -467,19 +554,45 @@
res.setAuditPersonId("999");
} else if (!sysRole.getRoleName().equals("部门助理")) {
// 审批人根据当前角色类型来
- if (sysRole.getRoleName().contains("现场负责人") || sysRole.getRoleName().contains("组长")) {
- List<SysUser> collect = sysUsers.stream().filter(e -> e.getDeptType() == 1 &&
- e.getDeptId().equals(user.getDeptId())).collect(Collectors.toList());
+ if (sysRole.getRoleName().contains("片区负责人") || sysRole.getRoleName().contains("组长")|| sysRole.getRoleName().contains("队长")
+ ||sysRole.getRoleName().contains("项目部助理")) {
+ TProjectDept userDept = projectDeptService.getById(user.getDeptId());
+
+ List<SysUser> collect = sysUsers.stream().filter(e -> e.getDeptType() == 1).collect(Collectors.toList());
for (SysUser sysUser : collect) {
Long userRole1 = sysUserService.getUserRole(sysUser.getUserId());
SysRole sysRole1 = roleService.selectRoleById(userRole1);
- if (sysRole1 != null && sysRole1.getRoleName().equals("项目负责人")) {
- LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
- tLeaveAudit.setAvatar(sysUser.getAvatar());
- tLeaveAudit.setNickName(sysUser.getNickName());
- res.setAuditPerson(tLeaveAudit);
- res.setAuditPersonId(sysUser.getUserId() + "");
- break;
+// if (sysRole1 != null && sysRole1.getRoleName().equals("项目部负责人")) {
+// if (userDept.getId().equals(sysUser.getDeptId())){
+// LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
+// tLeaveAudit.setAvatar(sysUser.getAvatar());
+// tLeaveAudit.setNickName(sysUser.getNickName());
+// res.setAuditPerson(tLeaveAudit);
+// res.setAuditPersonId(sysUser.getUserId() + "");
+// break;
+// }
+// }
+ if (sysRole1 != null && sysRole1.getRoleName().equals("项目部负责人")) {
+ if (!sysRole.getRoleName().contains("项目部助理")){
+ if (userDept.getParentId().equals(sysUser.getDeptId())){
+ LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
+ tLeaveAudit.setAvatar(sysUser.getAvatar());
+ tLeaveAudit.setNickName(sysUser.getNickName());
+ res.setAuditPerson(tLeaveAudit);
+ res.setAuditPersonId(sysUser.getUserId() + "");
+ break;
+ }
+ }else{
+ if (userDept.getId().equals(sysUser.getDeptId())){
+ LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
+ tLeaveAudit.setAvatar(sysUser.getAvatar());
+ tLeaveAudit.setNickName(sysUser.getNickName());
+ res.setAuditPerson(tLeaveAudit);
+ res.setAuditPersonId(sysUser.getUserId() + "");
+ break;
+ }
+ }
+
}
}
}
@@ -489,7 +602,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());
@@ -545,29 +658,75 @@
leaveDTO.setTemplateId(user.getTemplateId());
leaveDTO.setLeavePerson(userId + "");
leaveService.save(leaveDTO);
- //项目负责人、部门负责人、公司成员提交由最终审批人审批；
- if (user.getDeptType() == 2 || sysRole.getRoleName().contains("项目负责人") || sysRole.getRoleName().contains("部门负责人")) {
+ //项目部负责人、部门负责人、公司成员提交由最终审批人审批；
+ if (user.getDeptType() == 2 || sysRole.getRoleName().contains("项目部负责人") || sysRole.getRoleName().contains("部门负责人")) {
TLeaveAudit tLeaveAudit1 = new TLeaveAudit();
tLeaveAudit1.setLeaveId(leaveDTO.getId());
tLeaveAudit1.setAuditStatus(1);
tLeaveAudit1.setAuditId(auditPerson.getUserId() + "");
tLeaveAudit1.setAuditType(1);
leaveAuditService.save(tLeaveAudit1);
+ TLeaveAudit tLeaveAudit2 = new TLeaveAudit();
+ tLeaveAudit2.setLeaveId(leaveDTO.getId());
+ tLeaveAudit2.setAuditStatus(2);
+ tLeaveAudit2.setAuditId(user.getUserId() + "," + auditPerson.getUserId());
+ tLeaveAudit2.setAuditType(2);
+ tLeaveAudit2.setAuditTime(LocalDateTime.now());
+ leaveAuditService.save(tLeaveAudit2);
} else if (!sysRole.getRoleName().equals("部门助理")) {
// 审批人根据当前角色类型来
- if (sysRole.getRoleName().contains("现场负责人") || sysRole.getRoleName().contains("组长")) {
- List<SysUser> collect = sysUsers.stream().filter(e -> e.getDeptType() == 1 &&
- e.getDeptId().equals(user.getDeptId())).collect(Collectors.toList());
+ if (sysRole.getRoleName().contains("片区负责人") || sysRole.getRoleName().contains("组长")|| sysRole.getRoleName().contains("队长")
+ ||sysRole.getRoleName().contains("项目部助理")) {
+ TProjectDept userDept = projectDeptService.getById(user.getDeptId());
+
+ List<SysUser> collect = sysUsers.stream().filter(e -> e.getDeptType() == 1).collect(Collectors.toList());
for (SysUser sysUser : collect) {
Long userRole1 = sysUserService.getUserRole(sysUser.getUserId());
SysRole sysRole1 = roleService.selectRoleById(userRole1);
- if (sysRole1 != null && sysRole1.getRoleName().equals("项目负责人")) {
- TLeaveAudit tLeaveAudit1 = new TLeaveAudit();
- tLeaveAudit1.setLeaveId(leaveDTO.getId());
- tLeaveAudit1.setAuditStatus(1);
- tLeaveAudit1.setAuditId(sysUser.getUserId() + "");
- tLeaveAudit1.setAuditType(1);
- leaveAuditService.save(tLeaveAudit1);
+
+ if (sysRole1 != null && sysRole1.getRoleName().equals("项目部负责人")) {
+ if (!sysRole.getRoleName().contains("项目部助理")){
+ if (userDept.getParentId().equals(sysUser.getDeptId())){
+ LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
+ tLeaveAudit.setAvatar(sysUser.getAvatar());
+ tLeaveAudit.setNickName(sysUser.getNickName());
+ TLeaveAudit tLeaveAudit1 = new TLeaveAudit();
+ tLeaveAudit1.setLeaveId(leaveDTO.getId());
+ tLeaveAudit1.setAuditStatus(1);
+ tLeaveAudit1.setAuditId(sysUser.getUserId() + "");
+ tLeaveAudit1.setAuditType(1);
+ leaveAuditService.save(tLeaveAudit1);
+ TLeaveAudit tLeaveAudit2 = new TLeaveAudit();
+ tLeaveAudit2.setLeaveId(leaveDTO.getId());
+ tLeaveAudit2.setAuditStatus(2);
+ tLeaveAudit2.setAuditId(user.getUserId() + "," + sysUser.getUserId());
+ tLeaveAudit2.setAuditType(2);
+ tLeaveAudit2.setAuditTime(LocalDateTime.now());
+ leaveAuditService.save(tLeaveAudit2);
+ break;
+ }
+ }else{
+ if (userDept.getId().equals(sysUser.getDeptId())){
+ LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
+ tLeaveAudit.setAvatar(sysUser.getAvatar());
+ tLeaveAudit.setNickName(sysUser.getNickName());
+ TLeaveAudit tLeaveAudit1 = new TLeaveAudit();
+ tLeaveAudit1.setLeaveId(leaveDTO.getId());
+ tLeaveAudit1.setAuditStatus(1);
+ tLeaveAudit1.setAuditId(sysUser.getUserId() + "");
+ tLeaveAudit1.setAuditType(1);
+ leaveAuditService.save(tLeaveAudit1);
+ TLeaveAudit tLeaveAudit2 = new TLeaveAudit();
+ tLeaveAudit2.setLeaveId(leaveDTO.getId());
+ tLeaveAudit2.setAuditStatus(2);
+ tLeaveAudit2.setAuditId(user.getUserId() + "," + sysUser.getUserId());
+ tLeaveAudit2.setAuditType(2);
+ tLeaveAudit2.setAuditTime(LocalDateTime.now());
+ leaveAuditService.save(tLeaveAudit2);
+ break;
+ }
+ }
+
}
}
}
@@ -577,23 +736,24 @@
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);
tLeaveAudit1.setAuditId(sysUser.getUserId() + "");
tLeaveAudit1.setAuditType(1);
leaveAuditService.save(tLeaveAudit1);
+ TLeaveAudit tLeaveAudit2 = new TLeaveAudit();
+ tLeaveAudit2.setLeaveId(leaveDTO.getId());
+ tLeaveAudit2.setAuditStatus(2);
+ tLeaveAudit2.setAuditId(user.getUserId() + "," + auditPerson.getUserId());
+ tLeaveAudit2.setAuditType(2);
+ tLeaveAudit2.setAuditTime(LocalDateTime.now());
+ leaveAuditService.save(tLeaveAudit2);
}
}
}
- TLeaveAudit tLeaveAudit2 = new TLeaveAudit();
- tLeaveAudit2.setLeaveId(leaveDTO.getId());
- tLeaveAudit2.setAuditStatus(2);
- tLeaveAudit2.setAuditId(user.getUserId() + "," + auditPerson.getUserId());
- tLeaveAudit2.setAuditType(2);
- tLeaveAudit2.setAuditTime(LocalDateTime.now());
- leaveAuditService.save(tLeaveAudit2);
+
// 新增消息
TNotice tNotice = new TNotice();
tNotice.setUserId(leaveDTO.getAuditId());
@@ -620,7 +780,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]);
@@ -641,13 +801,13 @@
@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()));
+ SysUser sysUser = sysUserService.selectUserById(tokenService.getLoginUserApplet().getUserId());
Long userRole = sysUserService.getUserRole(sysUser.getUserId());
SysRole sysRole = roleService.selectRoleById(userRole);
- if (sysRole.getRoleName().contains("现场负责人") || sysRole.getRoleName().equals("组长")) {
+ if (sysRole.getRoleName().contains("片区负责人") || sysRole.getRoleName().equals("组长")|| sysRole.getRoleName().equals("队长")||sysRole.getRoleName().contains("项目部助理")) {
if (sysUser.getDeptType() == 1) {
TProjectDept tProjectDept = projectDeptService.getById(sysUser.getDeptId());
if (!tProjectDept.getParentId().equals("0")) {
@@ -660,7 +820,7 @@
TDept tDept = deptService.getById(sysUser.getDeptId());
leaveUserDetailVO.setDeptName(tDept.getDeptName());
}
- } else if (sysRole.getRoleName().contains("项目负责人")) {
+ } else if (sysRole.getRoleName().contains("项目部负责人")) {
TProjectDept tProjectDept = projectDeptService.getById(sysUser.getDeptId());
leaveUserDetailVO.setDeptName(tProjectDept.getProjectName());
}
@@ -668,6 +828,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