From ae29f1b7da8a405a358f5d71150b60a504af5f3a Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期五, 11 八月 2023 18:24:35 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java index 24a3cec..22b64aa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java @@ -450,20 +450,17 @@ ServiceReimbursement serviceReimbursement = serviceReimbursementService.getById(checkFundVO.getFundid()); //濡傛灉绛変簬100锛岃鏄庡凡缁忚蛋鍒板尰闄㈣储鍔¢偅杈逛簡锛涜储鍔¢偅杈瑰彇鏁版嵁鏄粠鍒嗕韩琛ㄥ彇锛屾墍浠ワ紝杩欓噷鐩存帴寰�鍒嗕韩琛ㄩ噷娣诲姞鏁版嵁灏辫浜�; if (!Objects.isNull(serviceReimbursement) && serviceReimbursement.getBackflowlevel() != null) { - if (serviceReimbursement.getBackflowlevel() == 100 || serviceReimbursement.getBackflowlevel() == 199) { - - //灏嗕慨鏀圭殑涓婃姤鏁版嵁 鏂板涓�鏉� - ServiceReimbursementShared serviceReimbursementShared = DtoConversionUtils.sourceToTarget(serviceReimbursement, ServiceReimbursementShared.class); - serviceReimbursementShared.setId(null); - serviceReimbursementShared.setDelFlag(0L); - serviceReimbursementShared.setReimid(serviceReimbursement.getId()); - serviceReimbursementSharedService.save(serviceReimbursementShared); - +// if (serviceReimbursement.getBackflowlevel() == 100 || serviceReimbursement.getBackflowlevel() == 199) { + if (serviceReimbursement.getBackflowlevel() == 199) { //灏嗛��鍥為樁娈佃缃垚100 serviceReimbursement.setBackflowlevel(100L); serviceReimbursement.setFlowlevel(100L); serviceReimbursement.setRecordstatus(0); serviceReimbursementService.updateById(serviceReimbursement); + + //灏嗕慨鏀圭殑涓婃姤鏁版嵁 鏂板涓�鏉� + serviceReimbursementService.addSharedData(checkFundVO.getFundid()); + return success(); } } -- Gitblit v1.9.3