From ea8ac0cb2da948fbc0103d008c8cd94252f585f3 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Tue, 22 Oct 2024 21:33:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(bpm):=20=E6=B7=BB=E5=8A=A0=E5=A4=87?= =?UTF-8?q?=E7=94=A8=E9=87=91=E5=B7=AE=E9=A2=9D=E5=AD=97=E6=AE=B5=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=96=AA=E8=B5=84=E8=B0=83=E6=95=B4=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1-=20=E5=9C=A8=20BpmOACashDO=E3=80=81BpmOACashCreateReq?= =?UTF-8?q?VO=20=E5=92=8C=20BpmOACashRespVO=20=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A4=87=E7=94=A8=E9=87=91=E5=B7=AE=E9=A2=9D=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=20-=20=E4=BC=98=E5=8C=96=20BpmOASalaryAdjustmentServiceImpl=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=A9=BA=E5=80=BC=E6=A3=80=E6=9F=A5=E9=80=BB?= =?UTF-8?q?=E8=BE=91=20-=20=E5=88=A0=E9=99=A4=20BpmOACashController=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=86=97=E4=BD=99=E7=A9=BA=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/bpm/controller/admin/oa/BpmOACashController.java | 2 -- .../controller/admin/oa/vo/cash/BpmOACashCreateReqVO.java | 3 +++ .../bpm/controller/admin/oa/vo/cash/BpmOACashRespVO.java | 3 +++ .../yudao/module/bpm/dal/dataobject/oa/BpmOACashDO.java | 5 +++++ .../bpm/service/oa/BpmOASalaryAdjustmentServiceImpl.java | 4 +--- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOACashController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOACashController.java index 976d12d0..a81763f2 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOACashController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOACashController.java @@ -58,6 +58,4 @@ public class BpmOACashController { return success(cashService.convertCash(cashDO)); } - - } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashCreateReqVO.java index d726e3df..f129e02a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashCreateReqVO.java @@ -34,6 +34,9 @@ public class BpmOACashCreateReqVO { @Schema(description = "备用金申请编号") private Long imprestId; + @Schema(description = "备用金差额 = 备用金额 - 报销总金额") + private BigDecimal difference; + @Schema(description = "流程实例编号") private String processInstanceId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashRespVO.java index b1f5e63d..bb9ac6c2 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/cash/BpmOACashRespVO.java @@ -40,6 +40,9 @@ public class BpmOACashRespVO extends BpmOABaseRespVO { @Schema(description = "备用金申请编号") private Long imprestId; + @Schema(description = "备用金差额 = 备用金额 - 报销总金额") + private BigDecimal difference; + @Schema(description = "备用金金额") private BigDecimal amount; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOACashDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOACashDO.java index 10abe4bb..7b5b9d72 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOACashDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOACashDO.java @@ -55,6 +55,11 @@ public class BpmOACashDO extends BaseDO { */ private Long imprestId; + /** + * 备用金差额 = 备用金额 - 报销总金额 + */ + private BigDecimal difference; + /** * 用章的结果 * diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASalaryAdjustmentServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASalaryAdjustmentServiceImpl.java index 31447f06..cce56e79 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASalaryAdjustmentServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASalaryAdjustmentServiceImpl.java @@ -12,8 +12,6 @@ import cn.iocoder.yudao.module.bpm.service.task.BpmHistoryProcessInstanceService import cn.iocoder.yudao.module.infra.api.config.ConfigApi; import cn.iocoder.yudao.module.system.api.dept.DeptApi; import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; -import io.netty.util.internal.StringUtil; -import org.mapstruct.ap.internal.util.Strings; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -77,7 +75,7 @@ public class BpmOASalaryAdjustmentServiceImpl extends BpmOABaseService implement // 查询配置文件，获取行政部门编号 String hrDeptId = configApi.getConfigKey("system_hr_dept").getCheckedData(); - if (Strings.isNotEmpty(hrDeptId)) { + if (hrDeptId != null && !hrDeptId.isEmpty()) { processInstanceVariables.put("hr_dept", hrDeptId); } // 发起 BPM 流程