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

新增factoryId字段，支持在创建薪资申请时关联工厂信息

Browse Source
This commit is contained in:
furongxin 2024-09-23 17:08:09 +08:00
parent d84effdc62
commit 21d5133171
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,10 @@ public class BpmOASalaryController {
@Operation(summary = "创建请求申请") @Operation(summary = "创建请求申请")
public CommonResult<Long> createSalary(@Valid @RequestBody BpmOASalaryCreateReqVO createReqVO) { public CommonResult<Long> createSalary(@Valid @RequestBody BpmOASalaryCreateReqVO createReqVO) {
if (createReqVO.getFactoryId() != null) {
DeptRespDTO dto = deptApi.getDeptByFactoryId(createReqVO.getFactoryId()).getCheckedData();
createReqVO.setCompanyDeptId(dto.getId());
}
return success(salaryService.createSalary(getLoginUserId(), createReqVO)); return success(salaryService.createSalary(getLoginUserId(), createReqVO));
} }

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

@ -29,10 +29,12 @@ public class BpmOASalaryCreateReqVO {
@NotNull(message = "申请原因不能为空") @NotNull(message = "申请原因不能为空")
private String reason; private String reason;
@Schema(description = "付款公司", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @Schema(description = "付款公司")
@NotNull(message = "付款公司不能为空")
private Long companyDeptId; private Long companyDeptId;
@Schema(description = "付款工厂编号")
private Long factoryId;
@Schema(description = "付款总额", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "付款总额", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "付款总额不能为空") @NotNull(message = "付款总额不能为空")
private BigDecimal paymentTotal; private BigDecimal paymentTotal;