diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOASalaryController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOASalaryController.java index d89a8cd2..c96b82b8 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOASalaryController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOASalaryController.java @@ -15,6 +15,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.naming.spi.ObjectFactory; import javax.validation.Valid; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @@ -55,9 +56,18 @@ public class BpmOASalaryController { public CommonResult getSalary(@RequestParam("id") Long id) { BpmOASalaryDO salary = salaryService.getSalary(id); + if (salary == null) { + return success(new BpmOASalaryRespVO()); + } - return success(BpmOASalaryConvert.INSTANCE.convert(salary) - .setCompanyName(getDept(salary.getCompanyDeptId()).getName())); + // 获取部门详情 + DeptRespDTO dto = getDept(salary.getCompanyDeptId()); + + BpmOASalaryRespVO respVO = BpmOASalaryConvert.INSTANCE.convert(salary) + .setCompanyName(dto.getName()) + .setFactoryId(dto.getFactoryId()); + + return success(respVO); } @GetMapping("/getByProcessInstanceId") @@ -67,8 +77,14 @@ public class BpmOASalaryController { BpmOASalaryDO salary = salaryService.getByProcessInstanceId(processInstanceId); - return success(BpmOASalaryConvert.INSTANCE.convert(salary) - .setCompanyName(getDept(salary.getCompanyDeptId()).getName())); + // 获取部门详情 + DeptRespDTO dto = getDept(salary.getCompanyDeptId()); + + BpmOASalaryRespVO respVO = BpmOASalaryConvert.INSTANCE.convert(salary) + .setCompanyName(dto.getName()) + .setFactoryId(dto.getFactoryId()); + + return success(respVO); } /** diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryRespVO.java index 5e73265f..c46e3add 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryRespVO.java @@ -33,6 +33,9 @@ public class BpmOASalaryRespVO extends BpmOABaseRespVO { @Schema(description = "付款公司名称") private String companyName; + @Schema(description = "付款工厂") + private Long FactoryId; + @Schema(description = "付款总额") private BigDecimal paymentTotal;