DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://49.232.154.205:10100/liujingchao/fad_oa

Browse Source
This commit is contained in:
zuqijia
2026-04-20 17:52:40 +08:00
parent a69c1f0cb2 e728a98dcc
commit ba5796984c
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmFlowInstanceVo.java
View File

@@ -34,6 +34,7 @@ public class HrmFlowInstanceVo implements Serializable {
private Date endTime; private Date endTime;
private BigDecimal hours; private BigDecimal hours;
private String procStatus; private String procStatus;
private Date actualEndTime;
private String createBy; private String createBy;
private Date createTime; private Date createTime;

2
fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmTravelReqVo.java
View File

@@ -74,6 +74,8 @@ public class HrmTravelReqVo implements Serializable {
private String bankAccount; private String bankAccount;
@Excel(name = "备注") @Excel(name = "备注")
private String remark; private String remark;
private Date actualEndTime;
private String createBy; private String createBy;
private Date createTime; private Date createTime;
private String updateBy; private String updateBy;

13
fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowInstanceServiceImpl.java
View File

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.service.UserService; import com.ruoyi.common.core.service.UserService;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.hrm.domain.HrmFlowInstance; import com.ruoyi.hrm.domain.HrmFlowInstance;
import com.ruoyi.hrm.domain.HrmFlowNode; import com.ruoyi.hrm.domain.HrmFlowNode;
import com.ruoyi.hrm.domain.HrmFlowTask; import com.ruoyi.hrm.domain.HrmFlowTask;
@@ -15,6 +16,7 @@ import com.ruoyi.hrm.domain.bo.HrmFlowStartBo;
import com.ruoyi.hrm.domain.bo.HrmFlowInstanceBo; import com.ruoyi.hrm.domain.bo.HrmFlowInstanceBo;
import com.ruoyi.hrm.domain.vo.HrmFlowInstanceVo; import com.ruoyi.hrm.domain.vo.HrmFlowInstanceVo;
import com.ruoyi.hrm.domain.vo.HrmFlowTaskVo; import com.ruoyi.hrm.domain.vo.HrmFlowTaskVo;
import com.ruoyi.hrm.domain.vo.HrmTravelReqVo;
import com.ruoyi.hrm.mapper.*; import com.ruoyi.hrm.mapper.*;
import com.ruoyi.hrm.service.IHrmFlowInstanceService; import com.ruoyi.hrm.service.IHrmFlowInstanceService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -37,6 +39,7 @@ public class HrmFlowInstanceServiceImpl implements IHrmFlowInstanceService {
private final FlowAssigneeHelper assigneeHelper; private final FlowAssigneeHelper assigneeHelper;
private final UserService userService; private final UserService userService;
private final HrmFlowCcMapper ccMapper; private final HrmFlowCcMapper ccMapper;
private final HrmTravelReqMapper travelReqMapper;
@Override @Override
public HrmFlowInstanceVo queryById(Long instId) { public HrmFlowInstanceVo queryById(Long instId) {
@@ -142,12 +145,20 @@ public class HrmFlowInstanceServiceImpl implements IHrmFlowInstanceService {
public TableDataInfo<HrmFlowInstanceVo> queryMyInstancePageList(HrmFlowInstanceBo bo, PageQuery pageQuery) { public TableDataInfo<HrmFlowInstanceVo> queryMyInstancePageList(HrmFlowInstanceBo bo, PageQuery pageQuery) {
// “我的申请”= 当前登录用户发起的流程实例 // “我的申请”= 当前登录用户发起的流程实例
// 这里不信任前端传 startUserId，统一以登录态为准 // 这里不信任前端传 startUserId，统一以登录态为准
Long userId = com.ruoyi.common.helper.LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
LambdaQueryWrapper<HrmFlowInstance> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<HrmFlowInstance> lqw = buildQueryWrapper(bo);
lqw.eq(userId != null, HrmFlowInstance::getStartUserId, userId); lqw.eq(userId != null, HrmFlowInstance::getStartUserId, userId);
// 默认按发起时间倒序（如果表里没createTime字段，这里可改成instId倒序） // 默认按发起时间倒序（如果表里没createTime字段，这里可改成instId倒序）
lqw.orderByDesc(HrmFlowInstance::getInstId); lqw.orderByDesc(HrmFlowInstance::getInstId);
Page<HrmFlowInstanceVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<HrmFlowInstanceVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
for (HrmFlowInstanceVo record : result.getRecords()) {
// 写入出差相关的时间，用于在页面中可以提前结束
if (record.getBizType().equals("travel")){
HrmTravelReqVo hrmTravelReqVo = travelReqMapper.selectVoById(record.getBizId());
record.setActualEndTime(hrmTravelReqVo.getActualEndTime());
}
}
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }