物料上传BUG修改

applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/ProductApi.java

@@ -2,9 +2,7 @@ package com.usoftchina.saas.document.api;
 
 import com.usoftchina.saas.auth.client.interceptor.ServiceFeignInterceptor;
 import com.usoftchina.saas.base.Result;
-import com.usoftchina.saas.document.dto.ProductDTO;
 import com.usoftchina.saas.document.dto.ProductUploadDTO;
-import com.usoftchina.saas.page.PageRequest;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,15 +14,6 @@ import java.util.List;
 @FeignClient(name = "document-server", configuration = ServiceFeignInterceptor.class)
 public interface ProductApi {
 
-    /**
-     * 查询Products
-     * @param page
-     * @param condition
-     * @return
-     */
-   /* @GetMapping("/api/document/product/getProductsByCondition")
-    public List<ProductDTO> getProductsByCondition(@RequestParam(value = "page") PageRequest page, @RequestParam(value = "condition") String condition);*/
-
     /**
     * @Description
     * 更新最新采购单价
@@ -40,8 +29,8 @@ public interface ProductApi {
      * 获取需要上传的物料数据
      * @return
      */
-    @GetMapping("/b2b/upload/data")
-    Result<List<ProductUploadDTO>> getUploadData();
+    @GetMapping("/product/b2b/upload/data")
+    Result<List<ProductUploadDTO>> getUploadData(@RequestParam("companyId") Long companyId);
 
     /**
      * 批量更新物料上传状态
@@ -49,6 +38,6 @@ public interface ProductApi {
      * @param status
      * @return
      */
-    @PostMapping("/b2b/status/update")
+    @PostMapping("/product/b2b/status/update")
     Result updateStatus(@RequestParam("ids") String ids, @RequestParam("status") String status);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/ProductController.java

@@ -140,8 +140,8 @@ public class ProductController {
      * @return
      */
     @GetMapping("/b2b/upload/data")
-    public Result<List<ProductUploadDTO>> getUploadData(){
-        return Result.success(productService.getUploadData());
+    public Result<List<ProductUploadDTO>> getUploadData(@RequestParam("companyId") Long companyId){
+        return Result.success(productService.getUploadData(companyId));
     }
 
     /**

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/ProductMapper.java

@@ -67,7 +67,7 @@ public interface ProductMapper extends CommonBaseMapper<Product> {
 
     List<ProductUploadDTO> selectUploadProdByCompanyId(@Param("companyId") Long companyId);
 
-    void updateB2BStatus(List<String> idsList, @Param("status") String status);
+    void updateB2BStatus(@Param("list") List<String> idsList, @Param("status") String status);
 
     List<ProdStorageDTO> getProdStorage(@Param("condition") String condition, @Param("companyId") Long companyId, @Param("userId") Long userId);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/ProductService.java

@@ -127,7 +127,7 @@ public interface ProductService extends CommonBaseService<ProductMapper, Product
     /**
      * 获取需要上传的数据
      */
-    List<ProductUploadDTO> getUploadData();
+    List<ProductUploadDTO> getUploadData(Long companyId);
 
     /**
      * 批量更新物料上传状态

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/ProductServiceImpl.java

@@ -795,8 +795,8 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
      * @return
      */
     @Override
-    public List<ProductUploadDTO> getUploadData(){
-        return getMapper().selectUploadProdByCompanyId(BaseContextHolder.getCompanyId());
+    public List<ProductUploadDTO> getUploadData(Long companyId){
+        return getMapper().selectUploadProdByCompanyId(companyId);
     }
 
     /**

applications/document/document-server/src/main/resources/mapper/ProductMapper.xml

@@ -962,7 +962,7 @@
     </select>
     <select id="selectUploadProdByCompanyId" resultType="com.usoftchina.saas.document.dto.ProductUploadDTO">
         SELECT pr_id,pr_code,pr_spec,pr_detail,pr_leadtime,pr_unit,pr_zxbzs,pr_brand,pr_orispeccode
-        FROM PRODUCT WHERE COMPANYID = #{companyId} AND IFNULL(B2BSTATUS, '待上传') = '待上传'
+        FROM PRODUCT WHERE COMPANYID = #{companyId} AND IFNULL(B2BSTATUS, '待上传') IN ('待上传','上传中')
     </select>
     <update id="updateB2BStatus">
         UPDATE PRODUCT SET B2BSTATUS = #{status} WHERE PR_ID IN