From 61f9d261edb521fc9d0f23c5f0a116dcd90c6b23 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 01 七月 2025 14:46:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TAppealMapper.xml | 2 +-
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java | 11 +++++++++--
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java | 4 ++++
ruoyi-system/src/main/resources/mapper/system/TLeaveMapper.xml | 8 +++++++-
ruoyi-system/src/main/java/com/ruoyi/system/applet/query/LeaveListUserQuery.java | 2 ++
ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/LeaveAuditListVO.java | 2 ++
7 files changed, 26 insertions(+), 5 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 3c766c5..597ef3e 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
@@ -423,6 +423,7 @@
tLeaveAudit.setAvatar(auditPerson.getAvatar());
tLeaveAudit.setNickName(auditPerson.getNickName());
res.setAuditPerson(tLeaveAudit);
+ res.setAuditPersonId("999");
}else if (!sysRole.getRoleName().equals("部门助理")){
// 审批人根据当前角色类型来
if (sysRole.getRoleName().contains("现场负责人")||sysRole.getRoleName().contains("组长")){
@@ -436,6 +437,8 @@
tLeaveAudit.setAvatar(sysUser.getAvatar());
tLeaveAudit.setNickName(sysUser.getNickName());
res.setAuditPerson(tLeaveAudit);
+ res.setAuditPersonId(sysUser.getUserId()+"");
+ break;
}
}
}
@@ -450,6 +453,8 @@
tLeaveAudit.setAvatar(sysUser.getAvatar());
tLeaveAudit.setNickName(sysUser.getNickName());
res.setAuditPerson(tLeaveAudit);
+ res.setAuditPersonId(sysUser.getUserId()+"");
+ break;
}
}
}
@@ -495,6 +500,8 @@
// 生成随机数字6位
String format = simpleDateFormat.format(date);
leaveDTO.setCode(format+ RandomUtil.randomNumbers(6));
+ leaveDTO.setTemplateId(user.getTemplateId());
+ leaveDTO.setLeavePerson(userId+"");
leaveService.save(leaveDTO);
//项目负责人、部门负责人、公司成员提交由最终审批人审批；
if (user.getDeptType()==2 ||sysRole.getRoleName().contains("项目负责人")||sysRole.getRoleName().contains("部门负责人")){
@@ -565,8 +572,9 @@
@ApiOperation(value = "我的审批-详情")
@GetMapping(value = "/leaveDetail")
public R<LeaveUserDetailVO> leaveDetail(@RequestParam String id) {
+ TLeave leave = leaveService.getById(id);
LeaveUserDetailVO leaveUserDetailVO = new LeaveUserDetailVO();
- SysUser sysUser = sysUserService.selectUserById(Long.parseLong(leaveUserDetailVO.getLeavePerson()));
+ SysUser sysUser = sysUserService.selectUserById(Long.parseLong(leave.getLeavePerson()));
Long userRole = sysUserService.getUserRole(sysUser.getUserId());
SysRole sysRole = roleService.selectRoleById(userRole);
if (sysRole.getRoleName().contains("现场负责人")||sysRole.getRoleName().equals("组长")){
@@ -590,7 +598,6 @@
TDept byId = deptService.getById(sysUser.getDeptId());
leaveUserDetailVO.setDeptName(byId.getDeptName());
}
- TLeave leave = leaveService.getById(id);
leaveUserDetailVO.setLeavePersonName(sysUser.getNickName());
LeaveAuditListVO leaveAuditListVO = new LeaveAuditListVO();
List<TLeaveAudit> list = leaveAuditService.list(new LambdaQueryWrapper<TLeaveAudit>()
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/applet/query/LeaveListUserQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/applet/query/LeaveListUserQuery.java
index 02bd6fa..bc5e367 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/applet/query/LeaveListUserQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/applet/query/LeaveListUserQuery.java
@@ -17,6 +17,8 @@
private List<Long> userIds;
@ApiModelProperty(value = "类型1=我审批的 2=我申请的")
private String type;
+ @ApiModelProperty(value = "类型1=待审批 2=已审批")
+ private String auditStatus;
@ApiModelProperty(value = "当前登陆人id 前端忽略")
private String userId;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/LeaveAuditListVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/LeaveAuditListVO.java
index 7b6b3b5..1ff20f4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/LeaveAuditListVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/LeaveAuditListVO.java
@@ -15,6 +15,8 @@
@ApiModelProperty(value = "审批人")
private LeaveAuditVO auditPerson;
+ @ApiModelProperty(value = "审批人id")
+ private String auditPersonId;
@ApiModelProperty(value = "抄送人")
private List<LeaveAuditVO> copyPerson;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java
index 9c0e9eb..06a69f4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java
@@ -76,7 +76,7 @@
List<TaskListAllVO> list = this.baseMapper.listAllTask(query,pageInfo);
for (TaskListAllVO taskListAllVO : list) {
taskListAllVO.setDistance(taskListAllVO.getDistance().divide(new BigDecimal(1000),2, RoundingMode.HALF_UP));
- if (taskListAllVO.getStatus()==1 || taskListAllVO.getStatus()==2 || taskListAllVO.getStatus()==3){
+ if (taskListAllVO.getStatus()==1 || taskListAllVO.getStatus()==2 ){
taskListAllVO.setStatus(1);
}else{
taskListAllVO.setStatus(2);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java
index a106f94..3f5d55a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java
@@ -86,7 +86,11 @@
if (StringUtils.hasLength(query.getLeavePersonName())){
List<Long> collect = sysUsers.stream().filter(e -> e.getNickName().contains(query.getLeavePersonName()))
.map(SysUser::getUserId).collect(Collectors.toList());
+ if (collect.isEmpty()){
+ collect.add(0L);
+ }
query.setUserIds(collect);
+
}
PageInfo<LeaveUserListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<LeaveUserListVO> list = this.baseMapper.leaveList(query,pageInfo);
diff --git a/ruoyi-system/src/main/resources/mapper/system/TAppealMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TAppealMapper.xml
index a9cecec..6c244c7 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TAppealMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TAppealMapper.xml
@@ -148,7 +148,7 @@
) t5 on t1.id = t5.task_id
where 1=1
and t1.`disabled` = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
- and t1.status !=5 and t1.status !=6
+ and t1.status !=3 and t1.status !=5 and t1.status !=6
order by distance asc
</select>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TLeaveMapper.xml
index c4a5091..b51d441 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TLeaveMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TLeaveMapper.xml
@@ -55,7 +55,7 @@
</if>
</select>
<select id="leaveList" resultType="com.ruoyi.system.applet.vo.LeaveUserListVO">
- select t1.*,t1.create_time as createTime1
+ select t1.*,t1.create_time as createTime1,t1.start_time as startTime1,t1.end_time as endTime1
from t_leave t1
where
t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
@@ -66,6 +66,12 @@
<if test="query.type == 2">
and t1.leave_person = #{query.userId}
</if>
+ <if test="query.auditStatus!=null and query.auditStatus == 1">
+ and t1.audit_status = 1
+ </if>
+ <if test="query.auditStatus!=null and query.auditStatus != 1">
+ and (t1.audit_status = 2 or t1.audit_status = 3)
+ </if>
<if test="query.userIds != null and query.userIds.size()>0">
AND t1.leave_person IN
<foreach collection="query.userIds" separator="," item="id" open="(" close=")">
--
Gitblit v1.7.1