Browse Source

订单列表显示流程错误修改

anderx 1 year ago
parent
commit
a3b6a008e4

+ 3 - 3
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -1453,10 +1453,10 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
 
     private String getString(SonExpenseAccount e, TOrderPublicReleaseCount out, BigDecimal count, BigDecimal yxyCount, BigDecimal zxsCount, BigDecimal qtCount) {
         String maxString=":应公出" + out.getMaxDuration() + "小时";
-        String actualString=",超过" + out.getExceedDuration() + "(仅统计技术的总工时)小时";
+        String actualString=",超过" + out.getExceedDuration() + "(仅统计技术的总工时)小时,";
         if (out.getMaxDuration().equals(-1d)){
             maxString=":不限制公出小时";
-            actualString=",";
+            actualString="";
         }
         StringBuilder expenseString=new StringBuilder().append(",报销").append(count.stripTrailingZeros().toPlainString()).append("元");
         if (yxyCount != null || zxsCount != null||qtCount != null){
@@ -1474,7 +1474,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             expenseString.append(")");
         }
         if (out.getActualDuration()<=out.getMaxDuration()){
-            actualString=",";
+            actualString="";
         }
         return e.getBuyerName() + e.getContractNo() +
                 maxString +