更新打样申请单认定上传单据成功的判断方法

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

@@ -1,32 +1,59 @@
 package com.uas.platform.b2b.dao;
 
 
-import java.util.Date;
-import java.util.List;
-
+import com.uas.platform.b2b.model.PurchaseProofingApproval;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.PurchaseProofingApproval;
+import java.util.Date;
+import java.util.List;
 
 @Repository
 public interface PurchaseProofingApprovalDao extends JpaSpecificationExecutor<PurchaseProofingApproval>, JpaRepository<PurchaseProofingApproval, Long> {
 
+	/**
+	 * 通过供应商UU和下载状态查询认定单
+	 *
+	 * @param vendUU 供应商UU
+	 * @param sendStatus 下载状态
+	 * @return
+	 */
 	List<PurchaseProofingApproval> findByVendUUAndSendStatus(Long vendUU, Short sendStatus);
-	
-	List<PurchaseProofingApproval> findByVendUUAndSscode(Long vendUU, String sscode);
-	
+
+	/**
+	 * 通过企业UU和编号查询认定单
+	 *
+	 * @param enUU 企业UU
+	 * @param code 认定单编号
+	 * @return
+	 */
 	List<PurchaseProofingApproval> findByEnUUAndCode(Long enUU, String code);
 
+	/**
+	 * 通过供应商UU和截止日期查询id
+	 *
+	 * @param vendUU 供应商UU
+	 * @param endDate 截止日期
+	 * @return
+	 */
 	@Query("select p.id from PurchaseProofingApproval p where p.vendUU=:vendUU and p.inDate >=  :fromDadte")
-	public List<Long> findByFromDate(@Param("vendUU")Long vendUU, @Param("fromDadte")Date endDate);
+	public List<Long> findByFromDate(@Param("vendUU")Long vendUU, @Param("fromDadte") Date endDate);
 
 	@Query("select p.id from PurchaseProofingApproval p where p.vendUU=:vendUU and p.inDate <= :endDate")
 	public List<Long> findByEndDate(@Param("vendUU")Long vendUU, @Param("endDate")Date endDate);
 	
 	@Query("select count(p) from PurchaseProofingApproval p where p.vendUU = :enUU")
 	public Long getProofingApprovalCountByEnUU(@Param("enUU")Long enUU);
+
+	/**
+	 * 通过企业UU和erpId查询单据
+	 *
+	 * @param enUU 企业UU
+	 * @param erpId erpId
+	 * @return
+	 */
+	List<PurchaseProofingApproval> findByEnUUAndErpId(Long enUU, Long erpId);
 }

src/main/java/com/uas/platform/b2b/erp/controller/ProductSampleController.java

@@ -174,11 +174,12 @@ public class ProductSampleController {
 	 */
 	@RequestMapping(value = "/approval", method = RequestMethod.POST)
 	@ResponseBody
-	public void saveProductSampleApprovals(@RequestParam("data") String data) throws UnsupportedEncodingException {
+	public List<ProductSampleApproval> saveProductSampleApprovals(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<ProductSampleApproval> sampleApprovals = FlexJsonUtils.fromJsonArray(jsonStr, ProductSampleApproval.class);
 		purchaseProofingService.saveSampleApproval(purchaseSampleService.convertApproval(sampleApprovals));
 		logger.log("认定单", "买家上传认定单", sampleApprovals.size());
+		return purchaseSampleService.getApprovalB2bId(sampleApprovals);
 	}
 
 	/**

src/main/java/com/uas/platform/b2b/erp/model/ProductSampleApproval.java

@@ -1,16 +1,16 @@
 package com.uas.platform.b2b.erp.model;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import com.uas.platform.b2b.model.EnterpriseInfo;
 import com.uas.platform.b2b.model.PurchaseProofingApproval;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
 import org.apache.commons.collections.CollectionUtils;
 
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 /**
  * 买家ERP系统的采购询价单
  * 
@@ -63,6 +63,7 @@ public class ProductSampleApproval{
 	private String pa_finalresult;
 	private String pa_finalresultremark;
 	private String pa_yxdj;//优选等级
+	private Long pa_b2bid;
  
 	public Long getPa_id() {
 		return pa_id;
@@ -305,6 +306,14 @@ public class ProductSampleApproval{
 		this.pa_yxdj = pa_yxdj;
 	}
 
+	public Long getPa_b2bid() {
+		return pa_b2bid;
+	}
+
+	public void setPa_b2bid(Long pa_b2bid) {
+		this.pa_b2bid = pa_b2bid;
+	}
+
 	public PurchaseProofingApproval convert() {
 		PurchaseProofingApproval approval = new PurchaseProofingApproval();
 		approval.setAddress(pa_address);

src/main/java/com/uas/platform/b2b/erp/service/PurchaseSampleService.java

@@ -31,4 +31,12 @@ public interface PurchaseSampleService {
 	 * @return
 	 */
     List<ProductSample> getB2bId(List<ProductSample> productSamples);
+
+    /**
+     * 查询认定单对应的平台的id
+     *
+     * @param sampleApprovals erp认定单
+     * @return
+     */
+    List<ProductSampleApproval> getApprovalB2bId(List<ProductSampleApproval> sampleApprovals);
 }

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseSampleServiceImpl.java

@@ -23,6 +23,9 @@ public class PurchaseSampleServiceImpl implements PurchaseSampleService {
 	@Autowired
 	private PurchaseProofingDao purchaseProofingDao;
 
+	@Autowired
+    private PurchaseProofingApprovalDao purchaseProofingApprovalDao;
+
 	@Autowired
 	private UserDao userDao;
 
@@ -157,4 +160,21 @@ public class PurchaseSampleServiceImpl implements PurchaseSampleService {
         }
 		return productSamples;
 	}
+
+    /**
+     * 查询认定单对应的平台的id
+     *
+     * @param sampleApprovals erp认定单
+     * @return
+     */
+    @Override
+    public List<ProductSampleApproval> getApprovalB2bId(List<ProductSampleApproval> sampleApprovals) {
+        for (ProductSampleApproval sample : sampleApprovals) {
+            List<PurchaseProofingApproval> proofings = purchaseProofingApprovalDao.findByEnUUAndErpId(SystemSession.getUser().getEnterprise().getUu(), sample.getPa_id());
+            if (!CollectionUtils.isEmpty(proofings)) {
+                sample.setPa_b2bid(proofings.get(0).getId());
+            }
+        }
+        return sampleApprovals;
+    }
 }