ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正了BpmOASalaryController中获取部门详情的逻辑，并在BpmOASalaryRespVO中新增了factoryId字段。

Browse Source
This commit is contained in:
furongxin 2024-09-23 19:39:03 +08:00
parent 1aa2d17b80
commit 03bddb17e8
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOASalaryController.java
View File

@ -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<BpmOASalaryRespVO> 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);
}
/**

3
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/salary/BpmOASalaryRespVO.java
View File

@ -33,6 +33,9 @@ public class BpmOASalaryRespVO extends BpmOABaseRespVO {
@Schema(description = "付款公司名称")
private String companyName;
@Schema(description = "付款工厂")
private Long FactoryId;
@Schema(description = "付款总额")
private BigDecimal paymentTotal;