diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmAppropriationReqService.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmAppropriationReqService.java index 59c3a8c..4629e65 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmAppropriationReqService.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmAppropriationReqService.java @@ -26,6 +26,11 @@ public interface IHrmAppropriationReqService { Boolean updateByBo(HrmAppropriationReqBo bo); Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + *状态更新(draft/running/approved/rejected/canceled) + */ + Boolean updateStatus(Long bizId, String status); } diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/BizStatusSyncHelper.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/BizStatusSyncHelper.java index dac6a8c..89f51fe 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/BizStatusSyncHelper.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/BizStatusSyncHelper.java @@ -4,10 +4,12 @@ import com.ruoyi.hrm.domain.HrmLeaveReq; import com.ruoyi.hrm.domain.HrmReimburseReq; import com.ruoyi.hrm.domain.HrmTravelReq; import com.ruoyi.hrm.domain.HrmSealReq; +import com.ruoyi.hrm.domain.HrmAppropriationReq; import com.ruoyi.hrm.mapper.HrmLeaveReqMapper; import com.ruoyi.hrm.mapper.HrmReimburseReqMapper; import com.ruoyi.hrm.mapper.HrmTravelReqMapper; import com.ruoyi.hrm.mapper.HrmSealReqMapper; +import com.ruoyi.hrm.mapper.HrmAppropriationReqMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -23,6 +25,7 @@ public class BizStatusSyncHelper { private final HrmTravelReqMapper travelReqMapper; private final HrmSealReqMapper sealReqMapper; private final HrmReimburseReqMapper reimburseReqMapper; + private final HrmAppropriationReqMapper appropriationReqMapper; public void setBizApproved(String bizType, Long bizId) { if (bizType == null || bizId == null) return; @@ -46,6 +49,11 @@ public class BizStatusSyncHelper { u.setBizId(bizId); u.setStatus("approved"); reimburseReqMapper.updateById(u); + } else if ("appropriation".equalsIgnoreCase(bizType)) { + HrmAppropriationReq u = new HrmAppropriationReq(); + u.setBizId(bizId); + u.setStatus("approved"); + appropriationReqMapper.updateById(u); } } @@ -71,6 +79,11 @@ public class BizStatusSyncHelper { u.setBizId(bizId); u.setStatus("pending"); reimburseReqMapper.updateById(u); + } else if ("appropriation".equalsIgnoreCase(bizType)) { + HrmAppropriationReq u = new HrmAppropriationReq(); + u.setBizId(bizId); + u.setStatus("pending"); + appropriationReqMapper.updateById(u); } } @@ -96,6 +109,11 @@ public class BizStatusSyncHelper { u.setBizId(bizId); u.setStatus("rejected"); reimburseReqMapper.updateById(u); + } else if ("appropriation".equalsIgnoreCase(bizType)) { + HrmAppropriationReq u = new HrmAppropriationReq(); + u.setBizId(bizId); + u.setStatus("rejected"); + appropriationReqMapper.updateById(u); } } } diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmAppropriationReqServiceImpl.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmAppropriationReqServiceImpl.java index b635e63..874a3f7 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmAppropriationReqServiceImpl.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmAppropriationReqServiceImpl.java @@ -116,6 +116,15 @@ public class HrmAppropriationReqServiceImpl implements IHrmAppropriationReqServi return baseMapper.deleteBatchIds(ids) > 0; } + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateStatus(Long bizId, String status) { + HrmAppropriationReq req = new HrmAppropriationReq(); + req.setBizId(bizId); + req.setStatus(status); + return baseMapper.updateById(req) > 0; + } + @SuppressWarnings("unused") private LambdaQueryWrapper buildQueryWrapper(HrmAppropriationReqBo bo) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowTaskServiceImpl.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowTaskServiceImpl.java index cad19f7..9bf3c5e 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowTaskServiceImpl.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowTaskServiceImpl.java @@ -37,11 +37,12 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { private final FlowAssigneeHelper assigneeHelper; private final BizStatusSyncHelper bizStatusSyncHelper; - // 注入四个业务Mapper + // 注入五个业务Mapper private final HrmLeaveReqMapper leaveReqMapper; private final HrmTravelReqMapper travelReqMapper; private final HrmSealReqMapper sealReqMapper; private final HrmReimburseReqMapper reimburseReqMapper; + private final HrmAppropriationReqMapper appropriationReqMapper; private final ObjectMapper objectMapper; // Spring Boot 默认提供 private final UserService userService; @@ -98,6 +99,9 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { case "reimburse": reimburseReqMapper.selectBatchIds(bizIds).forEach(d -> bizDataMap.put("reimburse_" + d.getBizId(), d)); break; + case "appropriation": + appropriationReqMapper.selectBatchIds(bizIds).forEach(d -> bizDataMap.put("appropriation_" + d.getBizId(), d)); + break; } });