feat(bpm): 更新报销单和贷款查询功能
- 修改报销单服务实现,更新应付款金额计算逻辑 - 增加贷款查询时的员工ID筛选条件
This commit is contained in:
parent
d057442422
commit
5ef61b834e
@ -284,7 +284,7 @@ public class BpmOAExpensesServiceImpl extends BpmOABaseService implements BpmOAE
|
||||
.setObjectId(id)
|
||||
.setType(9)
|
||||
.setStatus(0)
|
||||
.setAmountPayable(expenses.getTotalMoney())
|
||||
.setAmountPayable(expenses.getTotalMoney().subtract(expenses.getAmountPaid()))
|
||||
.setProcessInstanceName(processInstance.getName())
|
||||
.setBeginTime(processInstance.getCreateTime())
|
||||
.setEndTime(processInstance.getEndTime())
|
||||
|
@ -61,9 +61,11 @@
|
||||
bpm_oa_expenses e
|
||||
LEFT JOIN system_users u ON e.user_id = u.id
|
||||
LEFT JOIN system_dept d ON u.dept_id = d.id
|
||||
LEFT JOIN sf_staff sf ON u.idcard = sf.id_card
|
||||
LEFT JOIN bpm_process_instance_ext p ON e.process_instance_id = p.process_instance_id
|
||||
WHERE
|
||||
e.deleted = 0
|
||||
sf.id = #{pageReqVO.staffId}
|
||||
AND e.deleted = 0
|
||||
AND e.result = 2
|
||||
AND e.status = 2
|
||||
AND u.deleted = 0
|
||||
|
Loading…
Reference in New Issue
Block a user