From 613bf5983340ca61d81127da39e454cf3713e10f Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 10 Feb 2026 14:56:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(hrm):=20=E6=B7=BB=E5=8A=A0=E6=8A=84?= =?UTF-8?q?=E9=80=81=E6=A0=87=E5=BF=97=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=B7=B2=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在HrmFlowCcBo中新增ccFlag字段 - 修改HrmFlowCcController的my方法增加ccFlag参数支持 - 在HrmFlowCcServiceImpl中实现ccFlag为1时查询已审批流程实例逻辑 - 添加flowInstMapper依赖注入用于查询流程实例数据 - 增加stream包导入支持列表转换操作 - 在OaSalaryMasterServiceImpl中添加按创建时间倒序排序功能 --- .../hrm/controller/HrmFlowCcController.java | 6 +++++- .../com/ruoyi/hrm/domain/bo/HrmFlowCcBo.java | 2 ++ .../hrm/service/impl/HrmFlowCcServiceImpl.java | 18 ++++++++++++++++++ .../impl/OaSalaryMasterServiceImpl.java | 2 ++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmFlowCcController.java b/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmFlowCcController.java index 2d5b782..ea434d7 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmFlowCcController.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmFlowCcController.java @@ -8,6 +8,7 @@ import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.hrm.domain.bo.HrmFlowCcBo; import com.ruoyi.hrm.domain.vo.HrmFlowCcVo; import com.ruoyi.hrm.service.IHrmFlowCcService; +import liquibase.pro.packaged.F; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -26,7 +27,7 @@ public class HrmFlowCcController extends BaseController { * 抄送我的 */ @GetMapping("/my") - public TableDataInfo my(@RequestParam(required = false) Long ccUserId,@RequestParam(required = false) Integer readFlag, PageQuery pageQuery) { + public TableDataInfo my(@RequestParam(required = false) Long ccUserId,@RequestParam(required = false) Integer readFlag, @RequestParam(required = false) Integer ccFlag,PageQuery pageQuery) { Long uid = ccUserId; if (uid == null) { try { @@ -38,6 +39,9 @@ public class HrmFlowCcController extends BaseController { HrmFlowCcBo bo = new HrmFlowCcBo(); bo.setCcUserId(uid); bo.setReadFlag(readFlag); + if (ccFlag != null) { + bo.setCcFlag(ccFlag); + } return service.queryPageList(bo, pageQuery); } diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmFlowCcBo.java b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmFlowCcBo.java index 5f45433..9d73d2b 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmFlowCcBo.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/domain/bo/HrmFlowCcBo.java @@ -29,5 +29,7 @@ public class HrmFlowCcBo extends BaseEntity { private Long fromUserId; private String remark; + + private Integer ccFlag; } diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowCcServiceImpl.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowCcServiceImpl.java index 07e1dae..2d4a292 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowCcServiceImpl.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowCcServiceImpl.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.hrm.domain.HrmFlowCc; +import com.ruoyi.hrm.domain.HrmFlowInstance; import com.ruoyi.hrm.domain.bo.HrmFlowCcBo; import com.ruoyi.hrm.domain.vo.HrmFlowCcVo; import com.ruoyi.hrm.mapper.HrmFlowCcMapper; @@ -16,6 +17,7 @@ import org.springframework.stereotype.Service; import java.util.Collection; import java.util.List; +import java.util.stream.Collectors; @RequiredArgsConstructor @Service @@ -26,6 +28,7 @@ public class HrmFlowCcServiceImpl implements IHrmFlowCcService { private final com.ruoyi.hrm.mapper.HrmTravelReqMapper travelReqMapper; private final com.ruoyi.hrm.mapper.HrmReimburseReqMapper reimburseReqMapper; private final com.ruoyi.hrm.mapper.HrmSealReqMapper sealReqMapper; + private final com.ruoyi.hrm.mapper.HrmFlowInstanceMapper flowInstMapper; @Override public TableDataInfo queryPageList(HrmFlowCcBo bo, PageQuery pageQuery) { @@ -103,6 +106,21 @@ public class HrmFlowCcServiceImpl implements IHrmFlowCcService { lqw.eq(bo.getInstId() != null, HrmFlowCc::getInstId, bo.getInstId()); lqw.eq(bo.getBizType() != null, HrmFlowCc::getBizType, bo.getBizType()); lqw.eq(bo.getReadFlag() != null, HrmFlowCc::getReadFlag, bo.getReadFlag()); + if (bo.getCcFlag() != null && bo.getCcFlag() == 1) { + // 这样的话就去查询instance表查找所有已审批 未删除的数据 然后使用in + List approved = flowInstMapper.selectList( + Wrappers.lambdaQuery() + .eq(HrmFlowInstance::getStatus, "approved") + .eq(HrmFlowInstance::getDelFlag, 0) + ); + // 提取实例ID列表用于IN查询 + if (!approved.isEmpty()) { + List instIds = approved.stream() + .map(HrmFlowInstance::getInstId) + .collect(Collectors.toList()); + lqw.in(HrmFlowCc::getInstId, instIds); + } + } lqw.orderByDesc(HrmFlowCc::getCreateTime); return lqw; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaSalaryMasterServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaSalaryMasterServiceImpl.java index e73f947..f42b23e 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaSalaryMasterServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaSalaryMasterServiceImpl.java @@ -75,6 +75,8 @@ public class OaSalaryMasterServiceImpl implements IOaSalaryMasterService { lqw.eq(StringUtils.isNotBlank(bo.getDeptManager()), OaSalaryMaster::getDeptManager, bo.getDeptManager()); lqw.eq(StringUtils.isNotBlank(bo.getOperator()), OaSalaryMaster::getOperator, bo.getOperator()); lqw.eq(bo.getSalaryStatus() != null, OaSalaryMaster::getSalaryStatus, bo.getSalaryStatus()); + // 根据创建时间倒叙 + lqw.orderByDesc(OaSalaryMaster::getCreateTime); return lqw; }