From ef834741127a66b5f04dbc1d70841727ac45bd60 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Thu, 26 Sep 2024 16:27:21 +0800 Subject: [PATCH] =?UTF-8?q?```=E4=BC=98=E5=8C=96=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=B1=BB=E5=9E=8B=E6=8E=A5=E5=8F=A3=E5=8F=8A?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=B8=E5=85=B3DTO-=20=E5=BC=95=E5=85=A5`A?= =?UTF-8?q?ssetsTypeApi`=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=B5=84=E4=BA=A7=E7=B1=BB=E5=9E=8B=E8=AF=A6?= =?UTF-8?q?=E7=BB=86=E4=BF=A1=E6=81=AF=E3=80=82=20-=20=E5=9C=A8`BpmOAAsset?= =?UTF-8?q?ClaimRespVO`=E4=B8=AD=E6=96=B0=E5=A2=9E`assetsTypeName`?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B1=95=E7=A4=BA=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E3=80=82=20-=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4`BpmOAAssetClaimCreateReqVO`=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E3=80=81=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E3=80=81=E5=8D=95=E4=BD=8D=E5=92=8C=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BB=A5=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=B5=84=E4=BA=A7=E7=94=B3=E8=AF=B7=E7=9A=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=BB=93=E6=9E=84=E3=80=82=20-=20=E6=9B=B4=E6=96=B0`B?= =?UTF-8?q?pmOAAssetClaimDO`=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=B8=BA=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E7=94=B3=E8=AF=B7=E5=BC=95=E5=85=A5=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BB=B4=E5=BA=A6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 所有相关调整旨在优化资产申请流程，通过引入更多细节和接口集成，提高业务流程的效率与准确性。 ``` --- .../admin/oa/BpmOAAssetClaimController.java | 15 ++++++++++-- .../BpmOAAssetClaimCreateReqVO.java | 12 +++++++--- .../vo/assetClaim/BpmOAAssetClaimRespVO.java | 23 +++++++++++-------- .../dal/dataobject/oa/BpmOAAssetClaimDO.java | 5 ++++ .../rpc/config/RpcConfiguration.java | 4 +++- .../system/api/assets/AssetsTypeApiImpl.java | 9 -------- 6 files changed, 44 insertions(+), 24 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAAssetClaimController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAAssetClaimController.java index 73544484..49b9bac7 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAAssetClaimController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAAssetClaimController.java @@ -6,6 +6,8 @@ import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim.BpmOAAssetC import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim.BpmOAAssetClaimRespVO; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAAssetClaimDO; import cn.iocoder.yudao.module.bpm.service.oa.BpmOAAssetClaimService; +import cn.iocoder.yudao.module.system.api.assets.AssetsTypeApi; +import cn.iocoder.yudao.module.system.api.assets.dto.AssetsTypeDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,6 +29,9 @@ public class BpmOAAssetClaimController { @Resource private BpmOAAssetClaimService assetClaimService; + @Resource + private AssetsTypeApi assetsTypeApi; + @PostMapping("/create") @Operation(summary = "创建请求申请") public CommonResult createAssetClaim(@Valid @RequestBody BpmOAAssetClaimCreateReqVO createReqVO) { @@ -41,7 +46,10 @@ public class BpmOAAssetClaimController { BpmOAAssetClaimDO assetClaimDO = assetClaimService.getAssetClaim(id); - return success(BeanUtils.toBean(assetClaimDO, BpmOAAssetClaimRespVO.class)); + AssetsTypeDTO assetsTypeDTO = assetsTypeApi.get(assetClaimDO.getAssetsTypeId()).getCheckedData(); + + return success(BeanUtils.toBean(assetClaimDO, BpmOAAssetClaimRespVO.class) + .setAssetsTypeName(assetsTypeDTO.getName())); } @GetMapping("/getByProcessInstanceId") @@ -51,6 +59,9 @@ public class BpmOAAssetClaimController { BpmOAAssetClaimDO assetClaimDO = assetClaimService.getByProcessInstanceId(processInstanceId); - return success(BeanUtils.toBean(assetClaimDO, BpmOAAssetClaimRespVO.class)); + AssetsTypeDTO assetsTypeDTO = assetsTypeApi.get(assetClaimDO.getAssetsTypeId()).getCheckedData(); + + return success(BeanUtils.toBean(assetClaimDO, BpmOAAssetClaimRespVO.class) + .setAssetsTypeName(assetsTypeDTO.getName())); } } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/assetClaim/BpmOAAssetClaimCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/assetClaim/BpmOAAssetClaimCreateReqVO.java index ecdb43f9..167ed4a9 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/assetClaim/BpmOAAssetClaimCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/assetClaim/BpmOAAssetClaimCreateReqVO.java @@ -20,16 +20,22 @@ import java.util.List; @ToString(callSuper = true) public class BpmOAAssetClaimCreateReqVO { - @Schema(description = "收款人信息", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "报销总金额不能为空") + @Schema(description = "资产类型编号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "资产类型不能为空") private Long assetsTypeId; - @Schema(description = "现金支出明细") + @Schema(description = "业务类型") + private Integer businessType; + + @Schema(description = "数量") private Integer num; @Schema(description = "单位") private String util; + @Schema(description = "申请原因") + private String reason; + @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/assetClaim/BpmOAAssetClaimRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/assetClaim/BpmOAAssetClaimRespVO.java index c1db832d..6fe085c5 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/assetClaim/BpmOAAssetClaimRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/assetClaim/BpmOAAssetClaimRespVO.java @@ -2,14 +2,11 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim; import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.cash.Cash; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.validation.constraints.NotNull; -import java.math.BigDecimal; import java.util.List; /** @@ -21,15 +18,23 @@ import java.util.List; @ToString(callSuper = true) public class BpmOAAssetClaimRespVO extends BpmOABaseRespVO { - @Schema(description = "收款人信息") + @Schema(description = "资产类型编号") private Long assetsTypeId; - @Schema(description = "现金支出明细") - private List num; + @Schema(description = "资产类型名称") + private String assetsTypeName; - @Schema(description = "报销总金额", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "报销总金额不能为空") - private BigDecimal util; + @Schema(description = "业务类型") + private Integer businessType; + + @Schema(description = "数量") + private Integer num; + + @Schema(description = "单位") + private String util; + + @Schema(description = "申请原因") + private String reason; @Schema(description = "上传文件", requiredMode = Schema.RequiredMode.REQUIRED) private List fileItems; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAAssetClaimDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAAssetClaimDO.java index 4472c1e1..8897251c 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAAssetClaimDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAAssetClaimDO.java @@ -42,6 +42,11 @@ public class BpmOAAssetClaimDO extends BaseDO { */ private Long assetsTypeId; + /** + * 业务类型 + */ + private Integer businessType; + /** * 数量 */ diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/rpc/config/RpcConfiguration.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/rpc/config/RpcConfiguration.java index 8b629d30..32bf5326 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/rpc/config/RpcConfiguration.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/rpc/config/RpcConfiguration.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.bpm.framework.rpc.config; import cn.iocoder.yudao.module.infra.api.config.ConfigApi; import cn.iocoder.yudao.module.infra.api.file.FileApi; import cn.iocoder.yudao.module.system.api.assets.AssetsApi; +import cn.iocoder.yudao.module.system.api.assets.AssetsTypeApi; import cn.iocoder.yudao.module.system.api.attendance.AttendanceApi; import cn.iocoder.yudao.module.system.api.bank.BankApi; import cn.iocoder.yudao.module.system.api.dept.DeptApi; @@ -22,7 +23,8 @@ import org.springframework.context.annotation.Configuration; @Configuration(proxyBeanMethods = false) @EnableFeignClients(clients = {FileApi.class, RoleApi.class, DeptApi.class, PostApi.class, AdminUserApi.class, SmsSendApi.class, DictDataApi.class, NotifyMessageSendApi.class, - SubscribeMessageSendApi.class, SocialClientApi.class, UsersExtApi.class, AttendanceApi.class, BankApi.class, ConfigApi.class, PositionApi.class, SupplierApi.class, AssetsApi.class + SubscribeMessageSendApi.class, SocialClientApi.class, UsersExtApi.class, AttendanceApi.class, BankApi.class, ConfigApi.class, PositionApi.class, SupplierApi.class, AssetsApi.class, + AssetsTypeApi.class }) public class RpcConfiguration { } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/assets/AssetsTypeApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/assets/AssetsTypeApiImpl.java index f4772e21..f232ea16 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/assets/AssetsTypeApiImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/assets/AssetsTypeApiImpl.java @@ -4,24 +4,15 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission; import cn.iocoder.yudao.module.system.api.assets.dto.AssetsTypeDTO; -import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; -import cn.iocoder.yudao.module.system.api.user.dto.UserSaveRespDTO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.assets.AssetsTypeDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.service.assets.AssetsTypeService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.Collection; import java.util.List; -import java.util.Set; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated