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

修改现金支出、报销的逻辑处理

Browse Source
This commit is contained in:
furongxin 2024-10-21 09:16:04 +08:00
parent ec41d2c9f1
commit 56b5828177
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,12 @@ public class BpmOAImprestController {
//根据user 查询审批通过并且未报销得表单。
BpmOAImprestDO imprest = imprestService.getImprestByUserId(userId);
return success(BpmOAImprestConvert.INSTANCE.convert(imprest));
BpmOAImprestRespVO respVO = BpmOAImprestConvert.INSTANCE.convert(imprest);
if (!respVO.getStatus().equals(BpmOAImprestDO.FLAG_FALSE)) {
respVO.setNote("您有一笔备用金报销正在处理中！");
}
return success(respVO);
}
@GetMapping("/getByProcessInstanceId")

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

@ -48,6 +48,9 @@ public class BpmOAImprestRespVO extends BpmOABaseRespVO {
@NotNull(message = "报销状态不能为空")
private Integer status;
@Schema(description = "备注")
private String note;
@Schema(description = "上传文件", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private List<UploadUserFile> fileItems;
}

4
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOAImprestMapper.java
View File

@ -17,10 +17,10 @@ import java.util.List;
@Mapper
public interface BpmOAImprestMapper extends BaseMapperX<BpmOAImprestDO> {
default BpmOAImprestDO selectByUserId(Long userId, List<Integer> status){
default BpmOAImprestDO selectByUserId(Long userId){
return selectOne(new LambdaQueryWrapperX<BpmOAImprestDO>().eq(BpmOAImprestDO::getUserId, userId)
.eq(BpmOAImprestDO::getResult, BpmProcessInstanceResultEnum.APPROVE.getResult())
.notIn(BpmOAImprestDO::getStatus, status));
.ne(BpmOAImprestDO::getStatus, BpmOAImprestDO.FLAG_TRUE));
}
}

4
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOACashServiceImpl.java
View File

@ -166,6 +166,8 @@ public class BpmOACashServiceImpl extends BpmOABaseService implements BpmOACashS
// 获得现金支出业务数据
BpmOACashDO cash = validateLeaveExists(id);
cashMapper.updateById(new BpmOACashDO().setId(id).setResult(result));
// 获取现金支出明细
List<BpmOACashItemDO> cashItemDOs = getCashItem(id);
@ -283,8 +285,6 @@ public class BpmOACashServiceImpl extends BpmOABaseService implements BpmOACashS
);
}
}
cashMapper.updateById(new BpmOACashDO().setId(id).setResult(result));
}
private BpmOACashDO validateLeaveExists(Long id) {

2
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAImprestServiceImpl.java
View File

@ -142,7 +142,7 @@ public class BpmOAImprestServiceImpl extends BpmOABaseService implements BpmOAIm
public BpmOAImprestDO getImprestByUserId(Long userId) {
//根据user 查询审批通过并且未报销得表单。
return imprestMapper.selectByUserId(userId, Arrays.asList(BpmOAImprestDO.FLAG_TRUE, BpmOAImprestDO.IN_PROGRESS));
return imprestMapper.selectByUserId(userId);
}
@Override

4
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAReimbursementServiceImpl.java
View File

@ -157,6 +157,9 @@ public class BpmOAReimbursementServiceImpl extends BpmOABaseService implements B
public void updateReimbursementResult(String processInstanceId, Long id, Integer result) {
BpmOAReimbursementDO bpmOAReimbursementDO = validateLeaveExists(id);
reimbursementMapper.updateById(new BpmOAReimbursementDO().setId(id).setResult(result));
//审核通过 （最后节点）
if (BpmProcessInstanceResultEnum.APPROVE.getResult().equals(result)) {
@ -293,7 +296,6 @@ public class BpmOAReimbursementServiceImpl extends BpmOABaseService implements B
}
}
reimbursementMapper.updateById(new BpmOAReimbursementDO().setId(id).setResult(result));
}
private BpmOAReimbursementDO validateLeaveExists(Long id) {