|
|
@@ -1415,13 +1415,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
TOrderPublicReleaseCount out = tOrderPublicReleaseCountMapper.selectByOrderNo(e.getOrderNo());
|
|
|
List<ExpenseAccount> expenseAccounts = expenseAccountMapper.selectByOrderNo(e.getOrderNo());
|
|
|
BigDecimal reduce = expenseAccounts.stream().map(ExpenseAccount::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
- String str = e.getBuyerName() + e.getContractNo() +
|
|
|
- ":应公出" + out.getMaxDuration() + "小时" +
|
|
|
- ",已" + out.getPeopleCount() + "人公出," +
|
|
|
- out.getFrequency() + "次" +
|
|
|
- "," + out.getActualDuration() + "小时" +
|
|
|
- ",超过" + out.getExceedDuration() + "小时" +
|
|
|
- ",已报销" + reduce.stripTrailingZeros().toPlainString() + "元";
|
|
|
+ String str = getString(e, out, reduce);
|
|
|
e.setCountStr(str);
|
|
|
}
|
|
|
}
|
|
|
@@ -1431,6 +1425,18 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
|
|
|
}
|
|
|
|
|
|
+ private String getString(SonExpenseAccount e, TOrderPublicReleaseCount out, BigDecimal reduce) {
|
|
|
+ String maxString=":应公出" + out.getMaxDuration() + "小时";
|
|
|
+ if (out.getMaxDuration().equals(-1d))maxString=":不限制公出小时";
|
|
|
+ String str = e.getBuyerName() + e.getContractNo() +
|
|
|
+ maxString +
|
|
|
+ ",已" + out.getPeopleCount() + "人公出," +
|
|
|
+ out.getFrequency() + "次" +
|
|
|
+ "," + out.getActualDuration() + "小时" +
|
|
|
+ ",超过" + out.getExceedDuration() + "小时" +
|
|
|
+ ",已报销" + reduce.stripTrailingZeros().toPlainString() + "元";
|
|
|
+ return str;
|
|
|
+ }
|
|
|
|
|
|
|
|
|
@Override
|