|
|
@@ -81,7 +81,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
@Autowired
|
|
|
private ExpenseConfigDetailsMapper expenseConfigDetailsMapper;
|
|
|
@Autowired
|
|
|
- private TOrderTaskMapper tOrderTaskMapper;
|
|
|
+ private TTaskMemberMapper tTaskMemberMapper;
|
|
|
@Autowired
|
|
|
private TOrderPublicReleaseCountMapper tOrderPublicReleaseCountMapper;
|
|
|
|
|
|
@@ -1427,13 +1427,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 actualString=",超过" + out.getExceedDuration() + "小时";
|
|
|
+ if (out.getMaxDuration().equals(-1d)){
|
|
|
+ maxString=":不限制公出小时";
|
|
|
+ actualString=",";
|
|
|
+ }
|
|
|
+
|
|
|
String str = e.getBuyerName() + e.getContractNo() +
|
|
|
maxString +
|
|
|
",已" + out.getPeopleCount() + "人公出," +
|
|
|
out.getFrequency() + "次" +
|
|
|
"," + out.getActualDuration() + "小时" +
|
|
|
- ",超过" + out.getExceedDuration() + "小时" +
|
|
|
+ actualString+
|
|
|
",已报销" + reduce.stripTrailingZeros().toPlainString() + "元";
|
|
|
return str;
|
|
|
}
|