bug修改

src/main/java/com/uas/platform/b2b/dao/PurchaseAcceptItemDao.java

@@ -39,7 +39,7 @@ public interface PurchaseAcceptItemDao extends JpaSpecificationExecutor<Purchase
 	 * @param needEndDate
 	 * @return
 	 */
-	@Query("from PurchaseAcceptItem p where p.accept.enUU = :enUU and p.orderItem.order.date >= :startDate and p.orderItem.order.date <= :endDate")
+	@Query("from PurchaseAcceptItem p where p.accept.vendUU = :enUU and p.orderItem.order.date >= :startDate and p.orderItem.order.date <= :endDate")
 	List<PurchaseAcceptItem> findPurcAccsptItems(@Param("enUU") Long enUU, @Param("startDate") Date needStartDate, @Param("endDate") Date needEndDate);
 
 	/**
@@ -48,6 +48,6 @@ public interface PurchaseAcceptItemDao extends JpaSpecificationExecutor<Purchase
 	 * @param ids
 	 * @return
 	 */
-	@Query("from PurchaseAcceptItem p where p.accept.enUU = :enUU and p.id in :ids")
+	@Query("from PurchaseAcceptItem p where p.accept.vendUU = :enUU and p.id in :ids")
 	List<PurchaseAcceptItem> findPurcAcceptByItemIds(@Param("enUU") Long enUU,@Param("ids") List<Long> ids);
 }

src/main/java/com/uas/platform/b2b/openapi/model/FxPurOrder.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.openapi.model;
 import com.uas.platform.b2b.model.PurchaseAcceptItem;
 import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.b2b.model.PurchaseOrderItem;
+import org.springframework.util.StringUtils;
 
 import java.util.Date;
 import java.util.HashSet;
@@ -100,8 +101,10 @@ public class FxPurOrder {
     public FxPurOrder(PurchaseOrder order,PurchaseOrderItem orderItem,PurchaseAcceptItem needAcceptItem) {
         this.id = order.getId();
         this.orderCode = order.getCode();
-        this.custName = order.getReceiveName();
-        this.custUU = order.getVendUU();
+        if (!StringUtils.isEmpty(order.getEnterprise())) {
+            this.custName = order.getEnterprise().getEnName();
+        }
+        this.custUU = order.getEnUU();
         this.total = orderItem.getAmount();
         this.date = order.getDate();
         this.orderItems.add(new FxPurcOrderItem(orderItem,needAcceptItem));
@@ -110,8 +113,10 @@ public class FxPurOrder {
     public FxPurOrder convert(PurchaseOrder order,Double total){
         this.id = order.getId();
         this.orderCode = order.getCode();
-        this.custName = order.getReceiveName();
-        this.custUU = order.getVendUU();
+        if (!StringUtils.isEmpty(order.getEnterprise())) {
+            this.custName = order.getEnterprise().getEnName();
+        }
+        this.custUU = order.getEnUU();
         this.total = total;
         this.date = order.getDate();
         return this;