From 56b58281774fecce6f3bc9576d9c6b8bd094f3c0 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Mon, 21 Oct 2024 09:16:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=B0=E9=87=91=E6=94=AF?= =?UTF-8?q?=E5=87=BA=E3=80=81=E6=8A=A5=E9=94=80=E7=9A=84=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bpm/controller/admin/oa/BpmOAImprestController.java | 7 ++++++- .../controller/admin/oa/vo/imprest/BpmOAImprestRespVO.java | 3 +++ .../yudao/module/bpm/dal/mysql/oa/BpmOAImprestMapper.java | 4 ++-- .../yudao/module/bpm/service/oa/BpmOACashServiceImpl.java | 4 ++-- .../module/bpm/service/oa/BpmOAImprestServiceImpl.java | 2 +- .../bpm/service/oa/BpmOAReimbursementServiceImpl.java | 4 +++- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAImprestController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAImprestController.java index 332e97cb..0cff1235 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAImprestController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAImprestController.java @@ -58,7 +58,12 @@ public class BpmOAImprestController { //根据user 查询审批通过并且未报销得表单。 BpmOAImprestDO imprest = imprestService.getImprestByUserId(userId); - return success(BpmOAImprestConvert.INSTANCE.convert(imprest)); + BpmOAImprestRespVO respVO = BpmOAImprestConvert.INSTANCE.convert(imprest); + if (!respVO.getStatus().equals(BpmOAImprestDO.FLAG_FALSE)) { + respVO.setNote("您有一笔备用金报销正在处理中！"); + } + + return success(respVO); } @GetMapping("/getByProcessInstanceId") diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/imprest/BpmOAImprestRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/imprest/BpmOAImprestRespVO.java index 3cb4d84b..5591fcc7 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/imprest/BpmOAImprestRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/imprest/BpmOAImprestRespVO.java @@ -48,6 +48,9 @@ public class BpmOAImprestRespVO extends BpmOABaseRespVO { @NotNull(message = "报销状态不能为空") private Integer status; + @Schema(description = "备注") + private String note; + @Schema(description = "上传文件", requiredMode = Schema.RequiredMode.NOT_REQUIRED) private List fileItems; } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOAImprestMapper.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOAImprestMapper.java index 3ee1785d..f47902ec 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOAImprestMapper.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOAImprestMapper.java @@ -17,10 +17,10 @@ import java.util.List; @Mapper public interface BpmOAImprestMapper extends BaseMapperX { - default BpmOAImprestDO selectByUserId(Long userId, List status){ + default BpmOAImprestDO selectByUserId(Long userId){ return selectOne(new LambdaQueryWrapperX().eq(BpmOAImprestDO::getUserId, userId) .eq(BpmOAImprestDO::getResult, BpmProcessInstanceResultEnum.APPROVE.getResult()) - .notIn(BpmOAImprestDO::getStatus, status)); + .ne(BpmOAImprestDO::getStatus, BpmOAImprestDO.FLAG_TRUE)); } } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOACashServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOACashServiceImpl.java index 8efdac84..3cf0daa5 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOACashServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOACashServiceImpl.java @@ -166,6 +166,8 @@ public class BpmOACashServiceImpl extends BpmOABaseService implements BpmOACashS // 获得现金支出业务数据 BpmOACashDO cash = validateLeaveExists(id); + cashMapper.updateById(new BpmOACashDO().setId(id).setResult(result)); + // 获取现金支出明细 List cashItemDOs = getCashItem(id); @@ -283,8 +285,6 @@ public class BpmOACashServiceImpl extends BpmOABaseService implements BpmOACashS ); } } - - cashMapper.updateById(new BpmOACashDO().setId(id).setResult(result)); } private BpmOACashDO validateLeaveExists(Long id) { diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAImprestServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAImprestServiceImpl.java index c661d3c1..cf679694 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAImprestServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAImprestServiceImpl.java @@ -142,7 +142,7 @@ public class BpmOAImprestServiceImpl extends BpmOABaseService implements BpmOAIm public BpmOAImprestDO getImprestByUserId(Long userId) { //根据user 查询审批通过并且未报销得表单。 - return imprestMapper.selectByUserId(userId, Arrays.asList(BpmOAImprestDO.FLAG_TRUE, BpmOAImprestDO.IN_PROGRESS)); + return imprestMapper.selectByUserId(userId); } @Override diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAReimbursementServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAReimbursementServiceImpl.java index 627b92d1..870690a0 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAReimbursementServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAReimbursementServiceImpl.java @@ -157,6 +157,9 @@ public class BpmOAReimbursementServiceImpl extends BpmOABaseService implements B public void updateReimbursementResult(String processInstanceId, Long id, Integer result) { BpmOAReimbursementDO bpmOAReimbursementDO = validateLeaveExists(id); + + reimbursementMapper.updateById(new BpmOAReimbursementDO().setId(id).setResult(result)); + //审核通过 （最后节点） if (BpmProcessInstanceResultEnum.APPROVE.getResult().equals(result)) { @@ -293,7 +296,6 @@ public class BpmOAReimbursementServiceImpl extends BpmOABaseService implements B } } - reimbursementMapper.updateById(new BpmOAReimbursementDO().setId(id).setResult(result)); } private BpmOAReimbursementDO validateLeaveExists(Long id) {