diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmFlowInstanceVo.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmFlowInstanceVo.java index c270bbc..3c75c9f 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmFlowInstanceVo.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmFlowInstanceVo.java @@ -34,6 +34,7 @@ public class HrmFlowInstanceVo implements Serializable { private Date endTime; private BigDecimal hours; private String procStatus; + private Date actualEndTime; private String createBy; private Date createTime; diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmTravelReqVo.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmTravelReqVo.java index aa337af..d9de261 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmTravelReqVo.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/vo/HrmTravelReqVo.java @@ -74,6 +74,8 @@ public class HrmTravelReqVo implements Serializable { private String bankAccount; @Excel(name = "备注") private String remark; + + private Date actualEndTime; private String createBy; private Date createTime; private String updateBy; diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowInstanceServiceImpl.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowInstanceServiceImpl.java index a19d8e3..5c35151 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowInstanceServiceImpl.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowInstanceServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.service.UserService; +import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.hrm.domain.HrmFlowInstance; import com.ruoyi.hrm.domain.HrmFlowNode; 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.vo.HrmFlowInstanceVo; import com.ruoyi.hrm.domain.vo.HrmFlowTaskVo; +import com.ruoyi.hrm.domain.vo.HrmTravelReqVo; import com.ruoyi.hrm.mapper.*; import com.ruoyi.hrm.service.IHrmFlowInstanceService; import lombok.RequiredArgsConstructor; @@ -37,6 +39,7 @@ public class HrmFlowInstanceServiceImpl implements IHrmFlowInstanceService { private final FlowAssigneeHelper assigneeHelper; private final UserService userService; private final HrmFlowCcMapper ccMapper; + private final HrmTravelReqMapper travelReqMapper; @Override public HrmFlowInstanceVo queryById(Long instId) { @@ -142,12 +145,20 @@ public class HrmFlowInstanceServiceImpl implements IHrmFlowInstanceService { public TableDataInfo queryMyInstancePageList(HrmFlowInstanceBo bo, PageQuery pageQuery) { // “我的申请”= 当前登录用户发起的流程实例 // 这里不信任前端传 startUserId,统一以登录态为准 - Long userId = com.ruoyi.common.helper.LoginHelper.getUserId(); + Long userId = LoginHelper.getUserId(); LambdaQueryWrapper lqw = buildQueryWrapper(bo); lqw.eq(userId != null, HrmFlowInstance::getStartUserId, userId); // 默认按发起时间倒序(如果表里没createTime字段,这里可改成instId倒序) lqw.orderByDesc(HrmFlowInstance::getInstId); Page 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); }