|
@@ -188,16 +188,15 @@ public class AccountantReimbursementUserServiceImpl implements AccountantReimbur
|
|
|
reimbursementBusiness.setBeginReimbursementQuota(reimbursementBusinessReturn.getBeginReimbursementQuota());
|
|
|
reimbursementBusiness.setEndReimbursementQuota(reimbursementBusinessReturn.getEndReimbursementQuota());
|
|
|
reimbursementBusiness.setReimbursementFsalary(reimbursementBusinessReturn.getReimbursementFsalary());
|
|
|
+ reimbursementBusiness.setOfficeType(reimbursementBusinessReturn.getOfficeType());
|
|
|
|
|
|
AccountantReimbursementBusinessReturnDTO reimbursementBusinessReturnDTO = new AccountantReimbursementBusinessReturnDTO();
|
|
|
List<AccountantReimbursementBusinessDTO> showList = businessMapper.findListByUserIdAndYear(reimbursementBusiness);
|
|
|
|
|
|
- //获取实发类型集合
|
|
|
- List<ReimbursementAddressDTO> reimbursementFsalaryList = businessMapper.getReimbursementFsalaryByUserIdAndYear(reimbursementBusiness);
|
|
|
- reimbursementBusinessReturnDTO.setReimbursementFsalaryList(reimbursementFsalaryList);
|
|
|
|
|
|
for (AccountantReimbursementBusinessDTO info : showList) {
|
|
|
info.setReimbursementFsalary(DictUtils.getDictLabel(info.getReimbursementFsalary(), "reimbursement_fsalary", null));
|
|
|
+ info.setOfficeType(DictUtils.getDictLabel(info.getOfficeType(), "reimbursement_office_type", null));
|
|
|
}
|
|
|
//获取人员年度报销详情
|
|
|
AccountantReimbursementUserDTO reimbursementUserInfo = mapper.queryByUserIdAndYear(reimbursementUserDTO);
|