修改

watero-rst-interface/src/main/java/com/iamberry/rst/faces/fm/AwaitingSignclosedProductInfoService.java

@@ -1,36 +1,32 @@
 package com.iamberry.rst.faces.fm;
 
-import com.iamberry.rst.core.fm.AwaitingSignclosedProductInfo;
-
-import java.util.List;
-
 /**
  * 客诉-待签收产品service
  */
 public interface AwaitingSignclosedProductInfoService {
-    /**
-     * 添加单个待签收产品
-     * @return
-     */
-    int insert(AwaitingSignclosedProductInfo record);
-    /**
-     * 获取单个待签收产品
-     */
-    AwaitingSignclosedProductInfo getByPrimaryId(Integer productId);
-
-    /**
-     * 查询多个签收产品记录
-     * @return
-     */
-    List<AwaitingSignclosedProductInfo> listByPrimaryId(Integer signclosedId);
-    /**
-     * 修改单个待签收产品
-     * @return
-     */
-    int updateById(AwaitingSignclosedProductInfo record);
-
-    /**
-     * 根据签收id获取多个待签收产品
-     */
-    List<AwaitingSignclosedProductInfo> listBySignclosedId(Integer signclosedId);
+//    /**
+//     * 添加单个待签收产品
+//     * @return
+//     */
+//    int insert(AwaitingSignclosedProductInfo record);
+//    /**
+//     * 获取单个待签收产品
+//     */
+//    AwaitingSignclosedProductInfo getByPrimaryId(Integer productId);
+//
+//    /**
+//     * 查询多个签收产品记录
+//     * @return
+//     */
+//    List<AwaitingSignclosedProductInfo> listByPrimaryId(Integer signclosedId);
+//    /**
+//     * 修改单个待签收产品
+//     * @return
+//     */
+//    int updateById(AwaitingSignclosedProductInfo record);
+//
+//    /**
+//     * 根据签收id获取多个待签收产品
+//     */
+//    List<AwaitingSignclosedProductInfo> listBySignclosedId(Integer signclosedId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/AwaitingSignclosedProductInfoServiceImpl.java

@@ -13,28 +13,28 @@ import java.util.List;
 public class AwaitingSignclosedProductInfoServiceImpl implements AwaitingSignclosedProductInfoService {
     @Autowired
     private AwaitingSignclosedProductMapper awaitingSignclosedProductMapper;
-    @Override
-    public int insert(AwaitingSignclosedProductInfo record) {
-        return awaitingSignclosedProductMapper.insert(record);
-    }
-
-    @Override
-    public AwaitingSignclosedProductInfo getByPrimaryId(Integer productId) {
-        return awaitingSignclosedProductMapper.getByPrimaryId(productId);
-    }
-
-    @Override
-    public List<AwaitingSignclosedProductInfo> listByPrimaryId(Integer signclosedId) {
-        return awaitingSignclosedProductMapper.listByPrimaryId(signclosedId);
-    }
-
-    @Override
-    public int updateById(AwaitingSignclosedProductInfo record) {
-        return awaitingSignclosedProductMapper.updateById(record);
-    }
-
-    @Override
-    public List<AwaitingSignclosedProductInfo> listBySignclosedId(Integer signclosedId) {
-        return awaitingSignclosedProductMapper.listBySignclosedId(signclosedId);
-    }
+//    @Override
+//    public int insert(AwaitingSignclosedProductInfo record) {
+//        return awaitingSignclosedProductMapper.insert(record);
+//    }
+//
+//    @Override
+//    public AwaitingSignclosedProductInfo getByPrimaryId(Integer productId) {
+//        return awaitingSignclosedProductMapper.getByPrimaryId(productId);
+//    }
+//
+//    @Override
+//    public List<AwaitingSignclosedProductInfo> listByPrimaryId(Integer signclosedId) {
+//        return awaitingSignclosedProductMapper.listByPrimaryId(signclosedId);
+//    }
+//
+//    @Override
+//    public int updateById(AwaitingSignclosedProductInfo record) {
+//        return awaitingSignclosedProductMapper.updateById(record);
+//    }
+//
+//    @Override
+//    public List<AwaitingSignclosedProductInfo> listBySignclosedId(Integer signclosedId) {
+//        return awaitingSignclosedProductMapper.listBySignclosedId(signclosedId);
+//    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintSignclosedInfoServiceImpl.java

@@ -511,27 +511,27 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
         return complaintSignclosedInfoMapper.getCompleteSent(complaintSignclosedInfo);
     }
 
-    private Integer addSifnclosed(Map<String,Integer> Map,Integer signclosedId) {
-        Integer msg = 0;
-        for (Map.Entry<String, Integer> entry : Map.entrySet()) {
-            AwaitingSignclosedProductInfo awaitingSignclosedInfo = new AwaitingSignclosedProductInfo();
-            //根据颜色id获取产品信息获取产品信息
-            Product product = productMapper.getProductById(Integer.valueOf(entry.getKey()));
-            if (product == null) {
-                return 0;
-            }
-            awaitingSignclosedInfo.setSignclosedId(signclosedId);
-            awaitingSignclosedInfo.setProductName(product.getProductName());
-            awaitingSignclosedInfo.setProductNum(entry.getValue());
-            awaitingSignclosedInfo.setSignclosedProductType(1);
-            awaitingSignclosedInfo.setSignclosedProductId(product.getProductId());
-            awaitingSignclosedInfo.setSignclosedProductColor(Integer.valueOf(entry.getKey()));
-            awaitingSignclosedInfo.setSignclosedCreateTime(new Date());
-            msg = awaitingSignclosedProductMapper.insert(awaitingSignclosedInfo);
-
-        }
-        return msg;
-    }
+//    private Integer addSifnclosed(Map<String,Integer> Map,Integer signclosedId) {
+//        Integer msg = 0;
+//        for (Map.Entry<String, Integer> entry : Map.entrySet()) {
+//            AwaitingSignclosedProductInfo awaitingSignclosedInfo = new AwaitingSignclosedProductInfo();
+//            //根据颜色id获取产品信息获取产品信息
+//            Product product = productMapper.getProductById(Integer.valueOf(entry.getKey()));
+//            if (product == null) {
+//                return 0;
+//            }
+//            awaitingSignclosedInfo.setSignclosedId(signclosedId);
+//            awaitingSignclosedInfo.setProductName(product.getProductName());
+//            awaitingSignclosedInfo.setProductNum(entry.getValue());
+//            awaitingSignclosedInfo.setSignclosedProductType(1);
+//            awaitingSignclosedInfo.setSignclosedProductId(product.getProductId());
+//            awaitingSignclosedInfo.setSignclosedProductColor(Integer.valueOf(entry.getKey()));
+//            awaitingSignclosedInfo.setSignclosedCreateTime(new Date());
+//            msg = awaitingSignclosedProductMapper.insert(awaitingSignclosedInfo);
+//
+//        }
+//        return msg;
+//    }
 
     @Override
     public ComplaintSignclosedInfo getSignclosedById(Integer signclosedId) {

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/AwaitingSignclosedProductMapper.java

@@ -1,9 +1,5 @@
 package com.iamberry.rst.service.fm.mapper;
 
-import com.iamberry.rst.core.fm.AwaitingSignclosedProductInfo;
-
-import java.util.List;
-
 /**
  * 客诉-待签收产品mapper
  */
@@ -12,26 +8,26 @@ public interface AwaitingSignclosedProductMapper {
      * 添加单个待签收产品
      * @return
      */
-    int insert(AwaitingSignclosedProductInfo record);
+    //int insert(AwaitingSignclosedProductInfo record);
     /**
      * 获取单个待签收产品
      */
-    AwaitingSignclosedProductInfo getByPrimaryId(Integer productId);
+    //AwaitingSignclosedProductInfo getByPrimaryId(Integer productId);
 
     /**
      * 获取多个待签收产品
      */
-    List<AwaitingSignclosedProductInfo> listByPrimaryId(Integer signclosedId);
+    //List<AwaitingSignclosedProductInfo> listByPrimaryId(Integer signclosedId);
 
 
     /**
      * 修改单个待签收产品
      * @return
      */
-    int updateById(AwaitingSignclosedProductInfo record);
+    //int updateById(AwaitingSignclosedProductInfo record);
     /**
      * 根据签收id获取多个待签收产品
      */
-    List<AwaitingSignclosedProductInfo> listBySignclosedId(Integer signclosedId);
+    //List<AwaitingSignclosedProductInfo> listBySignclosedId(Integer signclosedId);
 
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/awaitingSignclosedProductMapper.xml

@@ -38,7 +38,7 @@
     from
     tb_rst_complaint_awaiting_signclosed_product sp
     LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
-    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
+    LEFT JOIN tb_rst_product_info pi on pc.color_product_id = pi.product_id
     where signclosed_id = #{signclosedId,jdbcType=INTEGER}
   </select>
   <insert id="insert" parameterType="AwaitingSignclosedProductInfo" useGeneratedKeys="true" keyProperty="productId">

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintSignclosedProductInfoMapper.xml

@@ -42,7 +42,7 @@
     from
     tb_rst_complaint_signclosed_product sp
     LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
-    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
+        LEFT JOIN tb_rst_product_info pi on pc.color_product_id = pi.product_id
     where signclosed_id = #{signclosedId,jdbcType=INTEGER}
   </select>