|
|
@@ -1555,7 +1555,11 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
bo.setActualDuration(out.getActualDuration());
|
|
|
bo.setFrequency(out.getFrequency());
|
|
|
bo.setPeopleCount(out.getPeopleCount());
|
|
|
- String maxString=":应公出" + bo.getMaxDuration() +"小时["+useOyd.getYear()+"年]";
|
|
|
+ String yearStr="";
|
|
|
+ if (useOyd.getYear()>0){
|
|
|
+ yearStr="["+useOyd.getYear()+"年]";
|
|
|
+ }
|
|
|
+ String maxString=":应公出" + bo.getMaxDuration() +"小时"+yearStr;
|
|
|
String actualString=",超过" + bo.getExceedDuration() + "小时,";
|
|
|
if (useOyd.getStatus()==1){
|
|
|
maxString=":不限制公出小时["+useOyd.getYear()+"年]";
|