|
|
@@ -1456,7 +1456,12 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
|
|
|
private String getString(SonExpenseAccount e, TOrderPublicReleaseCount out, BigDecimal count, BigDecimal yxyCount, BigDecimal zxsCount, BigDecimal qtCount) {
|
|
|
if (out == null){
|
|
|
- return null;
|
|
|
+ out=new TOrderPublicReleaseCount();
|
|
|
+ out.setMaxDuration(0d);
|
|
|
+ out.setExceedDuration(0d);
|
|
|
+ out.setActualDuration(0d);
|
|
|
+ out.setFrequency(0);
|
|
|
+ out.setPeopleCount(0);
|
|
|
}
|
|
|
String maxString=":应公出" + out.getMaxDuration() + "小时";
|
|
|
String actualString=",超过" + out.getExceedDuration() + "小时,";
|