Browse Source

Merge branch 'test3' into test2

anderx 1 year ago
parent
commit
b1b2e53f4e

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

@@ -24,6 +24,7 @@ import com.goafanti.expenseAccount.Enums.EATypes;
 import com.goafanti.expenseAccount.Enums.EAsecondaryTypes;
 import com.goafanti.expenseAccount.bo.*;
 import com.goafanti.expenseAccount.service.ExpenseAccountService;
+import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.organization.bo.OrganizationListOut;
 import com.itextpdf.text.Document;
@@ -1549,7 +1550,10 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
 //        if (bo.getExceedDuration().compareTo(BigDecimal.ZERO) <1){
 //            actualString="";
 //        }
-        if (out==null||useOyd==null)return String.format("订单%s统计信息不存在,请要营销员先将订单派单。",e.getOrderNo());
+        if (out==null||useOyd==null){
+            TOrderNewBo orderNewBo = orderNewService.getOrderNewDetail(e.getOrderNo());
+            return String.format("%s+%s派单进行中(无法统计公出信息)",orderNewBo.getNickname(),orderNewBo.getContractNo());
+        }
         bo.setMaxDuration(useOyd.getMaxDuration().doubleValue());
         bo.setExceedDuration(useOyd.getMaxDuration().subtract(BigDecimal.valueOf(out.getActualDuration())).abs());
         bo.setActualDuration(out.getActualDuration());