Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintSmallClassInfoService.java
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintTypeInfoService.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintSmallClassInfoServiceImpl.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintTypeInfoServiceImpl.java

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

@@ -0,0 +1,23 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.AwaitingSignclosedProductInfo;
+
+/**
+ * 客诉-待签收产品service
+ */
+public interface AwaitingSignclosedProductInfoService {
+    /**
+     * 添加单个待签收产品
+     * @return
+     */
+    int insert(AwaitingSignclosedProductInfo record);
+    /**
+     * 获取单个待签收产品
+     */
+    AwaitingSignclosedProductInfo getByPrimaryId(Integer productId);
+    /**
+     * 修改单个待签收产品
+     * @return
+     */
+    int updateById(AwaitingSignclosedProductInfo record);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintDetectInfoService.java

@@ -0,0 +1,24 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.ComplaintDetectInfo;
+
+/**
+ * 客诉-品质检测产品service
+ */
+public interface ComplaintDetectInfoService {
+    /**
+     * 添加单个品质检测产品
+     * @return
+     */
+    int insert(ComplaintDetectInfo record);
+    /**
+     * 查询单个品质检测产品
+     * @return
+     */
+    ComplaintDetectInfo getComplaintDetectById(Integer detectId);
+    /**
+     * 修改单个待品质检测产品
+     * @return
+     */
+    int updateComplaintDetectById(ComplaintDetectInfo record);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintMaintenanceInfoService.java

@@ -0,0 +1,24 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.ComplaintMaintenanceInfo;
+
+/**
+ * 客诉-生产维修Service
+ */
+public interface ComplaintMaintenanceInfoService {
+    /**
+     * 添加单个品质检测产品
+     * @return
+     */
+    int insert(ComplaintMaintenanceInfo record);
+    /**
+     * 查询单个品质检测产品
+     * @return
+     */
+    ComplaintMaintenanceInfo getMaintenanceByid(Integer maintenanceId);
+    /**
+     * 修改单个品质检测产品
+     * @return
+     */
+    int updateMaintenanceById(ComplaintMaintenanceInfo record);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintQuestionInfoService.java

@@ -0,0 +1,24 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
+
+/**
+ * 客诉-客诉问题Service
+ */
+public interface ComplaintQuestionInfoService {
+    /**
+     * 添加单个客诉问题
+     * @return
+     */
+    int insert(ComplaintQuestionInfo record);
+    /**
+     * 查询单个客诉问题
+     * @return
+     */
+    ComplaintQuestionInfo getQuestionById(Integer questionId);
+    /**
+     * 修改单个客诉问题
+     * @return
+     */
+    int updateQuestionById(ComplaintQuestionInfo record);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintSignclosedInfoService.java

@@ -0,0 +1,24 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
+
+/**
+ * 客诉-签收表Service
+ */
+public interface ComplaintSignclosedInfoService {
+    /**
+     * 添加单个签收记录
+     * @return
+     */
+    int insert(ComplaintSignclosedInfo record);
+    /**
+     * 查询单个签收记录
+     * @return
+     */
+    ComplaintSignclosedInfo getSignclosedById(Integer signclosedId);
+    /**
+     * 修改单个签收记录
+     * @return
+     */
+    int updateSignclosedById(ComplaintSignclosedInfo record);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintSignclosedProductInfoService.java

@@ -0,0 +1,24 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.SignclosedProductInfo;
+
+/**
+ * 客诉-签收产品表Service
+ */
+public interface ComplaintSignclosedProductInfoService {
+    /**
+     * 添加单个签收产品记录
+     * @return
+     */
+    int insert(SignclosedProductInfo record);
+    /**
+     * 查询单个签收产品记录
+     * @return
+     */
+    SignclosedProductInfo getSignclosedById(Integer productId);
+    /**
+     * 修改单个签收产品记录
+     * @return
+     */
+    int updateSignclosedById(SignclosedProductInfo record);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintSmallClassInfoService.java

@@ -4,11 +4,30 @@ import com.iamberry.rst.core.cm.ComplaintSmallClassInfo;
 
 import java.util.List;
 
+/**
+ * 客诉-客诉小类Service
+ */
 public interface ComplaintSmallClassInfoService {
+    /**
+     * 添加单个客诉小类
+     * @return
+     */
+    int insert(ComplaintSmallClassInfo record);
+    /**
+     * 查询单个客诉小类
+     * @return
+     */
+    ComplaintSmallClassInfo getSmallClassById(Integer smallClassId);
+    /**
+     * 修改单个客诉小类
+     * @return
+     */
+    int updateSmallClassById(ComplaintSmallClassInfo record);
 
     /**
      * 查询所有客诉类型
      * @return
      */
     List<ComplaintSmallClassInfo> listComplaintSmallClassInfo(ComplaintSmallClassInfo complaintSmallClassInfo);
-}
+
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintTypeInfoService.java

@@ -5,11 +5,26 @@ import com.iamberry.rst.core.cm.ComplaintTypeInfo;
 import java.util.List;
 
 /**
- * 问题分类
+ * 客诉-客诉类型表Service
  */
 public interface ComplaintTypeInfoService {
+    /**
+     * 添加单个客诉类型
+     * @return
+     */
+    int insert(ComplaintTypeInfo record);
+    /**
+     * 查询单个客诉类型
+     * @return
+     */
+    ComplaintTypeInfo getTypeById(Integer complaintId);
+    /**
+     * 修改单个客诉类型
+     * @return
+     */
+    int updateTypeById(ComplaintTypeInfo record);
 
     /*查询问题分类*/
     List<ComplaintTypeInfo> listComplaintTypeInfo(ComplaintTypeInfo complaintTypeInfo);
 
-}
+}

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

@@ -0,0 +1,27 @@
+package com.iamberry.rst.service.cm;
+
+
+import com.iamberry.rst.core.cm.AwaitingSignclosedProductInfo;
+import com.iamberry.rst.faces.cm.AwaitingSignclosedProductInfoService;
+import com.iamberry.rst.service.cm.mapper.AwaitingSignclosedProductMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+@Service
+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 int updateById(AwaitingSignclosedProductInfo record) {
+        return awaitingSignclosedProductMapper.updateById(record);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintDetectInfoServiceImpl.java

@@ -0,0 +1,29 @@
+package com.iamberry.rst.service.cm;
+
+
+import com.iamberry.rst.core.cm.ComplaintDetectInfo;
+import com.iamberry.rst.faces.cm.ComplaintDetectInfoService;
+import com.iamberry.rst.service.cm.mapper.AwaitingSignclosedProductMapper;
+import com.iamberry.rst.service.cm.mapper.ComplaintDetectInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+@Service
+public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoService {
+    @Autowired
+    private ComplaintDetectInfoMapper complaintDetectInfoMapper;
+
+    @Override
+    public int insert(ComplaintDetectInfo record) {
+        return complaintDetectInfoMapper.insert(record);
+    }
+
+    @Override
+    public ComplaintDetectInfo getComplaintDetectById(Integer detectId) {
+        return complaintDetectInfoMapper.getComplaintDetectById(detectId);
+    }
+
+    @Override
+    public int updateComplaintDetectById(ComplaintDetectInfo record) {
+        return complaintDetectInfoMapper.updateComplaintDetectById(record);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintMaintenanceInfoServiceImpl.java

@@ -0,0 +1,32 @@
+package com.iamberry.rst.service.cm;
+
+
+import com.iamberry.rst.core.cm.ComplaintDetectInfo;
+import com.iamberry.rst.core.cm.ComplaintMaintenanceInfo;
+import com.iamberry.rst.faces.cm.ComplaintDetectInfoService;
+import com.iamberry.rst.faces.cm.ComplaintMaintenanceInfoService;
+import com.iamberry.rst.service.cm.mapper.ComplaintDetectInfoMapper;
+import com.iamberry.rst.service.cm.mapper.ComplaintMaintenanceInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ComplaintMaintenanceInfoServiceImpl implements ComplaintMaintenanceInfoService {
+    @Autowired
+    private ComplaintMaintenanceInfoMapper complaintMaintenanceInfoMapper;
+
+    @Override
+    public int insert(ComplaintMaintenanceInfo record) {
+        return complaintMaintenanceInfoMapper.insert(record);
+    }
+
+    @Override
+    public ComplaintMaintenanceInfo getMaintenanceByid(Integer maintenanceId) {
+        return complaintMaintenanceInfoMapper.getMaintenanceByid(maintenanceId);
+    }
+
+    @Override
+    public int updateMaintenanceById(ComplaintMaintenanceInfo record) {
+        return complaintMaintenanceInfoMapper.updateMaintenanceById(record);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintQuestionInfoServiceImpl.java

@@ -0,0 +1,32 @@
+package com.iamberry.rst.service.cm;
+
+
+import com.iamberry.rst.core.cm.ComplaintDetectInfo;
+import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
+import com.iamberry.rst.faces.cm.ComplaintDetectInfoService;
+import com.iamberry.rst.faces.cm.ComplaintQuestionInfoService;
+import com.iamberry.rst.service.cm.mapper.ComplaintDetectInfoMapper;
+import com.iamberry.rst.service.cm.mapper.ComplaintQuestionInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ComplaintQuestionInfoServiceImpl implements ComplaintQuestionInfoService {
+    @Autowired
+    private ComplaintQuestionInfoMapper complaintDetectInfoMapper;
+
+    @Override
+    public int insert(ComplaintQuestionInfo record) {
+        return complaintDetectInfoMapper.insert(record);
+    }
+
+    @Override
+    public ComplaintQuestionInfo getQuestionById(Integer questionId) {
+        return complaintDetectInfoMapper.getQuestionById(questionId);
+    }
+
+    @Override
+    public int updateQuestionById(ComplaintQuestionInfo record) {
+        return complaintDetectInfoMapper.updateQuestionById(record);
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.iamberry.rst.service.cm;
+
+
+import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
+import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
+import com.iamberry.rst.faces.cm.ComplaintQuestionInfoService;
+import com.iamberry.rst.faces.cm.ComplaintSignclosedInfoService;
+import com.iamberry.rst.service.cm.mapper.ComplaintQuestionInfoMapper;
+import com.iamberry.rst.service.cm.mapper.ComplaintSignclosedInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedInfoService {
+    @Autowired
+    private ComplaintSignclosedInfoMapper complaintSignclosedInfoMapper;
+
+
+    @Override
+    public int insert(ComplaintSignclosedInfo record) {
+        return complaintSignclosedInfoMapper.insert(record);
+    }
+
+    @Override
+    public ComplaintSignclosedInfo getSignclosedById(Integer signclosedId) {
+        return complaintSignclosedInfoMapper.getSignclosedById(signclosedId);
+    }
+
+    @Override
+    public int updateSignclosedById(ComplaintSignclosedInfo record) {
+        return complaintSignclosedInfoMapper.updateSignclosedById(record);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintSignclosedProductInfoServiceImpl.java

@@ -0,0 +1,33 @@
+package com.iamberry.rst.service.cm;
+
+
+import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
+import com.iamberry.rst.core.cm.SignclosedProductInfo;
+import com.iamberry.rst.faces.cm.ComplaintSignclosedInfoService;
+import com.iamberry.rst.faces.cm.ComplaintSignclosedProductInfoService;
+import com.iamberry.rst.service.cm.mapper.ComplaintSignclosedInfoMapper;
+import com.iamberry.rst.service.cm.mapper.ComplaintSignclosedProductInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ComplaintSignclosedProductInfoServiceImpl implements ComplaintSignclosedProductInfoService {
+    @Autowired
+    private ComplaintSignclosedProductInfoMapper complaintSignclosedProductInfoMapper;
+
+
+    @Override
+    public int insert(SignclosedProductInfo record) {
+        return complaintSignclosedProductInfoMapper.insert(record);
+    }
+
+    @Override
+    public SignclosedProductInfo getSignclosedById(Integer productId) {
+        return complaintSignclosedProductInfoMapper.getSignclosedById(productId);
+    }
+
+    @Override
+    public int updateSignclosedById(SignclosedProductInfo record) {
+        return complaintSignclosedProductInfoMapper.updateSignclosedById(record);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintSmallClassInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.iamberry.rst.service.cm;
 
+
 import com.iamberry.rst.core.cm.ComplaintSmallClassInfo;
 import com.iamberry.rst.faces.cm.ComplaintSmallClassInfoService;
 import com.iamberry.rst.service.cm.mapper.ComplaintSmallClassInfoMapper;
@@ -10,13 +11,27 @@ import java.util.List;
 
 @Service
 public class ComplaintSmallClassInfoServiceImpl implements ComplaintSmallClassInfoService {
-
     @Autowired
     private ComplaintSmallClassInfoMapper complaintSmallClassInfoMapper;
 
 
     @Override
+    public int insert(ComplaintSmallClassInfo record) {
+        return complaintSmallClassInfoMapper.insert(record);
+    }
+
+    @Override
+    public ComplaintSmallClassInfo getSmallClassById(Integer smallClassId) {
+        return complaintSmallClassInfoMapper.getSmallClassById(smallClassId);
+    }
+
+    @Override
+    public int updateSmallClassById(ComplaintSmallClassInfo record) {
+        return complaintSmallClassInfoMapper.updateSmallClassById(record);
+    }
+
+    @Override
     public List<ComplaintSmallClassInfo> listComplaintSmallClassInfo(ComplaintSmallClassInfo complaintSmallClassInfo) {
         return complaintSmallClassInfoMapper.listComplaintSmallClassInfo(complaintSmallClassInfo);
     }
-}
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintTypeInfoServiceImpl.java

@@ -1,7 +1,11 @@
 package com.iamberry.rst.service.cm;
 
+
+import com.iamberry.rst.core.cm.ComplaintSmallClassInfo;
 import com.iamberry.rst.core.cm.ComplaintTypeInfo;
+import com.iamberry.rst.faces.cm.ComplaintSmallClassInfoService;
 import com.iamberry.rst.faces.cm.ComplaintTypeInfoService;
+import com.iamberry.rst.service.cm.mapper.ComplaintSmallClassInfoMapper;
 import com.iamberry.rst.service.cm.mapper.ComplaintTypeInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -10,12 +14,27 @@ import java.util.List;
 
 @Service
 public class ComplaintTypeInfoServiceImpl implements ComplaintTypeInfoService {
-
     @Autowired
     private ComplaintTypeInfoMapper complaintTypeInfoMapper;
 
+
+    @Override
+    public int insert(ComplaintTypeInfo record) {
+        return complaintTypeInfoMapper.insert(record);
+    }
+
+    @Override
+    public ComplaintTypeInfo getTypeById(Integer complaintId) {
+        return complaintTypeInfoMapper.getTypeById(complaintId);
+    }
+
+    @Override
+    public int updateTypeById(ComplaintTypeInfo record) {
+        return complaintTypeInfoMapper.updateTypeById(record);
+    }
+
     @Override
     public List<ComplaintTypeInfo> listComplaintTypeInfo(ComplaintTypeInfo complaintTypeInfo) {
         return complaintTypeInfoMapper.listComplaintTypeInfo(complaintTypeInfo);
     }
-}
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/AwaitingSignclosedProductInfoMapper.java

@@ -4,7 +4,7 @@ import com.iamberry.rst.core.cm.AwaitingSignclosedProductInfo;
 /**
  * 客诉-待签收产品mapper
  */
-public interface AwaitingSignclosedProductInfoMapper {
+public interface AwaitingSignclosedProductMapper {
     /**
      * 添加单个待签收产品
      * @return

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/awaitingSignclosedProductInfoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.iamberry.rst.service.cm.mapper.AwaitingSignclosedProductInfoMapper" >
+<mapper namespace="com.iamberry.rst.service.cm.mapper.AwaitingSignclosedProductMapper" >
   <resultMap id="BaseResultMap" type="AwaitingSignclosedProductInfo" >
     <id column="product_id" property="productId" jdbcType="INTEGER" />
     <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -108,7 +108,7 @@
 		<mapper resource="com/iamberry/rst/service/pts/mapper/ptsBatchMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/pts/mapper/ptsSalesCompanyMapper.xml"/>
 
-		<mapper resource="com/iamberry/rst/service/cm/mapper/awaitingSignclosedProductInfoMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/cm/mapper/awaitingSignclosedProductMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/cm/mapper/backGoodsMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/cm/mapper/closedFittingMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/cm/mapper/closedProdcueMapper.xml"/>