产品分类改成多选-01

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/web/ConsultSheetController.java

@@ -4,6 +4,7 @@ package com.cftech.consultsheet.web;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.cftech.accounts.service.MpAccountsService;
+
 import com.cftech.addresst.model.Address;
 import com.cftech.addresst.service.AddressService;
 import com.cftech.base.codingrule.utils.CodingruleUtils;

aidea-modules/product-module/src/main/java/com/cftech/product/dao/ProductMapper.xml

@@ -204,6 +204,7 @@
         t_aidea_product a
         LEFT JOIN t_aidea_product_classify b ON a.classify_id = b.id
         AND b.del_flag = '0'
+        <include refid="sqlWhere"/>
         <if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
         <if test="limit>0">limit #{offset},#{limit}</if>
     </select>

aidea-modules/product-module/src/main/java/com/cftech/product/model/Product.java

@@ -26,18 +26,18 @@ public class Product implements Serializable {
     /**
      * 产品分类编码
      */
-    @ExportConfig(value = "产品分类编码（多个分类用英文逗号隔开）",width = 200 ,showLevel = 2)
+    @ExportConfig(value = "产品分类编码（多个分类用英文逗号隔开,必填字段）",width = 250 ,showLevel = 2)
     private String classifyNumber;
     /**
      * 产品分类名称
      */
-    @ExportConfig(value = "产品分类名称", width = 150, showLevel = 1)
+    @ExportConfig(value = "产品分类名称（必填字段）", width = 150, showLevel = 1)
     private String classifyName;
 
     /**
      * 产品编码
      */
-    @ExportConfig(value = "产品编码", width = 100)
+    @ExportConfig(value = "产品编码（必填字段）", width = 100)
     private String productNumber;
     /**
      * 产品名称
@@ -103,7 +103,7 @@ public class Product implements Serializable {
     /**
      *库存
      */
-    @ExportConfig(value = "库存", width = 100)
+    @ExportConfig(value = "库存（必填字段）", width = 100)
     private Long stock;
     /**
      *价格

aidea-modules/product-module/src/main/java/com/cftech/product/web/ProductController.java

@@ -226,14 +226,15 @@ public class ProductController {
                 }
                 product.setAccountsId(accountId);
                 //产品编码
-                product.setProductNumber(rowData.get(1));
                 Conds conds = new Conds();
-                conds.equal("product_number",rowData.get(1));
-                conds.equal("del_flag",0);
+                conds.equal("a.product_number",rowData.get(1).trim());
+                conds.equal("a.del_flag",0);
                 Product listProduct = productService.fetchSearchByConds(conds);
                 if(listProduct == null){
                     sbProduct.append(rowData.get(1));
                     return;
+                }else{
+                    product.setProductNumber(rowData.get(1).trim());
                 }
                 //产品名称
                 product.setProductName(rowData.get(2));
@@ -287,7 +288,7 @@ public class ProductController {
         if(sbClassify.length()>0){
             retJson.put("errorMsg", "部分导入失败,产品编码有："+sbClassify.toString()+"; 失败原因：库存不能为空或者为负数");
         }else if(sbProduct.length() > 0){
-            retJson.put("errorMsg", "部分导入失败,产品编码有："+sbClassify.toString()+"; 失败原因：错误产品编码");
+            retJson.put("errorMsg", "部分导入失败,产品编码有："+sbProduct.toString()+"; 失败原因：错误产品编码");
         }else{
             retJson.put("errorMsg", "导入成功");
         }