导入物料BUG修复

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

@@ -6,11 +6,11 @@ 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.web.bind.annotation.ResponseBody;
+import org.springframework.stereotype.Repository;
 
 import com.uas.platform.b2b.model.AddPartner;
 
-@ResponseBody
+@Repository
 public interface AddPartnerDao extends JpaRepository<AddPartner, Long>, JpaSpecificationExecutor<AddPartner> {
 
 	/**

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

@@ -78,13 +78,14 @@ public class ProductTempDao {
     }
 
     public List<Product> getNotMatchedProducts(String importId) {
-        return jdbcTemplate.query("select pr_code,pr_title,pr_spec,pr_cmpcode,pr_brand,pr_unit,pr_minpack,pr_minorder,pr_leadtime,pr_ltinstock,pr_enuu,pr_useruu," +
-                        "pr_issale,pr_ispurchase,pr_isshow,pr_standard,pr_ispubsale,pr_sourceapp,pr_create_time from products_temp where pr_import_id=? and pr_exist_id is null",
+        return jdbcTemplate.query("select pr_code code,pr_title title,pr_spec spec,pr_cmpcode cmpCode,pr_brand brand,pr_unit unit,pr_minpack minPack,pr_minorder minOrder,pr_leadtime leadtime,pr_ltinstock ltinstock,pr_enuu enUU,pr_useruu userUU," +
+                        "pr_issale isSale,pr_ispurchase isPurchase,pr_isshow isShow,pr_standard standard,pr_ispubsale isPubsale,pr_sourceapp sourceApp,pr_create_time createTime from products_temp where pr_import_id=? and pr_exist_id is null",
                 new BeanPropertyRowMapper<Product>(Product.class), importId);
     }
 
     public List<Product> getMatchedProducts(String importId) {
-        return jdbcTemplate.query("select * from products p where exists (select 1 from products_temp t where t.pr_exist_id=p.pr_id and t.pr_import_id=?)",
+        return jdbcTemplate.query("select pr_id id,pr_code code,pr_title title,pr_spec spec,pr_cmpcode cmpCode,pr_brand brand,pr_unit unit,pr_minpack minPack,pr_minorder minOrder,pr_leadtime leadtime,pr_ltinstock ltinstock,pr_enuu enUU,pr_useruu userUU," +
+                        "pr_issale isSale,pr_ispurchase isPurchase,pr_isshow isShow,pr_standard standard,pr_ispubsale isPubsale,pr_sourceapp sourceApp,pr_create_time createTime from products p where exists (select 1 from products_temp t where t.pr_exist_id=p.pr_id and t.pr_import_id=?)",
                 new BeanPropertyRowMapper<Product>(Product.class), importId);
     }
 

src/main/java/com/uas/platform/b2b/ps/ProductUtils.java

@@ -29,7 +29,7 @@ public class ProductUtils {
     /**
      * 物料单次请求数据量大小
      */
-    private static final Double ONE_TIME_DATA_SIZE = 1000d;
+    private static final int ONE_TIME_DATA_SIZE = 1000;
 
     /**
      * 分页批量更新物料

src/main/java/com/uas/platform/b2b/service/impl/ProductUsersServiceImpl.java

@@ -367,7 +367,6 @@ public class ProductUsersServiceImpl implements ProductUsersService {
             }
             System.out.println("取匹配后结果:" + (System.currentTimeMillis() - start));
             start = System.currentTimeMillis();
-            System.out.println(JSON.toJSONString(products.get(0)));
             try {
                 // 更新物料
                 List<Long> idList = ProductUtils.paginationUpdate(products);