Merge branch 'develop'

iamberry-app-interface/src/main/java/com/iamberry/app/face/UserService.java

@@ -149,13 +149,8 @@ public interface UserService {
 	 * @return User Information
 	 */
 	public User selectUserByUsername(String username);
-<<<<<<< .mine
 
-||||||| .r5272
-	
 	public List<User> getAll(int start, int end);
-=======
-	
+
 	/*public List<User> getAll(int start, int end);*/
->>>>>>> .r5562
 }

iamberry-app-interface/src/main/java/com/iamberry/app/face/UserService.java.mine

@@ -1,153 +0,0 @@
-package com.iamberry.app.face;
-
-import java.util.List;
-
-import com.iamberry.app.core.dto.RemoteIpInfoDTO;
-import com.iamberry.app.core.dto.UserDTO;
-import com.iamberry.app.core.entity.User;
-
-/**
- * UserService
- *
- * @author Moon Cheng
- * @date 2016年3月23日 上午11:33:29
- */
-
-public interface UserService {
-	
-	
-	public User validateUserToken(String token);
-
-	/**
-	 * register
-	 *
-	 * @author Moon Cheng
-	 * @param phone
-	 * @param password
-	 * @return User Information
-	 */
-	public User register(String phone, String password, String ip) ;
-
-	/**
-	 * thirdPartBindingPhone
-	 *
-	 * @param phone
-	 * @param openId
-	 * @return
-	 */
-	public User thirdPartBindingPhone(String phone, String openId) ;
-	/**
-	 * findById
-	 *
-	 * @param id
-	 * @return User
-	 */
-	public User findById(Long id);
-
-	/**
-	 * login
-	 *
-	 * @param phone
-	 * @param password
-	 * @param userAgent
-	 * @return
-	 */
-	public Object login(String phone, String password) ;
-
-	/**
-	 * thirdPartLogin
-	 *
-	 * @param openId
-	 * @param extType
-	 * @param extName
-	 * @param extPicture
-	 * @return
-	 */
-	public User thirdPartLogin(String openId, String extType, String extName, String extPicture, String ip) ;
-
-	/**
-	 * updateUserInfo
-	 *
-	 * @param user
-	 * @param token
-	 * @return
-	 */
-	public User updateUserInfo(User user, String token) ;
-
-	/**
-	 * updateDisplayPicture
-	 *
-	 * @author Moon Cheng
-	 * @param base64
-	 * @param token
-	 * @return
-	 */
-	public String updateDisplayPicture(String base64, String token) ;
-	/**
-	 * changePhone
-	 *
-	 * @author Moon Cheng
-	 * @param phone
-	 * @param token
-	 * @return
-	 */
-	public User changePhone(String phone, String token) ;
-	/**
-	 * resetPassWord
-	 *
-	 * @param oldPassword
-	 * @param newPassword
-	 * @param token
-	 * @return
-	 */
-	public int changePassword(String oldPassword, String newPassword, String token) ;
-	/**
-	 * changePassWord
-	 *
-	 * @param username,
-	 *            newPassword
-	 * @param session
-	 * @return int
-	 */
-	public int resetPassWord(String username, String newPassword) ;
-
-	public UserDTO tuyaConnect(User user) ;
-
-	/**
-	 * getStartPage
-	 *
-	 * @return String
-	 */
-	public String getStartPage() ;
-	/**
-	 * getLocation
-	 *
-	 * @param ip
-	 * @return String
-	 */
-	public RemoteIpInfoDTO getLocation(String ip) ;
-
-	/**
-	 * getApkVersion
-	 *
-	 * @return
-	 */
-	public String getApkVersion();
-	
-	/**
-	 * selectUserAvator
-	 *
-	 * @param id
-	 * @return String
-	 */
-	public String selectUserAvator(Long id);
-	
-	/**
-	 * selectUserByUsername
-	 *
-	 * @param username
-	 * @return User Information
-	 */
-	public User selectUserByUsername(String username);
-
-}

iamberry-app-interface/src/main/java/com/iamberry/app/face/UserService.java.r5272

@@ -1,154 +0,0 @@
-package com.iamberry.app.face;
-
-import java.util.List;
-
-import com.iamberry.app.core.dto.RemoteIpInfoDTO;
-import com.iamberry.app.core.dto.UserDTO;
-import com.iamberry.app.core.entity.User;
-
-/**
- * UserService
- *
- * @author Moon Cheng
- * @date 2016年3月23日 上午11:33:29
- */
-
-public interface UserService {
-	
-	
-	public User validateUserToken(String token);
-
-	/**
-	 * register
-	 *
-	 * @author Moon Cheng
-	 * @param phone
-	 * @param password
-	 * @return User Information
-	 */
-	public User register(String phone, String password, String ip) ;
-
-	/**
-	 * thirdPartBindingPhone
-	 *
-	 * @param phone
-	 * @param openId
-	 * @return
-	 */
-	public User thirdPartBindingPhone(String phone, String openId) ;
-	/**
-	 * findById
-	 *
-	 * @param id
-	 * @return User
-	 */
-	public User findById(Long id);
-
-	/**
-	 * login
-	 *
-	 * @param phone
-	 * @param password
-	 * @param userAgent
-	 * @return
-	 */
-	public Object login(String phone, String password) ;
-
-	/**
-	 * thirdPartLogin
-	 *
-	 * @param openId
-	 * @param extType
-	 * @param extName
-	 * @param extPicture
-	 * @return
-	 */
-	public User thirdPartLogin(String openId, String extType, String extName, String extPicture, String ip) ;
-
-	/**
-	 * updateUserInfo
-	 *
-	 * @param user
-	 * @param token
-	 * @return
-	 */
-	public User updateUserInfo(User user, String token) ;
-
-	/**
-	 * updateDisplayPicture
-	 *
-	 * @author Moon Cheng
-	 * @param base64
-	 * @param token
-	 * @return
-	 */
-	public String updateDisplayPicture(String base64, String token) ;
-	/**
-	 * changePhone
-	 *
-	 * @author Moon Cheng
-	 * @param phone
-	 * @param token
-	 * @return
-	 */
-	public User changePhone(String phone, String token) ;
-	/**
-	 * resetPassWord
-	 *
-	 * @param oldPassword
-	 * @param newPassword
-	 * @param token
-	 * @return
-	 */
-	public int changePassword(String oldPassword, String newPassword, String token) ;
-	/**
-	 * changePassWord
-	 *
-	 * @param username,
-	 *            newPassword
-	 * @param session
-	 * @return int
-	 */
-	public int resetPassWord(String username, String newPassword) ;
-
-	public UserDTO tuyaConnect(User user) ;
-
-	/**
-	 * getStartPage
-	 *
-	 * @return String
-	 */
-	public String getStartPage() ;
-	/**
-	 * getLocation
-	 *
-	 * @param ip
-	 * @return String
-	 */
-	public RemoteIpInfoDTO getLocation(String ip) ;
-
-	/**
-	 * getApkVersion
-	 *
-	 * @return
-	 */
-	public String getApkVersion();
-	
-	/**
-	 * selectUserAvator
-	 *
-	 * @param id
-	 * @return String
-	 */
-	public String selectUserAvator(Long id);
-	
-	/**
-	 * selectUserByUsername
-	 *
-	 * @param username
-	 * @return User Information
-	 */
-	public User selectUserByUsername(String username);
-	
-	public List<User> getAll(int start, int end);
-}

iamberry-app-interface/src/main/java/com/iamberry/app/face/UserService.java.r5562

@@ -1,154 +0,0 @@
-package com.iamberry.app.face;
-
-import java.util.List;
-
-import com.iamberry.app.core.dto.RemoteIpInfoDTO;
-import com.iamberry.app.core.dto.UserDTO;
-import com.iamberry.app.core.entity.User;
-
-/**
- * UserService
- *
- * @author Moon Cheng
- * @date 2016年3月23日 上午11:33:29
- */
-
-public interface UserService {
-	
-	
-	public User validateUserToken(String token);
-
-	/**
-	 * register
-	 *
-	 * @author Moon Cheng
-	 * @param phone
-	 * @param password
-	 * @return User Information
-	 */
-	public User register(String phone, String password, String ip) ;
-
-	/**
-	 * thirdPartBindingPhone
-	 *
-	 * @param phone
-	 * @param openId
-	 * @return
-	 */
-	public User thirdPartBindingPhone(String phone, String openId) ;
-	/**
-	 * findById
-	 *
-	 * @param id
-	 * @return User
-	 */
-	public User findById(Long id);
-
-	/**
-	 * login
-	 *
-	 * @param phone
-	 * @param password
-	 * @param userAgent
-	 * @return
-	 */
-	public Object login(String phone, String password) ;
-
-	/**
-	 * thirdPartLogin
-	 *
-	 * @param openId
-	 * @param extType
-	 * @param extName
-	 * @param extPicture
-	 * @return
-	 */
-	public User thirdPartLogin(String openId, String extType, String extName, String extPicture, String ip) ;
-
-	/**
-	 * updateUserInfo
-	 *
-	 * @param user
-	 * @param token
-	 * @return
-	 */
-	public User updateUserInfo(User user, String token) ;
-
-	/**
-	 * updateDisplayPicture
-	 *
-	 * @author Moon Cheng
-	 * @param base64
-	 * @param token
-	 * @return
-	 */
-	public String updateDisplayPicture(String base64, String token) ;
-	/**
-	 * changePhone
-	 *
-	 * @author Moon Cheng
-	 * @param phone
-	 * @param token
-	 * @return
-	 */
-	public User changePhone(String phone, String token) ;
-	/**
-	 * resetPassWord
-	 *
-	 * @param oldPassword
-	 * @param newPassword
-	 * @param token
-	 * @return
-	 */
-	public int changePassword(String oldPassword, String newPassword, String token) ;
-	/**
-	 * changePassWord
-	 *
-	 * @param username,
-	 *            newPassword
-	 * @param session
-	 * @return int
-	 */
-	public int resetPassWord(String username, String newPassword) ;
-
-	public UserDTO tuyaConnect(User user) ;
-
-	/**
-	 * getStartPage
-	 *
-	 * @return String
-	 */
-	public String getStartPage() ;
-	/**
-	 * getLocation
-	 *
-	 * @param ip
-	 * @return String
-	 */
-	public RemoteIpInfoDTO getLocation(String ip) ;
-
-	/**
-	 * getApkVersion
-	 *
-	 * @return
-	 */
-	public String getApkVersion();
-	
-	/**
-	 * selectUserAvator
-	 *
-	 * @param id
-	 * @return String
-	 */
-	public String selectUserAvator(Long id);
-	
-	/**
-	 * selectUserByUsername
-	 *
-	 * @param username
-	 * @return User Information
-	 */
-	public User selectUserByUsername(String username);
-	
-	/*public List<User> getAll(int start, int end);*/
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/BackGoods.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.core.cm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ClosedProdcue.java

@@ -38,10 +38,12 @@ public class ClosedProdcue  implements Serializable {
         this.closedProductName = closedProductName;
     }
 
+    @Deprecated
     public Integer getClosedProdcueType() {
         return closedProdcueType;
     }
 
+    @Deprecated
     public void setClosedProdcueType(Integer closedProdcueType) {
         this.closedProdcueType = closedProdcueType;
     }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/CmRelation.java

@@ -0,0 +1,386 @@
+package com.iamberry.rst.core.cm;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.ArrayList;
+import  java.util.Date;
+import  java.io.Serializable;
+import java.util.List;
+
+/**
+ *  售后处理类
+ * @author
+ * @Date 2018-12-28
+ */
+public class CmRelation implements  Serializable{
+    private static final long serialVersionUID = 8181376563638802640L;
+    //处理主键
+    private Integer relationId;
+    //
+    private Integer procMethodId;
+    //客诉基本信息主键
+    private Integer customerId;
+    //仓储任务(签收id)
+    private Integer signclosedId;
+    //售后生成订单的交易号
+    private String relationBackEfastOrderId;
+    //寄回状态 1：未寄回 2：已寄回 3：已收货 4: 已签收待确认
+    private Integer relationBackStatus;
+    //寄回人姓名
+    private String relationBackName;
+    //寄回人电话
+    private String relationBackTel;
+    //寄回物流公司
+    private String relationBackLogisticsCompany;
+    //寄回物流单号
+    private String relationBackLogisticsNo;
+    //寄回邮费 单位为分
+    private Integer relationBackPostage;
+    //寄回机器编号
+    private String relationBackMachineNo;
+    //寄送状态 1：未寄送 2：已寄送 3：已收货
+    private Integer relationSendStatus;
+    //寄送人姓名
+    private String relationSendName;
+    //寄送人电话
+    private String relationSendTel;
+    //寄送地址-省
+    private Integer provinceNumber;
+    //寄送地址-市
+    private Integer cityNumber;
+    //寄送地址-区
+    private Integer areaNumber;
+    //寄送地址-省市区
+    private String relationSendMergeAddress;
+    //寄送地址-详细地址
+    private String relationSendAddress;
+    //寄送物流公司
+    private String relationSendLogisticsCompany;
+    //寄送物流单号
+    private String relationSendLogisticsNo;
+    //备注
+    private String relationDesc;
+    //状态 1：使用中 2：停用中
+    private Integer relationState;
+    //转账账户
+    private String relationAlipay;
+    //是否已转账邮费 0:不需要 1:已转 2:已申请待转 3:未申请
+    private Integer relationIsTransfer;
+    //转账账户姓名
+    private String relationAlipayName;
+    //签收日期
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date relationBackReceiptDate;
+    //工厂维修报价
+    private Integer relationFactoryCosts;
+    //客户报价
+    private Integer relationCustomerCosts;
+    //创建时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date relationCreateTime;
+    //修改时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date relationUpdateTime;
+
+    //售后寄出产品表
+    private List<SendProdcue> sendProdcues = new ArrayList<SendProdcue>();
+    //售后寄回产品表
+    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();
+
+    /*订单关联集合*/
+    private List<RelationOrder> relationOrderList = new ArrayList<>();
+    /*订单集合*/
+    private List<SalesOrder> salesOrderList = new ArrayList<>();
+
+    public Integer getRelationId(){
+        return relationId;
+    }
+
+    public void setRelationId(Integer  relationId){
+        this.relationId=relationId;
+    }
+
+    public Integer getProcMethodId(){
+        return procMethodId;
+    }
+
+    public void setProcMethodId(Integer  procMethodId){
+        this.procMethodId=procMethodId;
+    }
+
+    public Integer getCustomerId(){
+        return customerId;
+    }
+
+    public void setCustomerId(Integer  customerId){
+        this.customerId=customerId;
+    }
+
+    public Integer getSignclosedId(){
+        return signclosedId;
+    }
+
+    public void setSignclosedId(Integer  signclosedId){
+        this.signclosedId=signclosedId;
+    }
+
+    public String getRelationBackEfastOrderId(){
+        return relationBackEfastOrderId;
+    }
+
+    public void setRelationBackEfastOrderId(String  relationBackEfastOrderId){
+        this.relationBackEfastOrderId=relationBackEfastOrderId;
+    }
+
+    public Integer getRelationBackStatus(){
+        return relationBackStatus;
+    }
+
+    public void setRelationBackStatus(Integer  relationBackStatus){
+        this.relationBackStatus=relationBackStatus;
+    }
+
+    public String getRelationBackName(){
+        return relationBackName;
+    }
+
+    public void setRelationBackName(String  relationBackName){
+        this.relationBackName=relationBackName;
+    }
+
+    public String getRelationBackTel(){
+        return relationBackTel;
+    }
+
+    public void setRelationBackTel(String  relationBackTel){
+        this.relationBackTel=relationBackTel;
+    }
+
+    public String getRelationBackLogisticsCompany(){
+        return relationBackLogisticsCompany;
+    }
+
+    public void setRelationBackLogisticsCompany(String  relationBackLogisticsCompany){
+        this.relationBackLogisticsCompany=relationBackLogisticsCompany;
+    }
+
+    public String getRelationBackLogisticsNo(){
+        return relationBackLogisticsNo;
+    }
+
+    public void setRelationBackLogisticsNo(String  relationBackLogisticsNo){
+        this.relationBackLogisticsNo=relationBackLogisticsNo;
+    }
+
+    public Integer getRelationBackPostage(){
+        return relationBackPostage;
+    }
+
+    public void setRelationBackPostage(Integer  relationBackPostage){
+        this.relationBackPostage=relationBackPostage;
+    }
+
+    public String getRelationBackMachineNo(){
+        return relationBackMachineNo;
+    }
+
+    public void setRelationBackMachineNo(String  relationBackMachineNo){
+        this.relationBackMachineNo=relationBackMachineNo;
+    }
+
+    public Integer getRelationSendStatus(){
+        return relationSendStatus;
+    }
+
+    public void setRelationSendStatus(Integer  relationSendStatus){
+        this.relationSendStatus=relationSendStatus;
+    }
+
+    public String getRelationSendName(){
+        return relationSendName;
+    }
+
+    public void setRelationSendName(String  relationSendName){
+        this.relationSendName=relationSendName;
+    }
+
+    public String getRelationSendTel(){
+        return relationSendTel;
+    }
+
+    public void setRelationSendTel(String  relationSendTel){
+        this.relationSendTel=relationSendTel;
+    }
+
+    public Integer getProvinceNumber(){
+        return provinceNumber;
+    }
+
+    public void setProvinceNumber(Integer  provinceNumber){
+        this.provinceNumber=provinceNumber;
+    }
+
+    public Integer getCityNumber(){
+        return cityNumber;
+    }
+
+    public void setCityNumber(Integer  cityNumber){
+        this.cityNumber=cityNumber;
+    }
+
+    public Integer getAreaNumber(){
+        return areaNumber;
+    }
+
+    public void setAreaNumber(Integer  areaNumber){
+        this.areaNumber=areaNumber;
+    }
+
+    public String getRelationSendMergeAddress(){
+        return relationSendMergeAddress;
+    }
+
+    public void setRelationSendMergeAddress(String  relationSendMergeAddress){
+        this.relationSendMergeAddress=relationSendMergeAddress;
+    }
+
+    public String getRelationSendAddress(){
+        return relationSendAddress;
+    }
+
+    public void setRelationSendAddress(String  relationSendAddress){
+        this.relationSendAddress=relationSendAddress;
+    }
+
+    public String getRelationSendLogisticsCompany(){
+        return relationSendLogisticsCompany;
+    }
+
+    public void setRelationSendLogisticsCompany(String  relationSendLogisticsCompany){
+        this.relationSendLogisticsCompany=relationSendLogisticsCompany;
+    }
+
+    public String getRelationSendLogisticsNo(){
+        return relationSendLogisticsNo;
+    }
+
+    public void setRelationSendLogisticsNo(String  relationSendLogisticsNo){
+        this.relationSendLogisticsNo=relationSendLogisticsNo;
+    }
+
+    public String getRelationDesc(){
+        return relationDesc;
+    }
+
+    public void setRelationDesc(String  relationDesc){
+        this.relationDesc=relationDesc;
+    }
+
+    public Integer getRelationState(){
+        return relationState;
+    }
+
+    public void setRelationState(Integer  relationState){
+        this.relationState=relationState;
+    }
+
+    public String getRelationAlipay(){
+        return relationAlipay;
+    }
+
+    public void setRelationAlipay(String  relationAlipay){
+        this.relationAlipay=relationAlipay;
+    }
+
+    public Integer getRelationIsTransfer(){
+        return relationIsTransfer;
+    }
+
+    public void setRelationIsTransfer(Integer  relationIsTransfer){
+        this.relationIsTransfer=relationIsTransfer;
+    }
+
+    public String getRelationAlipayName(){
+        return relationAlipayName;
+    }
+
+    public void setRelationAlipayName(String  relationAlipayName){
+        this.relationAlipayName=relationAlipayName;
+    }
+
+    public Date getRelationBackReceiptDate(){
+        return relationBackReceiptDate;
+    }
+
+    public void setRelationBackReceiptDate(Date  relationBackReceiptDate){
+        this.relationBackReceiptDate=relationBackReceiptDate;
+    }
+
+    public Integer getRelationFactoryCosts(){
+        return relationFactoryCosts;
+    }
+
+    public void setRelationFactoryCosts(Integer  relationFactoryCosts){
+        this.relationFactoryCosts=relationFactoryCosts;
+    }
+
+    public Integer getRelationCustomerCosts(){
+        return relationCustomerCosts;
+    }
+
+    public void setRelationCustomerCosts(Integer  relationCustomerCosts){
+        this.relationCustomerCosts=relationCustomerCosts;
+    }
+
+    public Date getRelationCreateTime(){
+        return relationCreateTime;
+    }
+
+    public void setRelationCreateTime(Date  relationCreateTime){
+        this.relationCreateTime=relationCreateTime;
+    }
+
+    public Date getRelationUpdateTime(){
+        return relationUpdateTime;
+    }
+
+    public void setRelationUpdateTime(Date  relationUpdateTime){
+        this.relationUpdateTime=relationUpdateTime;
+    }
+
+    public List<SendProdcue> getSendProdcues() {
+        return sendProdcues;
+    }
+
+    public void setSendProdcues(List<SendProdcue> sendProdcues) {
+        this.sendProdcues = sendProdcues;
+    }
+
+    public List<ClosedProdcue> getClosedProdcues() {
+        return closedProdcues;
+    }
+
+    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
+        this.closedProdcues = closedProdcues;
+    }
+
+    public List<RelationOrder> getRelationOrderList() {
+        return relationOrderList;
+    }
+
+    public void setRelationOrderList(List<RelationOrder> relationOrderList) {
+        this.relationOrderList = relationOrderList;
+    }
+
+    public List<SalesOrder> getSalesOrderList() {
+        return salesOrderList;
+    }
+
+    public void setSalesOrderList(List<SalesOrder> salesOrderList) {
+        this.salesOrderList = salesOrderList;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintTypeInfo.java

@@ -1,5 +1,7 @@
 package com.iamberry.rst.core.cm;
 
+import com.iamberry.rst.core.fm.ComplaintSmallClassInfo;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/CustomerInfo.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.core.cm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -37,7 +38,7 @@ public class CustomerInfo  implements Serializable {
     private String customerTel;
     // 微信昵称
     private String customerWechatName;
-    //  处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
+    //  处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货     客诉修改 --> 不维护此字段
     private Integer customerIsSolve;
     //  是否需要回访  1:不需要回访  2:需要回复 
     private String customerIsVisit;
@@ -128,8 +129,11 @@ public class CustomerInfo  implements Serializable {
 
     private Visit visit = new Visit();  //回访类
 
+    @Deprecated
     private CustomerCommon customerCommon = new CustomerCommon(); //处理结果综合  公共类
 
+    private CmRelation cmRelation = new CmRelation();
+
     private String transactionNumber;     //外部交易号，订单id
     private Integer isAddOrder;      //1:原来就有订单  2：需要新添加订单
     //QC质检集合
@@ -148,6 +152,17 @@ public class CustomerInfo  implements Serializable {
     private Integer customerLastId;//上次客诉id
     private Integer customerInitialId;//初始客诉id
 
+    private Integer procTypeId; //处理方式类型id
+    private Integer procMethodId; //处理方式id
+    private String procTypeName; //处理方式类型名称
+    private String procMethodName; //处理方式名称
+    private Integer procMethodIsBack; //处理方式名称1:需要寄回 2:不需要寄回
+    private Integer procMethodIsSend; //处理方式名称1:需要寄出 2:不需要寄出
+
+
+    private String customerProvinceId;    //省
+    private String customerCityId;    //市
+    private String customerDistrictId;    //区
 
     public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
         this.complaintDetectList = complaintDetectList;
@@ -428,7 +443,6 @@ public class CustomerInfo  implements Serializable {
     public Integer getCustomerIsSolve() {
         return customerIsSolve;
     }
-
     public void setCustomerIsSolve(Integer customerIsSolve) {
         this.customerIsSolve = customerIsSolve;
     }
@@ -497,10 +511,20 @@ public class CustomerInfo  implements Serializable {
         this.visit = visit;
     }
 
+    /**
+     * 请使用 getCmRelation
+     * @param
+     */
+    @Deprecated
     public CustomerCommon getCustomerCommon() {
         return customerCommon;
     }
 
+    /**
+     * 请使用 setCmRelation
+     * @param customerCommon
+     */
+    @Deprecated
     public void setCustomerCommon(CustomerCommon customerCommon) {
         this.customerCommon = customerCommon;
     }
@@ -705,6 +729,15 @@ public class CustomerInfo  implements Serializable {
 //        this.isQuality = isQuality;
 //    }
 
+
+    public CmRelation getCmRelation() {
+        return cmRelation;
+    }
+
+    public void setCmRelation(CmRelation cmRelation) {
+        this.cmRelation = cmRelation;
+    }
+
     public Integer getFactoryId() {
         return factoryId;
     }
@@ -712,4 +745,76 @@ public class CustomerInfo  implements Serializable {
     public void setFactoryId(Integer factoryId) {
         this.factoryId = factoryId;
     }
+
+    public Integer getProcTypeId() {
+        return procTypeId;
+    }
+
+    public void setProcTypeId(Integer procTypeId) {
+        this.procTypeId = procTypeId;
+    }
+
+    public Integer getProcMethodId() {
+        return procMethodId;
+    }
+
+    public void setProcMethodId(Integer procMethodId) {
+        this.procMethodId = procMethodId;
+    }
+
+    public String getProcTypeName() {
+        return procTypeName;
+    }
+
+    public void setProcTypeName(String procTypeName) {
+        this.procTypeName = procTypeName;
+    }
+
+    public String getProcMethodName() {
+        return procMethodName;
+    }
+
+    public void setProcMethodName(String procMethodName) {
+        this.procMethodName = procMethodName;
+    }
+
+    public Integer getProcMethodIsBack() {
+        return procMethodIsBack;
+    }
+
+    public void setProcMethodIsBack(Integer procMethodIsBack) {
+        this.procMethodIsBack = procMethodIsBack;
+    }
+
+    public Integer getProcMethodIsSend() {
+        return procMethodIsSend;
+    }
+
+    public void setProcMethodIsSend(Integer procMethodIsSend) {
+        this.procMethodIsSend = procMethodIsSend;
+    }
+
+    public String getCustomerProvinceId() {
+        return customerProvinceId;
+    }
+
+    public void setCustomerProvinceId(String customerProvinceId) {
+        this.customerProvinceId = customerProvinceId;
+    }
+
+    public String getCustomerCityId() {
+        return customerCityId;
+    }
+
+    public void setCustomerCityId(String customerCityId) {
+        this.customerCityId = customerCityId;
+    }
+
+    public String getCustomerDistrictId() {
+        return customerDistrictId;
+    }
+
+    public void setCustomerDistrictId(String customerDistrictId) {
+        this.customerDistrictId = customerDistrictId;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/NoreasonBack.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.core.cm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ProcMethod.java

@@ -0,0 +1,102 @@
+package com.iamberry.rst.core.cm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  处理方式类
+ * @author Administrator
+ * @Date 2018-12-29
+ */
+public class ProcMethod  implements  Serializable{
+    private static final long serialVersionUID = 5459213798616020261L;
+    //处理方式id
+    private Integer procMethodId;
+    //处理方式类型id
+    private Integer procTypeId;
+    //处理方式名称
+    private String procMethodName;
+    //处理方式状态 1：使用中 2：未使用
+    private Integer procMethodStatus;
+    //处理方式描述
+    private String procMethodDesc;
+    //是否需要寄回 1:需要寄回 2:不需要寄回
+    private Integer procMethodIsBack;
+    //是否需要寄出 1:需要寄出 2:不需要寄出
+    private Integer procMethodIsSend;
+    //处理方式创建时间
+    private Date procMethodCreateTime;
+    //处理方式修改时间'
+    private Date procMethodUpdateTime;
+
+    public Integer getProcMethodId(){
+        return procMethodId;
+    }
+
+    public void setProcMethodId(Integer  procMethodId){
+        this.procMethodId=procMethodId;
+    }
+
+    public Integer getProcTypeId(){
+        return procTypeId;
+    }
+
+    public void setProcTypeId(Integer  procTypeId){
+        this.procTypeId=procTypeId;
+    }
+
+    public String getProcMethodName(){
+        return procMethodName;
+    }
+
+    public void setProcMethodName(String  procMethodName){
+        this.procMethodName=procMethodName;
+    }
+
+    public Integer getProcMethodStatus(){
+        return procMethodStatus;
+    }
+
+    public void setProcMethodStatus(Integer  procMethodStatus){
+        this.procMethodStatus=procMethodStatus;
+    }
+
+    public String getProcMethodDesc(){
+        return procMethodDesc;
+    }
+
+    public void setProcMethodDesc(String  procMethodDesc){
+        this.procMethodDesc=procMethodDesc;
+    }
+
+    public Integer getProcMethodIsBack(){
+        return procMethodIsBack;
+    }
+
+    public void setProcMethodIsBack(Integer  procMethodIsBack){
+        this.procMethodIsBack=procMethodIsBack;
+    }
+
+    public Integer getProcMethodIsSend(){
+        return procMethodIsSend;
+    }
+
+    public void setProcMethodIsSend(Integer  procMethodIsSend){
+        this.procMethodIsSend=procMethodIsSend;
+    }
+
+    public Date getProcMethodCreateTime(){
+        return procMethodCreateTime;
+    }
+
+    public void setProcMethodCreateTime(Date  procMethodCreateTime){
+        this.procMethodCreateTime=procMethodCreateTime;
+    }
+
+    public Date getProcMethodUpdateTime(){
+        return procMethodUpdateTime;
+    }
+
+    public void setProcMethodUpdateTime(Date  procMethodUpdateTime){
+        this.procMethodUpdateTime=procMethodUpdateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ProcType.java

@@ -0,0 +1,82 @@
+package com.iamberry.rst.core.cm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  处理方式类型类
+ * @author
+ * @Date 2018-12-28
+ */
+public class ProcType  implements  Serializable{
+    private static final long serialVersionUID = -3615790458273614264L;
+    //处理方式类型主键
+    private Integer procTypeId;
+    //处理方式类型名称
+    private String procTypeName;
+    //是否为售前  1:是  2:不是
+    private Integer procTypeSaleStatus;
+    //处理方式状态 1：使用中 2：未使用
+    private Integer procTypeStatus;
+    //处理方式描述
+    private String procTypeDesc;
+    //处理方式创建时间
+    private Date procTypeCreateTime;
+    //处理方式修改时间'
+    private Date procTypeUpdateTime;
+
+    public Integer getProcTypeId(){
+        return procTypeId;
+    }
+
+    public void setProcTypeId(Integer  procTypeId){
+        this.procTypeId=procTypeId;
+    }
+
+    public String getProcTypeName(){
+        return procTypeName;
+    }
+
+    public void setProcTypeName(String  procTypeName){
+        this.procTypeName=procTypeName;
+    }
+
+    public Integer getProcTypeStatus(){
+        return procTypeStatus;
+    }
+
+    public void setProcTypeStatus(Integer  procTypeStatus){
+        this.procTypeStatus=procTypeStatus;
+    }
+
+    public String getProcTypeDesc(){
+        return procTypeDesc;
+    }
+
+    public void setProcTypeDesc(String  procTypeDesc){
+        this.procTypeDesc=procTypeDesc;
+    }
+
+    public Date getProcTypeCreateTime(){
+        return procTypeCreateTime;
+    }
+
+    public void setProcTypeCreateTime(Date  procTypeCreateTime){
+        this.procTypeCreateTime=procTypeCreateTime;
+    }
+
+    public Date getProcTypeUpdateTime(){
+        return procTypeUpdateTime;
+    }
+
+    public void setProcTypeUpdateTime(Date  procTypeUpdateTime){
+        this.procTypeUpdateTime=procTypeUpdateTime;
+    }
+
+    public Integer getProcTypeSaleStatus() {
+        return procTypeSaleStatus;
+    }
+
+    public void setProcTypeSaleStatus(Integer procTypeSaleStatus) {
+        this.procTypeSaleStatus = procTypeSaleStatus;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/RelationOrder.java

@@ -27,10 +27,12 @@ public class RelationOrder  implements  Serializable{
         this.relationOrderId=relationOrderId;
     }
 
+    @Deprecated
     public Integer getRelationType(){
         return relationType;
     }
 
+    @Deprecated
     public void setRelationType(Integer  relationType){
         this.relationType=relationType;
     }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/Renewed.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.core.cm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/Repair.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.core.cm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -57,7 +57,7 @@ public class SalesOrder implements Serializable {
     private Integer salesCompanyId;         //销售公司id
     private Integer salesType;              //订单类型  1：购买2：租赁
     private String salesDealCode;           //交易号
-    private Integer salesOrderStatus;       //订单状态 订单状态：1：正常 2：换货 3：退货  4:维修  5：补发
+    private Integer salesOrderStatus;       //订单状态 订单状态：1：正常 2：换货 3：退货  4:维修  5：补发 -- TODO: 2019/1/4 改为 ProcTypeId
     private Integer salesShippingStatus;    //发货状态 0(未发货)1(已发货,即已扫描出库)3(备货中)4（收货） 11(已通知配货，后加)
     private Integer salesDeliver;            //出库状态  1：未出库   2：已出库
     private Date salesDeliverTime;            //出库时间
@@ -122,10 +122,10 @@ public class SalesOrder implements Serializable {
 
     private Date salesDistributionTime;//通知配货时间
 
-    private Integer salesWarehouseId;//所属仓库id
-
-    public Integer getStartOrderNO() {
-        return startOrderNO;
+    private String procTypeName;//通知配货时间
+   private Integer salesWarehouseId;//所属仓库id
+ public Integer getStartOrderNO() {
+       return startOrderNO;
     }
 
     public void setStartOrderNO(Integer startOrderNO) {
@@ -716,11 +716,19 @@ public class SalesOrder implements Serializable {
         this.isSelectCustomer = isSelectCustomer;
     }
 
-    public Integer getSalesWarehouseId() {
+    public String getProcTypeName() {
+        return procTypeName;
+    }
+
+    public void setProcTypeName(String procTypeName) {
+        this.procTypeName = procTypeName;
+    }
+  public Integer getSalesWarehouseId() {
         return salesWarehouseId;
     }
 
     public void setSalesWarehouseId(Integer salesWarehouseId) {
         this.salesWarehouseId = salesWarehouseId;
     }
+
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SendProdcue.java

@@ -17,6 +17,7 @@ public class SendProdcue  implements Serializable {
 
     private Integer sendProdcueNumber;      //产品数量
 
+    @Deprecated
     private Integer sendProduceType;    //售后类型  3：换新;4：维修;5：补发;6：退货;7：无理由退货
 
     private String sendProduceName; //产品名称
@@ -29,6 +30,8 @@ public class SendProdcue  implements Serializable {
 
     private String colorBar;        //69码
 
+    private String sendProdcueMachineNo;      //机器编码
+
     public String getSendProduceName() {
         return sendProduceName;
     }
@@ -37,10 +40,12 @@ public class SendProdcue  implements Serializable {
         this.sendProduceName = sendProduceName;
     }
 
+    @Deprecated
     public Integer getSendProduceType() {
         return sendProduceType;
     }
 
+    @Deprecated
     public void setSendProduceType(Integer sendProduceType) {
         this.sendProduceType = sendProduceType;
     }
@@ -125,4 +130,12 @@ public class SendProdcue  implements Serializable {
     public void setColorBar(String colorBar) {
         this.colorBar = colorBar;
     }
+
+    public String getSendProdcueMachineNo() {
+        return sendProdcueMachineNo;
+    }
+
+    public void setSendProdcueMachineNo(String sendProdcueMachineNo) {
+        this.sendProdcueMachineNo = sendProdcueMachineNo;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/StoreShip.java

@@ -3,7 +3,7 @@ package com.iamberry.rst.core.cm;
 import  java.util.Date;
 import  java.io.Serializable;
 /**
- *  类
+ *
  * @author ljk
  * @Date 2018-09-13
  */

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/AwaitingSignclosedProductInfo.java

@@ -1,114 +1,114 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 客诉-待签收产品表
- * @author LJK
- * @company 深圳爱贝源科技有限公司
- * @date 2017/6/22 16:05
- */
-public class AwaitingSignclosedProductInfo implements Serializable {
-    private static final long serialVersionUID = 3037851079332430546L;
-    private Integer productId;//id
-    private Integer signclosedId;//签收id
-    private String productName;//产品名称
-    private Integer productNum;//产品数量
-    private Date signclosedCreateTime;//创建时间
-    private Date signclosedUpdateTime;//修改时间
-    private Integer signclosedProductType;//1 产品  2配件
-    private Integer signclosedProductId;//关联产品id  （根据产品类型判断）
-    private Integer signclosedProductColor;//关联产品颜色id
-
-    private String colorName;//颜色名称
-    private String productNumber;//产品型号
-
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    public Integer getSignclosedId() {
-        return signclosedId;
-    }
-
-    public void setSignclosedId(Integer signclosedId) {
-        this.signclosedId = signclosedId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public Integer getProductNum() {
-        return productNum;
-    }
-
-    public void setProductNum(Integer productNum) {
-        this.productNum = productNum;
-    }
-
-    public Date getSignclosedCreateTime() {
-        return signclosedCreateTime;
-    }
-
-    public void setSignclosedCreateTime(Date signclosedCreateTime) {
-        this.signclosedCreateTime = signclosedCreateTime;
-    }
-
-    public Date getSignclosedUpdateTime() {
-        return signclosedUpdateTime;
-    }
-
-    public void setSignclosedUpdateTime(Date signclosedUpdateTime) {
-        this.signclosedUpdateTime = signclosedUpdateTime;
-    }
-
-    public Integer getSignclosedProductType() {
-        return signclosedProductType;
-    }
-
-    public void setSignclosedProductType(Integer signclosedProductType) {
-        this.signclosedProductType = signclosedProductType;
-    }
-
-    public Integer getSignclosedProductId() {
-        return signclosedProductId;
-    }
-
-    public void setSignclosedProductId(Integer signclosedProductId) {
-        this.signclosedProductId = signclosedProductId;
-    }
-
-    public Integer getSignclosedProductColor() {
-        return signclosedProductColor;
-    }
-
-    public void setSignclosedProductColor(Integer signclosedProductColor) {
-        this.signclosedProductColor = signclosedProductColor;
-    }
-
-    public String getColorName() {
-        return colorName;
-    }
-
-    public void setColorName(String colorName) {
-        this.colorName = colorName;
-    }
-
-    public String getProductNumber() {
-        return productNumber;
-    }
-
-    public void setProductNumber(String productNumber) {
-        this.productNumber = productNumber;
-    }
-}
+package com.iamberry.rst.core.fm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客诉-待签收产品表
+ * @author LJK
+ * @company 深圳爱贝源科技有限公司
+ * @date 2017/6/22 16:05
+ */
+public class AwaitingSignclosedProductInfo implements Serializable {
+    private static final long serialVersionUID = 3037851079332430546L;
+    private Integer productId;//id
+    private Integer signclosedId;//签收id
+    private String productName;//产品名称
+    private Integer productNum;//产品数量
+    private Date signclosedCreateTime;//创建时间
+    private Date signclosedUpdateTime;//修改时间
+    private Integer signclosedProductType;//1 产品  2配件
+    private Integer signclosedProductId;//关联产品id  （根据产品类型判断）
+    private Integer signclosedProductColor;//关联产品颜色id
+
+    private String colorName;//颜色名称
+    private String productNumber;//产品型号
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public Integer getSignclosedId() {
+        return signclosedId;
+    }
+
+    public void setSignclosedId(Integer signclosedId) {
+        this.signclosedId = signclosedId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public Integer getProductNum() {
+        return productNum;
+    }
+
+    public void setProductNum(Integer productNum) {
+        this.productNum = productNum;
+    }
+
+    public Date getSignclosedCreateTime() {
+        return signclosedCreateTime;
+    }
+
+    public void setSignclosedCreateTime(Date signclosedCreateTime) {
+        this.signclosedCreateTime = signclosedCreateTime;
+    }
+
+    public Date getSignclosedUpdateTime() {
+        return signclosedUpdateTime;
+    }
+
+    public void setSignclosedUpdateTime(Date signclosedUpdateTime) {
+        this.signclosedUpdateTime = signclosedUpdateTime;
+    }
+
+    public Integer getSignclosedProductType() {
+        return signclosedProductType;
+    }
+
+    public void setSignclosedProductType(Integer signclosedProductType) {
+        this.signclosedProductType = signclosedProductType;
+    }
+
+    public Integer getSignclosedProductId() {
+        return signclosedProductId;
+    }
+
+    public void setSignclosedProductId(Integer signclosedProductId) {
+        this.signclosedProductId = signclosedProductId;
+    }
+
+    public Integer getSignclosedProductColor() {
+        return signclosedProductColor;
+    }
+
+    public void setSignclosedProductColor(Integer signclosedProductColor) {
+        this.signclosedProductColor = signclosedProductColor;
+    }
+
+    public String getColorName() {
+        return colorName;
+    }
+
+    public void setColorName(String colorName) {
+        this.colorName = colorName;
+    }
+
+    public String getProductNumber() {
+        return productNumber;
+    }
+
+    public void setProductNumber(String productNumber) {
+        this.productNumber = productNumber;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintDetectInfo.java

@@ -1,71 +1,71 @@
-package com.iamberry.rst.core.cm;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 客诉-品质检测表
- * @author LJK
- * @company 深圳爱贝源科技有限公司
- * @date 2017/6/22 16:05
- */
-public class ComplaintDetectInfo implements Serializable {
-    private static final long serialVersionUID = -4586699316347839979L;
-    private Integer detectId;//id
-    private Integer customerId;//客诉id
-    private Integer signclosedId;//签收ID
-    private String detectDesc;//备注
-    private Date detectCreateTime;//创建时间
-    private Date detectUpdateTime;//修改时间
-
-    public Integer getDetectId() {
-        return detectId;
-    }
-
-    public void setDetectId(Integer detectId) {
-        this.detectId = detectId;
-    }
-
-    public Integer getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Integer customerId) {
-        this.customerId = customerId;
-    }
-
-    public Integer getSignclosedId() {
-        return signclosedId;
-    }
-
-    public void setSignclosedId(Integer signclosedId) {
-        this.signclosedId = signclosedId;
-    }
-
-    public String getDetectDesc() {
-        return detectDesc;
-    }
-
-    public void setDetectDesc(String detectDesc) {
-        this.detectDesc = detectDesc;
-    }
-
-    public Date getDetectCreateTime() {
-        return detectCreateTime;
-    }
-
-    public void setDetectCreateTime(Date detectCreateTime) {
-        this.detectCreateTime = detectCreateTime;
-    }
-
-    public Date getDetectUpdateTime() {
-        return detectUpdateTime;
-    }
-
-    public void setDetectUpdateTime(Date detectUpdateTime) {
-        this.detectUpdateTime = detectUpdateTime;
-    }
-}
+package com.iamberry.rst.core.fm;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客诉-品质检测表
+ * @author LJK
+ * @company 深圳爱贝源科技有限公司
+ * @date 2017/6/22 16:05
+ */
+public class ComplaintDetectInfo implements Serializable {
+    private static final long serialVersionUID = -4586699316347839979L;
+    private Integer detectId;//id
+    private Integer customerId;//客诉id
+    private Integer signclosedId;//签收ID
+    private String detectDesc;//备注
+    private Date detectCreateTime;//创建时间
+    private Date detectUpdateTime;//修改时间
+
+    public Integer getDetectId() {
+        return detectId;
+    }
+
+    public void setDetectId(Integer detectId) {
+        this.detectId = detectId;
+    }
+
+    public Integer getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(Integer customerId) {
+        this.customerId = customerId;
+    }
+
+    public Integer getSignclosedId() {
+        return signclosedId;
+    }
+
+    public void setSignclosedId(Integer signclosedId) {
+        this.signclosedId = signclosedId;
+    }
+
+    public String getDetectDesc() {
+        return detectDesc;
+    }
+
+    public void setDetectDesc(String detectDesc) {
+        this.detectDesc = detectDesc;
+    }
+
+    public Date getDetectCreateTime() {
+        return detectCreateTime;
+    }
+
+    public void setDetectCreateTime(Date detectCreateTime) {
+        this.detectCreateTime = detectCreateTime;
+    }
+
+    public Date getDetectUpdateTime() {
+        return detectUpdateTime;
+    }
+
+    public void setDetectUpdateTime(Date detectUpdateTime) {
+        this.detectUpdateTime = detectUpdateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintDetectItem.java

@@ -1,246 +1,246 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by Administrator on 2018/7/11.
- */
-public class ComplaintDetectItem implements Serializable {
-    private static final long serialVersionUID = -3623612031356499488L;
-    private Integer detectItemId;//主键
-    private Integer detectId;//检测id
-    private Integer productId;//产品id
-    private Integer productColorId;//产品颜色id
-    private String machineNo;//机器编号
-    private String detectProductNumber;//产品型号
-    private Integer detectItemState;//状态 1未检测 2已检测
-    private String detectItemPhenomenon;//工厂检测现象
-    private String detectItemClassification;//故障分类
-    private String detectItemFailureCause;//故障原因
-    private String detectItemResults;//判定结果
-    private String detectItemPoint;//故障指向
-    private String detectItemNalysis;//原因分析
-    private String detectItemContent;//维修内容
-    private Integer isMaintenance;//是否维修
-    private Integer maintenanceResults;//QC检测结果
-    private String detectItemDesc;//备注
-    private Date detectItemDate;//检测日期
-    private Date detectItemCreateTime;//创建时间
-    private Date detectItemUpdateTime;//修改时间
-    private Integer customerId;//客诉id
-
-    private Integer productTypeId;//产品类型id
-    private String productTypeName;//产品类型名称
-    private String questionTitle;//问题标题
-    private String colorName;//产品颜色名称
-    private String productName;//产品名称
-
-    public Integer getDetectItemId() {
-        return detectItemId;
-    }
-
-    public void setDetectItemId(Integer detectItemId) {
-        this.detectItemId = detectItemId;
-    }
-
-    public Integer getDetectId() {
-        return detectId;
-    }
-
-    public void setDetectId(Integer detectId) {
-        this.detectId = detectId;
-    }
-
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    public String getMachineNo() {
-        return machineNo;
-    }
-
-    public void setMachineNo(String machineNo) {
-        this.machineNo = machineNo;
-    }
-
-    public String getDetectProductNumber() {
-        return detectProductNumber;
-    }
-
-    public void setDetectProductNumber(String detectProductNumber) {
-        this.detectProductNumber = detectProductNumber;
-    }
-
-    public Integer getDetectItemState() {
-        return detectItemState;
-    }
-
-    public void setDetectItemState(Integer detectItemState) {
-        this.detectItemState = detectItemState;
-    }
-
-    public String getDetectItemPhenomenon() {
-        return detectItemPhenomenon;
-    }
-
-    public void setDetectItemPhenomenon(String detectItemPhenomenon) {
-        this.detectItemPhenomenon = detectItemPhenomenon;
-    }
-
-    public String getDetectItemClassification() {
-        return detectItemClassification;
-    }
-
-    public void setDetectItemClassification(String detectItemClassification) {
-        this.detectItemClassification = detectItemClassification;
-    }
-
-    public String getDetectItemFailureCause() {
-        return detectItemFailureCause;
-    }
-
-    public void setDetectItemFailureCause(String detectItemFailureCause) {
-        this.detectItemFailureCause = detectItemFailureCause;
-    }
-
-    public String getDetectItemResults() {
-        return detectItemResults;
-    }
-
-    public void setDetectItemResults(String detectItemResults) {
-        this.detectItemResults = detectItemResults;
-    }
-
-    public String getDetectItemPoint() {
-        return detectItemPoint;
-    }
-
-    public void setDetectItemPoint(String detectItemPoint) {
-        this.detectItemPoint = detectItemPoint;
-    }
-
-    public String getDetectItemNalysis() {
-        return detectItemNalysis;
-    }
-
-    public void setDetectItemNalysis(String detectItemNalysis) {
-        this.detectItemNalysis = detectItemNalysis;
-    }
-
-    public String getDetectItemContent() {
-        return detectItemContent;
-    }
-
-    public void setDetectItemContent(String detectItemContent) {
-        this.detectItemContent = detectItemContent;
-    }
-
-    public Integer getIsMaintenance() {
-        return isMaintenance;
-    }
-
-    public void setIsMaintenance(Integer isMaintenance) {
-        this.isMaintenance = isMaintenance;
-    }
-
-    public Integer getMaintenanceResults() {
-        return maintenanceResults;
-    }
-
-    public void setMaintenanceResults(Integer maintenanceResults) {
-        this.maintenanceResults = maintenanceResults;
-    }
-
-    public String getDetectItemDesc() {
-        return detectItemDesc;
-    }
-
-    public void setDetectItemDesc(String detectItemDesc) {
-        this.detectItemDesc = detectItemDesc;
-    }
-
-    public Date getDetectItemDate() {
-        return detectItemDate;
-    }
-
-    public void setDetectItemDate(Date detectItemDate) {
-        this.detectItemDate = detectItemDate;
-    }
-
-    public Date getDetectItemCreateTime() {
-        return detectItemCreateTime;
-    }
-
-    public void setDetectItemCreateTime(Date detectItemCreateTime) {
-        this.detectItemCreateTime = detectItemCreateTime;
-    }
-
-    public Date getDetectItemUpdateTime() {
-        return detectItemUpdateTime;
-    }
-
-    public void setDetectItemUpdateTime(Date detectItemUpdateTime) {
-        this.detectItemUpdateTime = detectItemUpdateTime;
-    }
-
-    public Integer getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Integer customerId) {
-        this.customerId = customerId;
-    }
-
-    public Integer getProductTypeId() {
-        return productTypeId;
-    }
-
-    public void setProductTypeId(Integer productTypeId) {
-        this.productTypeId = productTypeId;
-    }
-
-    public String getProductTypeName() {
-        return productTypeName;
-    }
-
-    public void setProductTypeName(String productTypeName) {
-        this.productTypeName = productTypeName;
-    }
-
-    public String getQuestionTitle() {
-        return questionTitle;
-    }
-
-    public void setQuestionTitle(String questionTitle) {
-        this.questionTitle = questionTitle;
-    }
-
-    public Integer getProductColorId() {
-        return productColorId;
-    }
-
-    public void setProductColorId(Integer productColorId) {
-        this.productColorId = productColorId;
-    }
-
-    public String getColorName() {
-        return colorName;
-    }
-
-    public void setColorName(String colorName) {
-        this.colorName = colorName;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-}
+package com.iamberry.rst.core.fm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by Administrator on 2018/7/11.
+ */
+public class ComplaintDetectItem implements Serializable {
+    private static final long serialVersionUID = -3623612031356499488L;
+    private Integer detectItemId;//主键
+    private Integer detectId;//检测id
+    private Integer productId;//产品id
+    private Integer productColorId;//产品颜色id
+    private String machineNo;//机器编号
+    private String detectProductNumber;//产品型号
+    private Integer detectItemState;//状态 1未检测 2已检测
+    private String detectItemPhenomenon;//工厂检测现象
+    private String detectItemClassification;//故障分类
+    private String detectItemFailureCause;//故障原因
+    private String detectItemResults;//判定结果
+    private String detectItemPoint;//故障指向
+    private String detectItemNalysis;//原因分析
+    private String detectItemContent;//维修内容
+    private Integer isMaintenance;//是否维修
+    private Integer maintenanceResults;//QC检测结果
+    private String detectItemDesc;//备注
+    private Date detectItemDate;//检测日期
+    private Date detectItemCreateTime;//创建时间
+    private Date detectItemUpdateTime;//修改时间
+    private Integer customerId;//客诉id
+
+    private Integer productTypeId;//产品类型id
+    private String productTypeName;//产品类型名称
+    private String questionTitle;//问题标题
+    private String colorName;//产品颜色名称
+    private String productName;//产品名称
+
+    public Integer getDetectItemId() {
+        return detectItemId;
+    }
+
+    public void setDetectItemId(Integer detectItemId) {
+        this.detectItemId = detectItemId;
+    }
+
+    public Integer getDetectId() {
+        return detectId;
+    }
+
+    public void setDetectId(Integer detectId) {
+        this.detectId = detectId;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public String getMachineNo() {
+        return machineNo;
+    }
+
+    public void setMachineNo(String machineNo) {
+        this.machineNo = machineNo;
+    }
+
+    public String getDetectProductNumber() {
+        return detectProductNumber;
+    }
+
+    public void setDetectProductNumber(String detectProductNumber) {
+        this.detectProductNumber = detectProductNumber;
+    }
+
+    public Integer getDetectItemState() {
+        return detectItemState;
+    }
+
+    public void setDetectItemState(Integer detectItemState) {
+        this.detectItemState = detectItemState;
+    }
+
+    public String getDetectItemPhenomenon() {
+        return detectItemPhenomenon;
+    }
+
+    public void setDetectItemPhenomenon(String detectItemPhenomenon) {
+        this.detectItemPhenomenon = detectItemPhenomenon;
+    }
+
+    public String getDetectItemClassification() {
+        return detectItemClassification;
+    }
+
+    public void setDetectItemClassification(String detectItemClassification) {
+        this.detectItemClassification = detectItemClassification;
+    }
+
+    public String getDetectItemFailureCause() {
+        return detectItemFailureCause;
+    }
+
+    public void setDetectItemFailureCause(String detectItemFailureCause) {
+        this.detectItemFailureCause = detectItemFailureCause;
+    }
+
+    public String getDetectItemResults() {
+        return detectItemResults;
+    }
+
+    public void setDetectItemResults(String detectItemResults) {
+        this.detectItemResults = detectItemResults;
+    }
+
+    public String getDetectItemPoint() {
+        return detectItemPoint;
+    }
+
+    public void setDetectItemPoint(String detectItemPoint) {
+        this.detectItemPoint = detectItemPoint;
+    }
+
+    public String getDetectItemNalysis() {
+        return detectItemNalysis;
+    }
+
+    public void setDetectItemNalysis(String detectItemNalysis) {
+        this.detectItemNalysis = detectItemNalysis;
+    }
+
+    public String getDetectItemContent() {
+        return detectItemContent;
+    }
+
+    public void setDetectItemContent(String detectItemContent) {
+        this.detectItemContent = detectItemContent;
+    }
+
+    public Integer getIsMaintenance() {
+        return isMaintenance;
+    }
+
+    public void setIsMaintenance(Integer isMaintenance) {
+        this.isMaintenance = isMaintenance;
+    }
+
+    public Integer getMaintenanceResults() {
+        return maintenanceResults;
+    }
+
+    public void setMaintenanceResults(Integer maintenanceResults) {
+        this.maintenanceResults = maintenanceResults;
+    }
+
+    public String getDetectItemDesc() {
+        return detectItemDesc;
+    }
+
+    public void setDetectItemDesc(String detectItemDesc) {
+        this.detectItemDesc = detectItemDesc;
+    }
+
+    public Date getDetectItemDate() {
+        return detectItemDate;
+    }
+
+    public void setDetectItemDate(Date detectItemDate) {
+        this.detectItemDate = detectItemDate;
+    }
+
+    public Date getDetectItemCreateTime() {
+        return detectItemCreateTime;
+    }
+
+    public void setDetectItemCreateTime(Date detectItemCreateTime) {
+        this.detectItemCreateTime = detectItemCreateTime;
+    }
+
+    public Date getDetectItemUpdateTime() {
+        return detectItemUpdateTime;
+    }
+
+    public void setDetectItemUpdateTime(Date detectItemUpdateTime) {
+        this.detectItemUpdateTime = detectItemUpdateTime;
+    }
+
+    public Integer getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(Integer customerId) {
+        this.customerId = customerId;
+    }
+
+    public Integer getProductTypeId() {
+        return productTypeId;
+    }
+
+    public void setProductTypeId(Integer productTypeId) {
+        this.productTypeId = productTypeId;
+    }
+
+    public String getProductTypeName() {
+        return productTypeName;
+    }
+
+    public void setProductTypeName(String productTypeName) {
+        this.productTypeName = productTypeName;
+    }
+
+    public String getQuestionTitle() {
+        return questionTitle;
+    }
+
+    public void setQuestionTitle(String questionTitle) {
+        this.questionTitle = questionTitle;
+    }
+
+    public Integer getProductColorId() {
+        return productColorId;
+    }
+
+    public void setProductColorId(Integer productColorId) {
+        this.productColorId = productColorId;
+    }
+
+    public String getColorName() {
+        return colorName;
+    }
+
+    public void setColorName(String colorName) {
+        this.colorName = colorName;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintMaintenanceInfo.java

@@ -1,215 +1,215 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.Date;
-/**
- * 客诉-生产维修表
- * @author LJK
- * @company 深圳爱贝源科技有限公司
- * @date 2017/6/22 16:05
- */
-public class ComplaintMaintenanceInfo  implements Serializable {
-    private static final long serialVersionUID = 4914099958529063786L;
-    private Integer maintenanceId;
-
-    private Integer detectId;//品质检测ID
-
-    private String maintenanceEquipmentNumber;//设备编号
-
-    private Integer productId;//产品id
-
-    private String maintenanceProductNumber;//产品型号
-
-
-
-    private Integer maintenanceState;//状态
-
-    private String maintenanceAnalysis;//原因分析
-
-    private Integer maintenanceCustomerId;//客诉id
-
-    private Integer maintenanceIsRepair;//是否可返修
-
-    private Date maintenanceContentDate;//返修日期
-
-    private Date maintenanceCreateTime;//创建时间
-
-    private Date maintenanceUpdateTime;//修改时间
-
-    private Integer maintenanceIsWarehousing;// 是否入库1待入库2已入库3无法入库
-
-    private String maintenanceDesc;//备注
-
-    private Integer productColorId;//产品颜色id
-
-    private Integer productType;    //1.净水机 2.配件
-
-    private Integer maintenanceResults;//QC检测结果 1.通过 2不通过
-
-
-    private String detectDesc;//品质备注
-
-    private Integer equipmentNumber;//维修次数
-
-    private String customerIdDescribe;//客诉描述
-
-    public Integer getMaintenanceId() {
-        return maintenanceId;
-    }
-
-    public void setMaintenanceId(Integer maintenanceId) {
-        this.maintenanceId = maintenanceId;
-    }
-
-    public Integer getDetectId() {
-        return detectId;
-    }
-
-    public void setDetectId(Integer detectId) {
-        this.detectId = detectId;
-    }
-
-    public String getMaintenanceEquipmentNumber() {
-        return maintenanceEquipmentNumber;
-    }
-
-    public void setMaintenanceEquipmentNumber(String maintenanceEquipmentNumber) {
-        this.maintenanceEquipmentNumber = maintenanceEquipmentNumber;
-    }
-
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    public String getMaintenanceProductNumber() {
-        return maintenanceProductNumber;
-    }
-
-    public void setMaintenanceProductNumber(String maintenanceProductNumber) {
-        this.maintenanceProductNumber = maintenanceProductNumber == null ? null : maintenanceProductNumber.trim();
-    }
-
-    public Integer getMaintenanceState() {
-        return maintenanceState;
-    }
-
-    public void setMaintenanceState(Integer maintenanceState) {
-        this.maintenanceState = maintenanceState;
-    }
-
-    public String getMaintenanceAnalysis() {
-        return maintenanceAnalysis;
-    }
-
-    public void setMaintenanceAnalysis(String maintenanceAnalysis) {
-        this.maintenanceAnalysis = maintenanceAnalysis == null ? null : maintenanceAnalysis.trim();
-    }
-
-    public Integer getMaintenanceCustomerId() {
-        return maintenanceCustomerId;
-    }
-
-    public void setMaintenanceCustomerId(Integer maintenanceCustomerId) {
-        this.maintenanceCustomerId = maintenanceCustomerId;
-    }
-
-    public Integer getMaintenanceIsRepair() {
-        return maintenanceIsRepair;
-    }
-
-    public void setMaintenanceIsRepair(Integer maintenanceIsRepair) {
-        this.maintenanceIsRepair = maintenanceIsRepair;
-    }
-
-    public Date getMaintenanceContentDate() {
-        return maintenanceContentDate;
-    }
-
-    public void setMaintenanceContentDate(Date maintenanceContentDate) {
-        this.maintenanceContentDate = maintenanceContentDate;
-    }
-
-    public Date getMaintenanceCreateTime() {
-        return maintenanceCreateTime;
-    }
-
-    public void setMaintenanceCreateTime(Date maintenanceCreateTime) {
-        this.maintenanceCreateTime = maintenanceCreateTime;
-    }
-
-    public Date getMaintenanceUpdateTime() {
-        return maintenanceUpdateTime;
-    }
-
-    public void setMaintenanceUpdateTime(Date maintenanceUpdateTime) {
-        this.maintenanceUpdateTime = maintenanceUpdateTime;
-    }
-
-    public Integer getProductType() {
-        return productType;
-    }
-
-    public void setProductType(Integer productType) {
-        this.productType = productType;
-    }
-
-    public Integer getMaintenanceResults() {
-        return maintenanceResults;
-    }
-
-    public void setMaintenanceResults(Integer maintenanceResults) {
-        this.maintenanceResults = maintenanceResults;
-    }
-
-    public Integer getMaintenanceIsWarehousing() {
-        return maintenanceIsWarehousing;
-    }
-
-    public void setMaintenanceIsWarehousing(Integer maintenanceIsWarehousing) {
-        this.maintenanceIsWarehousing = maintenanceIsWarehousing;
-    }
-
-    public String getDetectDesc() {
-        return detectDesc;
-    }
-
-    public void setDetectDesc(String detectDesc) {
-        this.detectDesc = detectDesc;
-    }
-
-    public Integer getEquipmentNumber() {
-        return equipmentNumber;
-    }
-
-    public void setEquipmentNumber(Integer equipmentNumber) {
-        this.equipmentNumber = equipmentNumber;
-    }
-
-    public String getCustomerIdDescribe() {
-        return customerIdDescribe;
-    }
-
-    public void setCustomerIdDescribe(String customerIdDescribe) {
-        this.customerIdDescribe = customerIdDescribe;
-    }
-
-    public String getMaintenanceDesc() {
-        return maintenanceDesc;
-    }
-
-    public void setMaintenanceDesc(String maintenanceDesc) {
-        this.maintenanceDesc = maintenanceDesc;
-    }
-
-    public Integer getProductColorId() {
-        return productColorId;
-    }
-
-    public void setProductColorId(Integer productColorId) {
-        this.productColorId = productColorId;
-    }
+package com.iamberry.rst.core.fm;
+
+import java.io.Serializable;
+import java.util.Date;
+/**
+ * 客诉-生产维修表
+ * @author LJK
+ * @company 深圳爱贝源科技有限公司
+ * @date 2017/6/22 16:05
+ */
+public class ComplaintMaintenanceInfo  implements Serializable {
+    private static final long serialVersionUID = 4914099958529063786L;
+    private Integer maintenanceId;
+
+    private Integer detectId;//品质检测ID
+
+    private String maintenanceEquipmentNumber;//设备编号
+
+    private Integer productId;//产品id
+
+    private String maintenanceProductNumber;//产品型号
+
+
+
+    private Integer maintenanceState;//状态
+
+    private String maintenanceAnalysis;//原因分析
+
+    private Integer maintenanceCustomerId;//客诉id
+
+    private Integer maintenanceIsRepair;//是否可返修
+
+    private Date maintenanceContentDate;//返修日期
+
+    private Date maintenanceCreateTime;//创建时间
+
+    private Date maintenanceUpdateTime;//修改时间
+
+    private Integer maintenanceIsWarehousing;// 是否入库1待入库2已入库3无法入库
+
+    private String maintenanceDesc;//备注
+
+    private Integer productColorId;//产品颜色id
+
+    private Integer productType;    //1.净水机 2.配件
+
+    private Integer maintenanceResults;//QC检测结果 1.通过 2不通过
+
+
+    private String detectDesc;//品质备注
+
+    private Integer equipmentNumber;//维修次数
+
+    private String customerIdDescribe;//客诉描述
+
+    public Integer getMaintenanceId() {
+        return maintenanceId;
+    }
+
+    public void setMaintenanceId(Integer maintenanceId) {
+        this.maintenanceId = maintenanceId;
+    }
+
+    public Integer getDetectId() {
+        return detectId;
+    }
+
+    public void setDetectId(Integer detectId) {
+        this.detectId = detectId;
+    }
+
+    public String getMaintenanceEquipmentNumber() {
+        return maintenanceEquipmentNumber;
+    }
+
+    public void setMaintenanceEquipmentNumber(String maintenanceEquipmentNumber) {
+        this.maintenanceEquipmentNumber = maintenanceEquipmentNumber;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public String getMaintenanceProductNumber() {
+        return maintenanceProductNumber;
+    }
+
+    public void setMaintenanceProductNumber(String maintenanceProductNumber) {
+        this.maintenanceProductNumber = maintenanceProductNumber == null ? null : maintenanceProductNumber.trim();
+    }
+
+    public Integer getMaintenanceState() {
+        return maintenanceState;
+    }
+
+    public void setMaintenanceState(Integer maintenanceState) {
+        this.maintenanceState = maintenanceState;
+    }
+
+    public String getMaintenanceAnalysis() {
+        return maintenanceAnalysis;
+    }
+
+    public void setMaintenanceAnalysis(String maintenanceAnalysis) {
+        this.maintenanceAnalysis = maintenanceAnalysis == null ? null : maintenanceAnalysis.trim();
+    }
+
+    public Integer getMaintenanceCustomerId() {
+        return maintenanceCustomerId;
+    }
+
+    public void setMaintenanceCustomerId(Integer maintenanceCustomerId) {
+        this.maintenanceCustomerId = maintenanceCustomerId;
+    }
+
+    public Integer getMaintenanceIsRepair() {
+        return maintenanceIsRepair;
+    }
+
+    public void setMaintenanceIsRepair(Integer maintenanceIsRepair) {
+        this.maintenanceIsRepair = maintenanceIsRepair;
+    }
+
+    public Date getMaintenanceContentDate() {
+        return maintenanceContentDate;
+    }
+
+    public void setMaintenanceContentDate(Date maintenanceContentDate) {
+        this.maintenanceContentDate = maintenanceContentDate;
+    }
+
+    public Date getMaintenanceCreateTime() {
+        return maintenanceCreateTime;
+    }
+
+    public void setMaintenanceCreateTime(Date maintenanceCreateTime) {
+        this.maintenanceCreateTime = maintenanceCreateTime;
+    }
+
+    public Date getMaintenanceUpdateTime() {
+        return maintenanceUpdateTime;
+    }
+
+    public void setMaintenanceUpdateTime(Date maintenanceUpdateTime) {
+        this.maintenanceUpdateTime = maintenanceUpdateTime;
+    }
+
+    public Integer getProductType() {
+        return productType;
+    }
+
+    public void setProductType(Integer productType) {
+        this.productType = productType;
+    }
+
+    public Integer getMaintenanceResults() {
+        return maintenanceResults;
+    }
+
+    public void setMaintenanceResults(Integer maintenanceResults) {
+        this.maintenanceResults = maintenanceResults;
+    }
+
+    public Integer getMaintenanceIsWarehousing() {
+        return maintenanceIsWarehousing;
+    }
+
+    public void setMaintenanceIsWarehousing(Integer maintenanceIsWarehousing) {
+        this.maintenanceIsWarehousing = maintenanceIsWarehousing;
+    }
+
+    public String getDetectDesc() {
+        return detectDesc;
+    }
+
+    public void setDetectDesc(String detectDesc) {
+        this.detectDesc = detectDesc;
+    }
+
+    public Integer getEquipmentNumber() {
+        return equipmentNumber;
+    }
+
+    public void setEquipmentNumber(Integer equipmentNumber) {
+        this.equipmentNumber = equipmentNumber;
+    }
+
+    public String getCustomerIdDescribe() {
+        return customerIdDescribe;
+    }
+
+    public void setCustomerIdDescribe(String customerIdDescribe) {
+        this.customerIdDescribe = customerIdDescribe;
+    }
+
+    public String getMaintenanceDesc() {
+        return maintenanceDesc;
+    }
+
+    public void setMaintenanceDesc(String maintenanceDesc) {
+        this.maintenanceDesc = maintenanceDesc;
+    }
+
+    public Integer getProductColorId() {
+        return productColorId;
+    }
+
+    public void setProductColorId(Integer productColorId) {
+        this.productColorId = productColorId;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintSignclosedInfo.java

@@ -1,214 +1,214 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 1.1.57	客诉-签收表
- * @author LJK
- * @company 深圳爱贝源科技有限公司
- * @date 2017/6/22 16:05
- */
-public class ComplaintSignclosedInfo implements Serializable {
-    private static final long serialVersionUID = 2416773719172770710L;
-    private Integer signclosedId;//id
-    private Integer signclosedType;//签收类型
-    private String signclosedTypeName;//签收类型名称
-    private String signclosedLogistics;//寄回物流
-    private String signclosedLogisticsNumber;//物流单号
-    private String signclosedSendName;//寄件人姓名
-    private String signclosedSendTel;//寄件人电话
-    private String signclosedAddrProvinces;//寄件地址（省）
-    private String signclosedAddrCity;//寄件地址（市）
-    private String signclosedAddrArea;//寄件地址（区）
-    private Date signclosedDate;//签收时间
-    private Integer signclosedCustomerId;//客诉id
-    private String signclosedDesc;//备注
-    private Date signclosedCreateTime;//创建时间
-    private Date signclosedUpdateTime;//修改时间
-    private Integer signclosedState;//状态1已签收2已移交QC
-    private String signclosedCustomerDesc;//客服备注
-    private Integer isBinding;//是否绑定客诉
-
-    private String customerIdDescribe;//客诉标题
-    private List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfoList = new ArrayList<AwaitingSignclosedProductInfo>();	//待签收实体类
-    private List<SignclosedProductInfo> signclosedProductInfoList = new ArrayList<SignclosedProductInfo>();	//签收实体类
-    private String describeHandleDesc;//处理描述
-    public Integer getSignclosedId() {
-        return signclosedId;
-    }
-
-    public void setSignclosedId(Integer signclosedId) {
-        this.signclosedId = signclosedId;
-    }
-
-    public Integer getSignclosedType() {
-        return signclosedType;
-    }
-
-    public void setSignclosedType(Integer signclosedType) {
-        this.signclosedType = signclosedType;
-    }
-
-    public String getSignclosedTypeName() {
-        return signclosedTypeName;
-    }
-
-    public void setSignclosedTypeName(String signclosedTypeName) {
-        this.signclosedTypeName = signclosedTypeName;
-    }
-
-    public String getSignclosedLogistics() {
-        return signclosedLogistics;
-    }
-
-    public void setSignclosedLogistics(String signclosedLogistics) {
-        this.signclosedLogistics = signclosedLogistics;
-    }
-
-    public String getSignclosedLogisticsNumber() {
-        return signclosedLogisticsNumber;
-    }
-
-    public void setSignclosedLogisticsNumber(String signclosedLogisticsNumber) {
-        this.signclosedLogisticsNumber = signclosedLogisticsNumber;
-    }
-
-    public String getSignclosedSendName() {
-        return signclosedSendName;
-    }
-
-    public void setSignclosedSendName(String signclosedSendName) {
-        this.signclosedSendName = signclosedSendName;
-    }
-
-    public String getSignclosedSendTel() {
-        return signclosedSendTel;
-    }
-
-    public void setSignclosedSendTel(String signclosedSendTel) {
-        this.signclosedSendTel = signclosedSendTel;
-    }
-
-    public String getSignclosedAddrProvinces() {
-        return signclosedAddrProvinces;
-    }
-
-    public void setSignclosedAddrProvinces(String signclosedAddrProvinces) {
-        this.signclosedAddrProvinces = signclosedAddrProvinces;
-    }
-
-    public String getSignclosedAddrCity() {
-        return signclosedAddrCity;
-    }
-
-    public void setSignclosedAddrCity(String signclosedAddrCity) {
-        this.signclosedAddrCity = signclosedAddrCity;
-    }
-
-    public String getSignclosedAddrArea() {
-        return signclosedAddrArea;
-    }
-
-    public void setSignclosedAddrArea(String signclosedAddrArea) {
-        this.signclosedAddrArea = signclosedAddrArea;
-    }
-
-    public Date getSignclosedDate() {
-        return signclosedDate;
-    }
-
-    public void setSignclosedDate(Date signclosedDate) {
-        this.signclosedDate = signclosedDate;
-    }
-
-    public Integer getSignclosedCustomerId() {
-        return signclosedCustomerId;
-    }
-
-    public void setSignclosedCustomerId(Integer signclosedCustomerId) {
-        this.signclosedCustomerId = signclosedCustomerId;
-    }
-
-    public String getSignclosedDesc() {
-        return signclosedDesc;
-    }
-
-    public void setSignclosedDesc(String signclosedDesc) {
-        this.signclosedDesc = signclosedDesc;
-    }
-
-    public Date getSignclosedCreateTime() {
-        return signclosedCreateTime;
-    }
-
-    public void setSignclosedCreateTime(Date signclosedCreateTime) {
-        this.signclosedCreateTime = signclosedCreateTime;
-    }
-
-    public Date getSignclosedUpdateTime() {
-        return signclosedUpdateTime;
-    }
-
-    public void setSignclosedUpdateTime(Date signclosedUpdateTime) {
-        this.signclosedUpdateTime = signclosedUpdateTime;
-    }
-
-    public String getCustomerIdDescribe() {
-        return customerIdDescribe;
-    }
-
-    public void setCustomerIdDescribe(String customerIdDescribe) {
-        this.customerIdDescribe = customerIdDescribe;
-    }
-
-    public List<AwaitingSignclosedProductInfo> getAwaitingSignclosedProductInfoList() {
-        return awaitingSignclosedProductInfoList;
-    }
-
-    public void setAwaitingSignclosedProductInfoList(List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfoList) {
-        this.awaitingSignclosedProductInfoList = awaitingSignclosedProductInfoList;
-    }
-
-    public List<SignclosedProductInfo> getSignclosedProductInfoList() {
-        return signclosedProductInfoList;
-    }
-
-    public void setSignclosedProductInfoList(List<SignclosedProductInfo> signclosedProductInfoList) {
-        this.signclosedProductInfoList = signclosedProductInfoList;
-    }
-
-    public String getDescribeHandleDesc() {
-        return describeHandleDesc;
-    }
-
-    public void setDescribeHandleDesc(String describeHandleDesc) {
-        this.describeHandleDesc = describeHandleDesc;
-    }
-
-    public Integer getSignclosedState() {
-        return signclosedState;
-    }
-
-    public void setSignclosedState(Integer signclosedState) {
-        this.signclosedState = signclosedState;
-    }
-
-    public String getSignclosedCustomerDesc() {
-        return signclosedCustomerDesc;
-    }
-
-    public void setSignclosedCustomerDesc(String signclosedCustomerDesc) {
-        this.signclosedCustomerDesc = signclosedCustomerDesc;
-    }
-
-    public Integer getIsBinding() {
-        return isBinding;
-    }
-
-    public void setIsBinding(Integer isBinding) {
-        this.isBinding = isBinding;
-    }
-}
+package com.iamberry.rst.core.fm;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 1.1.57	客诉-签收表
+ * @author LJK
+ * @company 深圳爱贝源科技有限公司
+ * @date 2017/6/22 16:05
+ */
+public class ComplaintSignclosedInfo implements Serializable {
+    private static final long serialVersionUID = 2416773719172770710L;
+    private Integer signclosedId;//id
+    private Integer signclosedType;//签收类型
+    private String signclosedTypeName;//签收类型名称
+    private String signclosedLogistics;//寄回物流
+    private String signclosedLogisticsNumber;//物流单号
+    private String signclosedSendName;//寄件人姓名
+    private String signclosedSendTel;//寄件人电话
+    private String signclosedAddrProvinces;//寄件地址（省）
+    private String signclosedAddrCity;//寄件地址（市）
+    private String signclosedAddrArea;//寄件地址（区）
+    private Date signclosedDate;//签收时间
+    private Integer signclosedCustomerId;//客诉id
+    private String signclosedDesc;//备注
+    private Date signclosedCreateTime;//创建时间
+    private Date signclosedUpdateTime;//修改时间
+    private Integer signclosedState;//状态1已签收2已移交QC
+    private String signclosedCustomerDesc;//客服备注
+    private Integer isBinding;//是否绑定客诉
+
+    private String customerIdDescribe;//客诉标题
+    private List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfoList = new ArrayList<AwaitingSignclosedProductInfo>();	//待签收实体类
+    private List<SignclosedProductInfo> signclosedProductInfoList = new ArrayList<SignclosedProductInfo>();	//签收实体类
+    private String describeHandleDesc;//处理描述
+    public Integer getSignclosedId() {
+        return signclosedId;
+    }
+
+    public void setSignclosedId(Integer signclosedId) {
+        this.signclosedId = signclosedId;
+    }
+
+    public Integer getSignclosedType() {
+        return signclosedType;
+    }
+
+    public void setSignclosedType(Integer signclosedType) {
+        this.signclosedType = signclosedType;
+    }
+
+    public String getSignclosedTypeName() {
+        return signclosedTypeName;
+    }
+
+    public void setSignclosedTypeName(String signclosedTypeName) {
+        this.signclosedTypeName = signclosedTypeName;
+    }
+
+    public String getSignclosedLogistics() {
+        return signclosedLogistics;
+    }
+
+    public void setSignclosedLogistics(String signclosedLogistics) {
+        this.signclosedLogistics = signclosedLogistics;
+    }
+
+    public String getSignclosedLogisticsNumber() {
+        return signclosedLogisticsNumber;
+    }
+
+    public void setSignclosedLogisticsNumber(String signclosedLogisticsNumber) {
+        this.signclosedLogisticsNumber = signclosedLogisticsNumber;
+    }
+
+    public String getSignclosedSendName() {
+        return signclosedSendName;
+    }
+
+    public void setSignclosedSendName(String signclosedSendName) {
+        this.signclosedSendName = signclosedSendName;
+    }
+
+    public String getSignclosedSendTel() {
+        return signclosedSendTel;
+    }
+
+    public void setSignclosedSendTel(String signclosedSendTel) {
+        this.signclosedSendTel = signclosedSendTel;
+    }
+
+    public String getSignclosedAddrProvinces() {
+        return signclosedAddrProvinces;
+    }
+
+    public void setSignclosedAddrProvinces(String signclosedAddrProvinces) {
+        this.signclosedAddrProvinces = signclosedAddrProvinces;
+    }
+
+    public String getSignclosedAddrCity() {
+        return signclosedAddrCity;
+    }
+
+    public void setSignclosedAddrCity(String signclosedAddrCity) {
+        this.signclosedAddrCity = signclosedAddrCity;
+    }
+
+    public String getSignclosedAddrArea() {
+        return signclosedAddrArea;
+    }
+
+    public void setSignclosedAddrArea(String signclosedAddrArea) {
+        this.signclosedAddrArea = signclosedAddrArea;
+    }
+
+    public Date getSignclosedDate() {
+        return signclosedDate;
+    }
+
+    public void setSignclosedDate(Date signclosedDate) {
+        this.signclosedDate = signclosedDate;
+    }
+
+    public Integer getSignclosedCustomerId() {
+        return signclosedCustomerId;
+    }
+
+    public void setSignclosedCustomerId(Integer signclosedCustomerId) {
+        this.signclosedCustomerId = signclosedCustomerId;
+    }
+
+    public String getSignclosedDesc() {
+        return signclosedDesc;
+    }
+
+    public void setSignclosedDesc(String signclosedDesc) {
+        this.signclosedDesc = signclosedDesc;
+    }
+
+    public Date getSignclosedCreateTime() {
+        return signclosedCreateTime;
+    }
+
+    public void setSignclosedCreateTime(Date signclosedCreateTime) {
+        this.signclosedCreateTime = signclosedCreateTime;
+    }
+
+    public Date getSignclosedUpdateTime() {
+        return signclosedUpdateTime;
+    }
+
+    public void setSignclosedUpdateTime(Date signclosedUpdateTime) {
+        this.signclosedUpdateTime = signclosedUpdateTime;
+    }
+
+    public String getCustomerIdDescribe() {
+        return customerIdDescribe;
+    }
+
+    public void setCustomerIdDescribe(String customerIdDescribe) {
+        this.customerIdDescribe = customerIdDescribe;
+    }
+
+    public List<AwaitingSignclosedProductInfo> getAwaitingSignclosedProductInfoList() {
+        return awaitingSignclosedProductInfoList;
+    }
+
+    public void setAwaitingSignclosedProductInfoList(List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfoList) {
+        this.awaitingSignclosedProductInfoList = awaitingSignclosedProductInfoList;
+    }
+
+    public List<SignclosedProductInfo> getSignclosedProductInfoList() {
+        return signclosedProductInfoList;
+    }
+
+    public void setSignclosedProductInfoList(List<SignclosedProductInfo> signclosedProductInfoList) {
+        this.signclosedProductInfoList = signclosedProductInfoList;
+    }
+
+    public String getDescribeHandleDesc() {
+        return describeHandleDesc;
+    }
+
+    public void setDescribeHandleDesc(String describeHandleDesc) {
+        this.describeHandleDesc = describeHandleDesc;
+    }
+
+    public Integer getSignclosedState() {
+        return signclosedState;
+    }
+
+    public void setSignclosedState(Integer signclosedState) {
+        this.signclosedState = signclosedState;
+    }
+
+    public String getSignclosedCustomerDesc() {
+        return signclosedCustomerDesc;
+    }
+
+    public void setSignclosedCustomerDesc(String signclosedCustomerDesc) {
+        this.signclosedCustomerDesc = signclosedCustomerDesc;
+    }
+
+    public Integer getIsBinding() {
+        return isBinding;
+    }
+
+    public void setIsBinding(Integer isBinding) {
+        this.isBinding = isBinding;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintSmallClassInfo.java

@@ -1,109 +1,111 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 客诉小类表
- * @author LJK
- * @company 深圳爱贝源科技有限公司
- * @date 2017/6/22 16:05
- */
-public class ComplaintSmallClassInfo implements Serializable {
-
-    private static final long serialVersionUID = 6528451065211178607L;
-    private Integer smallClassId;           //id
-    private Integer complaintId;           //所属类别
-    private String smallClassName;           //小类名称
-    private String smallClassProfile;           //小类简介
-    private Integer smallClassState;           //类型状态
-    private Integer smallQuestionNum;           //客诉问题数量
-    private Date smallClassCreateTime;           //创建时间
-    private Date smallClassUpdateTime;           //修改时间
-
-    private Integer smallClassNum; //数量
-
-    private List<ComplaintQuestionInfo> questionInfoList = new ArrayList<ComplaintQuestionInfo>();
-
-    public Integer getSmallClassId() {
-        return smallClassId;
-    }
-
-    public void setSmallClassId(Integer smallClassId) {
-        this.smallClassId = smallClassId;
-    }
-
-    public Integer getComplaintId() {
-        return complaintId;
-    }
-
-    public void setComplaintId(Integer complaintId) {
-        this.complaintId = complaintId;
-    }
-
-    public String getSmallClassName() {
-        return smallClassName;
-    }
-
-    public void setSmallClassName(String smallClassName) {
-        this.smallClassName = smallClassName;
-    }
-
-    public String getSmallClassProfile() {
-        return smallClassProfile;
-    }
-
-    public void setSmallClassProfile(String smallClassProfile) {
-        this.smallClassProfile = smallClassProfile;
-    }
-
-    public Integer getSmallClassState() {
-        return smallClassState;
-    }
-
-    public void setSmallClassState(Integer smallClassState) {
-        this.smallClassState = smallClassState;
-    }
-
-    public Integer getSmallQuestionNum() {
-        return smallQuestionNum;
-    }
-
-    public void setSmallQuestionNum(Integer smallQuestionNum) {
-        this.smallQuestionNum = smallQuestionNum;
-    }
-
-    public Date getSmallClassCreateTime() {
-        return smallClassCreateTime;
-    }
-
-    public void setSmallClassCreateTime(Date smallClassCreateTime) {
-        this.smallClassCreateTime = smallClassCreateTime;
-    }
-
-    public Date getSmallClassUpdateTime() {
-        return smallClassUpdateTime;
-    }
-
-    public void setSmallClassUpdateTime(Date smallClassUpdateTime) {
-        this.smallClassUpdateTime = smallClassUpdateTime;
-    }
-
-    public List<ComplaintQuestionInfo> getQuestionInfoList() {
-        return questionInfoList;
-    }
-
-    public void setQuestionInfoList(List<ComplaintQuestionInfo> questionInfoList) {
-        this.questionInfoList = questionInfoList;
-    }
-
-    public Integer getSmallClassNum() {
-        return smallClassNum;
-    }
-
-    public void setSmallClassNum(Integer smallClassNum) {
-        this.smallClassNum = smallClassNum;
-    }
-}
+package com.iamberry.rst.core.fm;
+
+import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 客诉小类表
+ * @author LJK
+ * @company 深圳爱贝源科技有限公司
+ * @date 2017/6/22 16:05
+ */
+public class ComplaintSmallClassInfo implements Serializable {
+
+    private static final long serialVersionUID = 6528451065211178607L;
+    private Integer smallClassId;           //id
+    private Integer complaintId;           //所属类别
+    private String smallClassName;           //小类名称
+    private String smallClassProfile;           //小类简介
+    private Integer smallClassState;           //类型状态
+    private Integer smallQuestionNum;           //客诉问题数量
+    private Date smallClassCreateTime;           //创建时间
+    private Date smallClassUpdateTime;           //修改时间
+
+    private Integer smallClassNum; //数量
+
+    private List<ComplaintQuestionInfo> questionInfoList = new ArrayList<ComplaintQuestionInfo>();
+
+    public Integer getSmallClassId() {
+        return smallClassId;
+    }
+
+    public void setSmallClassId(Integer smallClassId) {
+        this.smallClassId = smallClassId;
+    }
+
+    public Integer getComplaintId() {
+        return complaintId;
+    }
+
+    public void setComplaintId(Integer complaintId) {
+        this.complaintId = complaintId;
+    }
+
+    public String getSmallClassName() {
+        return smallClassName;
+    }
+
+    public void setSmallClassName(String smallClassName) {
+        this.smallClassName = smallClassName;
+    }
+
+    public String getSmallClassProfile() {
+        return smallClassProfile;
+    }
+
+    public void setSmallClassProfile(String smallClassProfile) {
+        this.smallClassProfile = smallClassProfile;
+    }
+
+    public Integer getSmallClassState() {
+        return smallClassState;
+    }
+
+    public void setSmallClassState(Integer smallClassState) {
+        this.smallClassState = smallClassState;
+    }
+
+    public Integer getSmallQuestionNum() {
+        return smallQuestionNum;
+    }
+
+    public void setSmallQuestionNum(Integer smallQuestionNum) {
+        this.smallQuestionNum = smallQuestionNum;
+    }
+
+    public Date getSmallClassCreateTime() {
+        return smallClassCreateTime;
+    }
+
+    public void setSmallClassCreateTime(Date smallClassCreateTime) {
+        this.smallClassCreateTime = smallClassCreateTime;
+    }
+
+    public Date getSmallClassUpdateTime() {
+        return smallClassUpdateTime;
+    }
+
+    public void setSmallClassUpdateTime(Date smallClassUpdateTime) {
+        this.smallClassUpdateTime = smallClassUpdateTime;
+    }
+
+    public List<ComplaintQuestionInfo> getQuestionInfoList() {
+        return questionInfoList;
+    }
+
+    public void setQuestionInfoList(List<ComplaintQuestionInfo> questionInfoList) {
+        this.questionInfoList = questionInfoList;
+    }
+
+    public Integer getSmallClassNum() {
+        return smallClassNum;
+    }
+
+    public void setSmallClassNum(Integer smallClassNum) {
+        this.smallClassNum = smallClassNum;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/DetectionBasis.java

@@ -1,110 +1,110 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-
-/**
- * Created by Administrator on 2018/8/8.
- */
-public class DetectionBasis implements Serializable{
-
-    private static final long serialVersionUID = -2454116797606102140L;
-    private Integer basisId;//id
-    private String basisState;//状态1正在使用2停止使用
-    private String basisPhenomenon;//工厂检测现象
-    private String basisClassification;//故障分类
-    private String basisFailureCause;//故障原因
-    private String basisResults;//判定结果
-    private String basisPoint;//故障指向
-    private String basisNalysis;//原因分析
-    private String basisContent;//维修内容
-    private String basisCreate_time;//创建时间
-    private String basisUpdateTime;//修改时间
-
-    public Integer getBasisId() {
-        return basisId;
-    }
-
-    public void setBasisId(Integer basisId) {
-        this.basisId = basisId;
-    }
-
-    public String getBasisState() {
-        return basisState;
-    }
-
-    public void setBasisState(String basisState) {
-        this.basisState = basisState;
-    }
-
-    public String getBasisPhenomenon() {
-        return basisPhenomenon;
-    }
-
-    public void setBasisPhenomenon(String basisPhenomenon) {
-        this.basisPhenomenon = basisPhenomenon;
-    }
-
-    public String getBasisClassification() {
-        return basisClassification;
-    }
-
-    public void setBasisClassification(String basisClassification) {
-        this.basisClassification = basisClassification;
-    }
-
-    public String getBasisFailureCause() {
-        return basisFailureCause;
-    }
-
-    public void setBasisFailureCause(String basisFailureCause) {
-        this.basisFailureCause = basisFailureCause;
-    }
-
-    public String getBasisResults() {
-        return basisResults;
-    }
-
-    public void setBasisResults(String basisResults) {
-        this.basisResults = basisResults;
-    }
-
-    public String getBasisPoint() {
-        return basisPoint;
-    }
-
-    public void setBasisPoint(String basisPoint) {
-        this.basisPoint = basisPoint;
-    }
-
-    public String getBasisNalysis() {
-        return basisNalysis;
-    }
-
-    public void setBasisNalysis(String basisNalysis) {
-        this.basisNalysis = basisNalysis;
-    }
-
-    public String getBasisContent() {
-        return basisContent;
-    }
-
-    public void setBasisContent(String basisContent) {
-        this.basisContent = basisContent;
-    }
-
-    public String getBasisCreate_time() {
-        return basisCreate_time;
-    }
-
-    public void setBasisCreate_time(String basisCreate_time) {
-        this.basisCreate_time = basisCreate_time;
-    }
-
-    public String getBasisUpdateTime() {
-        return basisUpdateTime;
-    }
-
-    public void setBasisUpdateTime(String basisUpdateTime) {
-        this.basisUpdateTime = basisUpdateTime;
-    }
-}
+package com.iamberry.rst.core.fm;
+
+import java.io.Serializable;
+
+/**
+ * Created by Administrator on 2018/8/8.
+ */
+public class DetectionBasis implements Serializable{
+
+    private static final long serialVersionUID = -2454116797606102140L;
+    private Integer basisId;//id
+    private String basisState;//状态1正在使用2停止使用
+    private String basisPhenomenon;//工厂检测现象
+    private String basisClassification;//故障分类
+    private String basisFailureCause;//故障原因
+    private String basisResults;//判定结果
+    private String basisPoint;//故障指向
+    private String basisNalysis;//原因分析
+    private String basisContent;//维修内容
+    private String basisCreate_time;//创建时间
+    private String basisUpdateTime;//修改时间
+
+    public Integer getBasisId() {
+        return basisId;
+    }
+
+    public void setBasisId(Integer basisId) {
+        this.basisId = basisId;
+    }
+
+    public String getBasisState() {
+        return basisState;
+    }
+
+    public void setBasisState(String basisState) {
+        this.basisState = basisState;
+    }
+
+    public String getBasisPhenomenon() {
+        return basisPhenomenon;
+    }
+
+    public void setBasisPhenomenon(String basisPhenomenon) {
+        this.basisPhenomenon = basisPhenomenon;
+    }
+
+    public String getBasisClassification() {
+        return basisClassification;
+    }
+
+    public void setBasisClassification(String basisClassification) {
+        this.basisClassification = basisClassification;
+    }
+
+    public String getBasisFailureCause() {
+        return basisFailureCause;
+    }
+
+    public void setBasisFailureCause(String basisFailureCause) {
+        this.basisFailureCause = basisFailureCause;
+    }
+
+    public String getBasisResults() {
+        return basisResults;
+    }
+
+    public void setBasisResults(String basisResults) {
+        this.basisResults = basisResults;
+    }
+
+    public String getBasisPoint() {
+        return basisPoint;
+    }
+
+    public void setBasisPoint(String basisPoint) {
+        this.basisPoint = basisPoint;
+    }
+
+    public String getBasisNalysis() {
+        return basisNalysis;
+    }
+
+    public void setBasisNalysis(String basisNalysis) {
+        this.basisNalysis = basisNalysis;
+    }
+
+    public String getBasisContent() {
+        return basisContent;
+    }
+
+    public void setBasisContent(String basisContent) {
+        this.basisContent = basisContent;
+    }
+
+    public String getBasisCreate_time() {
+        return basisCreate_time;
+    }
+
+    public void setBasisCreate_time(String basisCreate_time) {
+        this.basisCreate_time = basisCreate_time;
+    }
+
+    public String getBasisUpdateTime() {
+        return basisUpdateTime;
+    }
+
+    public void setBasisUpdateTime(String basisUpdateTime) {
+        this.basisUpdateTime = basisUpdateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/FactoryInfo.java

@@ -1,48 +1,48 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 工厂信息表
- * Created by Administrator on 2018/7/11.
- */
-public class FactoryInfo implements Serializable{
-    private static final long serialVersionUID = -823097103866425176L;
-    private Integer factoryId;//主键
-    private String factoryName;//工厂名称
-    private String factoryDesc;//工厂备注
-    private Date factoryCreateDate;//创建时间
-
-    public Integer getFactoryId() {
-        return factoryId;
-    }
-
-    public void setFactoryId(Integer factoryId) {
-        this.factoryId = factoryId;
-    }
-
-    public String getFactoryName() {
-        return factoryName;
-    }
-
-    public void setFactoryName(String factoryName) {
-        this.factoryName = factoryName;
-    }
-
-    public String getFactoryDesc() {
-        return factoryDesc;
-    }
-
-    public void setFactoryDesc(String factoryDesc) {
-        this.factoryDesc = factoryDesc;
-    }
-
-    public Date getFactoryCreateDate() {
-        return factoryCreateDate;
-    }
-
-    public void setFactoryCreateDate(Date factoryCreateDate) {
-        this.factoryCreateDate = factoryCreateDate;
-    }
-}
+package com.iamberry.rst.core.fm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 工厂信息表
+ * Created by Administrator on 2018/7/11.
+ */
+public class FactoryInfo implements Serializable{
+    private static final long serialVersionUID = -823097103866425176L;
+    private Integer factoryId;//主键
+    private String factoryName;//工厂名称
+    private String factoryDesc;//工厂备注
+    private Date factoryCreateDate;//创建时间
+
+    public Integer getFactoryId() {
+        return factoryId;
+    }
+
+    public void setFactoryId(Integer factoryId) {
+        this.factoryId = factoryId;
+    }
+
+    public String getFactoryName() {
+        return factoryName;
+    }
+
+    public void setFactoryName(String factoryName) {
+        this.factoryName = factoryName;
+    }
+
+    public String getFactoryDesc() {
+        return factoryDesc;
+    }
+
+    public void setFactoryDesc(String factoryDesc) {
+        this.factoryDesc = factoryDesc;
+    }
+
+    public Date getFactoryCreateDate() {
+        return factoryCreateDate;
+    }
+
+    public void setFactoryCreateDate(Date factoryCreateDate) {
+        this.factoryCreateDate = factoryCreateDate;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/InventoryInfo.java

@@ -1,84 +1,84 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 工厂-库存表
- * Created by Administrator on 2018/8/14.
- */
-public class InventoryInfo implements Serializable{
-    private static final long serialVersionUID = 4067885659182190574L;
-    private Integer inventoryId;
-    private String inventoryProductName;//产品名称
-    private String inventoryProductBar;//产品sku
-    private Integer inventoryRemainingNum;//库存剩余数量
-    private Integer inventoryState;//1.正在使用 2.暂停使用
-    private String inventoryDesc;//备注
-    private Date inventoryCreateTime;//创建时间
-    private Date inventoryUpdateTime;//修改时间
-
-    public Integer getInventoryId() {
-        return inventoryId;
-    }
-
-    public void setInventoryId(Integer inventoryId) {
-        this.inventoryId = inventoryId;
-    }
-
-    public String getInventoryProductName() {
-        return inventoryProductName;
-    }
-
-    public void setInventoryProductName(String inventoryProductName) {
-        this.inventoryProductName = inventoryProductName;
-    }
-
-    public String getInventoryProductBar() {
-        return inventoryProductBar;
-    }
-
-    public void setInventoryProductBar(String inventoryProductBar) {
-        this.inventoryProductBar = inventoryProductBar;
-    }
-
-    public Integer getInventoryRemainingNum() {
-        return inventoryRemainingNum;
-    }
-
-    public void setInventoryRemainingNum(Integer inventoryRemainingNum) {
-        this.inventoryRemainingNum = inventoryRemainingNum;
-    }
-
-    public Integer getInventoryState() {
-        return inventoryState;
-    }
-
-    public void setInventoryState(Integer inventoryState) {
-        this.inventoryState = inventoryState;
-    }
-
-    public String getInventoryDesc() {
-        return inventoryDesc;
-    }
-
-    public void setInventoryDesc(String inventoryDesc) {
-        this.inventoryDesc = inventoryDesc;
-    }
-
-    public Date getInventoryCreateTime() {
-        return inventoryCreateTime;
-    }
-
-    public void setInventoryCreateTime(Date inventoryCreateTime) {
-        this.inventoryCreateTime = inventoryCreateTime;
-    }
-
-    public Date getInventoryUpdateTime() {
-        return inventoryUpdateTime;
-    }
-
-    public void setInventoryUpdateTime(Date inventoryUpdateTime) {
-        this.inventoryUpdateTime = inventoryUpdateTime;
-    }
-}
+package com.iamberry.rst.core.fm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 工厂-库存表
+ * Created by Administrator on 2018/8/14.
+ */
+public class InventoryInfo implements Serializable{
+    private static final long serialVersionUID = 4067885659182190574L;
+    private Integer inventoryId;
+    private String inventoryProductName;//产品名称
+    private String inventoryProductBar;//产品sku
+    private Integer inventoryRemainingNum;//库存剩余数量
+    private Integer inventoryState;//1.正在使用 2.暂停使用
+    private String inventoryDesc;//备注
+    private Date inventoryCreateTime;//创建时间
+    private Date inventoryUpdateTime;//修改时间
+
+    public Integer getInventoryId() {
+        return inventoryId;
+    }
+
+    public void setInventoryId(Integer inventoryId) {
+        this.inventoryId = inventoryId;
+    }
+
+    public String getInventoryProductName() {
+        return inventoryProductName;
+    }
+
+    public void setInventoryProductName(String inventoryProductName) {
+        this.inventoryProductName = inventoryProductName;
+    }
+
+    public String getInventoryProductBar() {
+        return inventoryProductBar;
+    }
+
+    public void setInventoryProductBar(String inventoryProductBar) {
+        this.inventoryProductBar = inventoryProductBar;
+    }
+
+    public Integer getInventoryRemainingNum() {
+        return inventoryRemainingNum;
+    }
+
+    public void setInventoryRemainingNum(Integer inventoryRemainingNum) {
+        this.inventoryRemainingNum = inventoryRemainingNum;
+    }
+
+    public Integer getInventoryState() {
+        return inventoryState;
+    }
+
+    public void setInventoryState(Integer inventoryState) {
+        this.inventoryState = inventoryState;
+    }
+
+    public String getInventoryDesc() {
+        return inventoryDesc;
+    }
+
+    public void setInventoryDesc(String inventoryDesc) {
+        this.inventoryDesc = inventoryDesc;
+    }
+
+    public Date getInventoryCreateTime() {
+        return inventoryCreateTime;
+    }
+
+    public void setInventoryCreateTime(Date inventoryCreateTime) {
+        this.inventoryCreateTime = inventoryCreateTime;
+    }
+
+    public Date getInventoryUpdateTime() {
+        return inventoryUpdateTime;
+    }
+
+    public void setInventoryUpdateTime(Date inventoryUpdateTime) {
+        this.inventoryUpdateTime = inventoryUpdateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/InventoryLog.java

@@ -1,112 +1,112 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 工厂-库存日志表
- * Created by Administrator on 2018/8/14.
- */
-public class InventoryLog implements Serializable {
-    private static final long serialVersionUID = 4726786119194494939L;
-    private Integer logId;//
-    private String logProductName;//产品名称
-    private String logProductBar;//产品sku
-    private Integer logWarehouseId;//仓库id
-    private Integer logRemainingNum;//变动数量
-    private Integer logType;//类型1.采购 2.发货 3.次品
-    private Integer logOperationType;//操作类型 增加/减少
-    private String logDesc;//备注
-    private Date logCreateTime;//创建时间
-    private Date logUpdateTime;//修改时间
-
-    private String logWarehouseName;//仓库名称
-
-    public Integer getLogId() {
-        return logId;
-    }
-
-    public void setLogId(Integer logId) {
-        this.logId = logId;
-    }
-
-    public String getLogProductName() {
-        return logProductName;
-    }
-
-    public void setLogProductName(String logProductName) {
-        this.logProductName = logProductName;
-    }
-
-    public String getLogProductBar() {
-        return logProductBar;
-    }
-
-    public void setLogProductBar(String logProductBar) {
-        this.logProductBar = logProductBar;
-    }
-
-    public Integer getLogWarehouseId() {
-        return logWarehouseId;
-    }
-
-    public void setLogWarehouseId(Integer logWarehouseId) {
-        this.logWarehouseId = logWarehouseId;
-    }
-
-    public Integer getLogRemainingNum() {
-        return logRemainingNum;
-    }
-
-    public void setLogRemainingNum(Integer logRemainingNum) {
-        this.logRemainingNum = logRemainingNum;
-    }
-
-    public Integer getLogType() {
-        return logType;
-    }
-
-    public void setLogType(Integer logType) {
-        this.logType = logType;
-    }
-
-    public Integer getLogOperationType() {
-        return logOperationType;
-    }
-
-    public void setLogOperationType(Integer logOperationType) {
-        this.logOperationType = logOperationType;
-    }
-
-    public String getLogDesc() {
-        return logDesc;
-    }
-
-    public void setLogDesc(String logDesc) {
-        this.logDesc = logDesc;
-    }
-
-    public Date getLogCreateTime() {
-        return logCreateTime;
-    }
-
-    public void setLogCreateTime(Date logCreateTime) {
-        this.logCreateTime = logCreateTime;
-    }
-
-    public Date getLogUpdateTime() {
-        return logUpdateTime;
-    }
-
-    public void setLogUpdateTime(Date logUpdateTime) {
-        this.logUpdateTime = logUpdateTime;
-    }
-
-    public String getLogWarehouseName() {
-        return logWarehouseName;
-    }
-
-    public void setLogWarehouseName(String logWarehouseName) {
-        this.logWarehouseName = logWarehouseName;
-    }
-}
+package com.iamberry.rst.core.fm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 工厂-库存日志表
+ * Created by Administrator on 2018/8/14.
+ */
+public class InventoryLog implements Serializable {
+    private static final long serialVersionUID = 4726786119194494939L;
+    private Integer logId;//
+    private String logProductName;//产品名称
+    private String logProductBar;//产品sku
+    private Integer logWarehouseId;//仓库id
+    private Integer logRemainingNum;//变动数量
+    private Integer logType;//类型1.采购 2.发货 3.次品
+    private Integer logOperationType;//操作类型 增加/减少
+    private String logDesc;//备注
+    private Date logCreateTime;//创建时间
+    private Date logUpdateTime;//修改时间
+
+    private String logWarehouseName;//仓库名称
+
+    public Integer getLogId() {
+        return logId;
+    }
+
+    public void setLogId(Integer logId) {
+        this.logId = logId;
+    }
+
+    public String getLogProductName() {
+        return logProductName;
+    }
+
+    public void setLogProductName(String logProductName) {
+        this.logProductName = logProductName;
+    }
+
+    public String getLogProductBar() {
+        return logProductBar;
+    }
+
+    public void setLogProductBar(String logProductBar) {
+        this.logProductBar = logProductBar;
+    }
+
+    public Integer getLogWarehouseId() {
+        return logWarehouseId;
+    }
+
+    public void setLogWarehouseId(Integer logWarehouseId) {
+        this.logWarehouseId = logWarehouseId;
+    }
+
+    public Integer getLogRemainingNum() {
+        return logRemainingNum;
+    }
+
+    public void setLogRemainingNum(Integer logRemainingNum) {
+        this.logRemainingNum = logRemainingNum;
+    }
+
+    public Integer getLogType() {
+        return logType;
+    }
+
+    public void setLogType(Integer logType) {
+        this.logType = logType;
+    }
+
+    public Integer getLogOperationType() {
+        return logOperationType;
+    }
+
+    public void setLogOperationType(Integer logOperationType) {
+        this.logOperationType = logOperationType;
+    }
+
+    public String getLogDesc() {
+        return logDesc;
+    }
+
+    public void setLogDesc(String logDesc) {
+        this.logDesc = logDesc;
+    }
+
+    public Date getLogCreateTime() {
+        return logCreateTime;
+    }
+
+    public void setLogCreateTime(Date logCreateTime) {
+        this.logCreateTime = logCreateTime;
+    }
+
+    public Date getLogUpdateTime() {
+        return logUpdateTime;
+    }
+
+    public void setLogUpdateTime(Date logUpdateTime) {
+        this.logUpdateTime = logUpdateTime;
+    }
+
+    public String getLogWarehouseName() {
+        return logWarehouseName;
+    }
+
+    public void setLogWarehouseName(String logWarehouseName) {
+        this.logWarehouseName = logWarehouseName;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SignclosedProductInfo.java

@@ -1,123 +1,123 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 客诉-签收产品表
- * @author LJK
- * @company 深圳爱贝源科技有限公司
- * @date 2017/6/22 16:05
- */
-public class SignclosedProductInfo implements Serializable {
-    private static final long serialVersionUID = -6594014149889308912L;
-    private Integer productId;//id
-    private Integer signclosedId;//签收id
-    private String productName;//产品名称
-    private Integer productNum;//产品数量
-    private Date signclosedCreateTime;//创建时间
-    private Date signclosedUpdateTime;//修改时间
-    private Integer signclosedProductType;//1 产品  2配件
-    private Integer signclosedProductId;//关联产品id  （根据产品类型判断）
-    private Integer signclosedProductColor;//关联产品颜色id
-    private String machineNo;//机器编号
-
-    private String colorName;//颜色名称
-    private String productNumber;//产品型号
-
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    public Integer getSignclosedId() {
-        return signclosedId;
-    }
-
-    public void setSignclosedId(Integer signclosedId) {
-        this.signclosedId = signclosedId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public Integer getProductNum() {
-        return productNum;
-    }
-
-    public void setProductNum(Integer productNum) {
-        this.productNum = productNum;
-    }
-
-    public Date getSignclosedCreateTime() {
-        return signclosedCreateTime;
-    }
-
-    public void setSignclosedCreateTime(Date signclosedCreateTime) {
-        this.signclosedCreateTime = signclosedCreateTime;
-    }
-
-    public Date getSignclosedUpdateTime() {
-        return signclosedUpdateTime;
-    }
-
-    public void setSignclosedUpdateTime(Date signclosedUpdateTime) {
-        this.signclosedUpdateTime = signclosedUpdateTime;
-    }
-
-    public Integer getSignclosedProductType() {
-        return signclosedProductType;
-    }
-
-    public void setSignclosedProductType(Integer signclosedProductType) {
-        this.signclosedProductType = signclosedProductType;
-    }
-
-    public Integer getSignclosedProductId() {
-        return signclosedProductId;
-    }
-
-    public void setSignclosedProductId(Integer signclosedProductId) {
-        this.signclosedProductId = signclosedProductId;
-    }
-
-    public Integer getSignclosedProductColor() {
-        return signclosedProductColor;
-    }
-
-    public void setSignclosedProductColor(Integer signclosedProductColor) {
-        this.signclosedProductColor = signclosedProductColor;
-    }
-
-    public String getColorName() {
-        return colorName;
-    }
-
-    public void setColorName(String colorName) {
-        this.colorName = colorName;
-    }
-
-    public String getProductNumber() {
-        return productNumber;
-    }
-
-    public void setProductNumber(String productNumber) {
-        this.productNumber = productNumber;
-    }
-
-    public String getMachineNo() {
-        return machineNo;
-    }
-
-    public void setMachineNo(String machineNo) {
-        this.machineNo = machineNo;
-    }
-}
+package com.iamberry.rst.core.fm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客诉-签收产品表
+ * @author LJK
+ * @company 深圳爱贝源科技有限公司
+ * @date 2017/6/22 16:05
+ */
+public class SignclosedProductInfo implements Serializable {
+    private static final long serialVersionUID = -6594014149889308912L;
+    private Integer productId;//id
+    private Integer signclosedId;//签收id
+    private String productName;//产品名称
+    private Integer productNum;//产品数量
+    private Date signclosedCreateTime;//创建时间
+    private Date signclosedUpdateTime;//修改时间
+    private Integer signclosedProductType;//1 产品  2配件
+    private Integer signclosedProductId;//关联产品id  （根据产品类型判断）
+    private Integer signclosedProductColor;//关联产品颜色id
+    private String machineNo;//机器编号
+
+    private String colorName;//颜色名称
+    private String productNumber;//产品型号
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public Integer getSignclosedId() {
+        return signclosedId;
+    }
+
+    public void setSignclosedId(Integer signclosedId) {
+        this.signclosedId = signclosedId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public Integer getProductNum() {
+        return productNum;
+    }
+
+    public void setProductNum(Integer productNum) {
+        this.productNum = productNum;
+    }
+
+    public Date getSignclosedCreateTime() {
+        return signclosedCreateTime;
+    }
+
+    public void setSignclosedCreateTime(Date signclosedCreateTime) {
+        this.signclosedCreateTime = signclosedCreateTime;
+    }
+
+    public Date getSignclosedUpdateTime() {
+        return signclosedUpdateTime;
+    }
+
+    public void setSignclosedUpdateTime(Date signclosedUpdateTime) {
+        this.signclosedUpdateTime = signclosedUpdateTime;
+    }
+
+    public Integer getSignclosedProductType() {
+        return signclosedProductType;
+    }
+
+    public void setSignclosedProductType(Integer signclosedProductType) {
+        this.signclosedProductType = signclosedProductType;
+    }
+
+    public Integer getSignclosedProductId() {
+        return signclosedProductId;
+    }
+
+    public void setSignclosedProductId(Integer signclosedProductId) {
+        this.signclosedProductId = signclosedProductId;
+    }
+
+    public Integer getSignclosedProductColor() {
+        return signclosedProductColor;
+    }
+
+    public void setSignclosedProductColor(Integer signclosedProductColor) {
+        this.signclosedProductColor = signclosedProductColor;
+    }
+
+    public String getColorName() {
+        return colorName;
+    }
+
+    public void setColorName(String colorName) {
+        this.colorName = colorName;
+    }
+
+    public String getProductNumber() {
+        return productNumber;
+    }
+
+    public void setProductNumber(String productNumber) {
+        this.productNumber = productNumber;
+    }
+
+    public String getMachineNo() {
+        return machineNo;
+    }
+
+    public void setMachineNo(String machineNo) {
+        this.machineNo = machineNo;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/WarehouseInfo.java

@@ -1,57 +1,57 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 仓库表
- * Created by Administrator on 2018/7/11.
- */
-public class WarehouseInfo implements Serializable {
-    private static final long serialVersionUID = 8272776376340335251L;
-    private Integer warehouseId;
-    private Integer factoryId;//关联工厂id
-    private String warehouseName;//仓库名称
-    private String warehouseDesc;//仓库简介
-    private Date warehouseCreateDate;//创建时间
-
-    public Integer getWarehouseId() {
-        return warehouseId;
-    }
-
-    public void setWarehouseId(Integer warehouseId) {
-        this.warehouseId = warehouseId;
-    }
-
-    public Integer getFactoryId() {
-        return factoryId;
-    }
-
-    public void setFactoryId(Integer factoryId) {
-        this.factoryId = factoryId;
-    }
-
-    public String getWarehouseName() {
-        return warehouseName;
-    }
-
-    public void setWarehouseName(String warehouseName) {
-        this.warehouseName = warehouseName;
-    }
-
-    public String getWarehouseDesc() {
-        return warehouseDesc;
-    }
-
-    public void setWarehouseDesc(String warehouseDesc) {
-        this.warehouseDesc = warehouseDesc;
-    }
-
-    public Date getWarehouseCreateDate() {
-        return warehouseCreateDate;
-    }
-
-    public void setWarehouseCreateDate(Date warehouseCreateDate) {
-        this.warehouseCreateDate = warehouseCreateDate;
-    }
-}
+package com.iamberry.rst.core.fm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 仓库表
+ * Created by Administrator on 2018/7/11.
+ */
+public class WarehouseInfo implements Serializable {
+    private static final long serialVersionUID = 8272776376340335251L;
+    private Integer warehouseId;
+    private Integer factoryId;//关联工厂id
+    private String warehouseName;//仓库名称
+    private String warehouseDesc;//仓库简介
+    private Date warehouseCreateDate;//创建时间
+
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public Integer getFactoryId() {
+        return factoryId;
+    }
+
+    public void setFactoryId(Integer factoryId) {
+        this.factoryId = factoryId;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+
+    public String getWarehouseDesc() {
+        return warehouseDesc;
+    }
+
+    public void setWarehouseDesc(String warehouseDesc) {
+        this.warehouseDesc = warehouseDesc;
+    }
+
+    public Date getWarehouseCreateDate() {
+        return warehouseCreateDate;
+    }
+
+    public void setWarehouseCreateDate(Date warehouseCreateDate) {
+        this.warehouseCreateDate = warehouseCreateDate;
+    }
+}

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

@@ -6,6 +6,7 @@ import com.iamberry.rst.core.cm.BackGoods;
  * 退货service
  * Created by liuzhiwei on 2017/11/8.
  */
+@Deprecated
 public interface BackGoodsService {
 
     /**

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

@@ -0,0 +1,51 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.CmRelation;
+
+import java.util.List;
+
+/**
+ *  售后处理接口
+ * @author
+ * @Date 2018-12-28
+ */
+public interface CmRelationService {
+    /**
+     * 获取集合
+     * @param  cmRelation
+     * @return List
+     */
+    List<CmRelation> getCmRelationList(CmRelation cmRelation);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  cmRelation
+     */
+    CmRelation  getCmRelationById(Integer  id);
+    /**
+     * select relation by customer
+     * @param  id
+     * @return  cmRelation
+     */
+    CmRelation  getCmRelationByCustomerId(Integer  id);
+    /**
+     * 增加数据
+     * @param  cmRelation
+     * @return Integer
+     */
+    Integer  save(CmRelation  cmRelation);
+    /**
+     * 修改数据
+     * @param  cmRelation
+     * @return Integer
+     */
+    Integer  update(CmRelation  cmRelation);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+
+    void getSendAndBackProduct(CmRelation cmRelation);
+}

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

@@ -1,12 +1,8 @@
 package com.iamberry.rst.faces.cm;
 
 import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
-import com.iamberry.rst.core.cm.ComplaintSmallClassInfo;
-import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.page.PagedResult;
 
-import java.util.List;
-
 /**
  * 客诉-客诉问题Service
  */

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

@@ -4,6 +4,7 @@ import com.iamberry.rst.core.cm.*;
 
 import java.util.List;
 
+@Deprecated
 public interface CustomerCommonService {
     /**
      * 获取寄送寄回的产品和配件

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

@@ -1,9 +1,10 @@
 package com.iamberry.rst.faces.cm;
 
 import com.iamberry.rst.core.cm.*;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
+import com.iamberry.rst.core.fm.ComplaintSignclosedInfo;
 import com.iamberry.rst.core.order.ProductType;
 import com.iamberry.rst.core.page.PagedResult;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -18,14 +19,14 @@ public interface CustomerService {
      * @param customerInfo
      * @return
      */
-    Integer saveCustomerInfo(CustomerInfo customerInfo,SalesOrder salesOrder);
+    Integer saveCustomerInfo(CustomerInfo customerInfo, SalesOrder salesOrder);
 
     /**
      * 修改客诉
      * @param customerInfo
      * @return
      */
-    Integer updateCustomerInfo(CustomerInfo customerInfo,SalesOrder salesOrder);
+    Integer updateCustomerInfo(CustomerInfo customerInfo, SalesOrder salesOrder);
     /**
      * 添加订单到efast
      * @param salesOrder
@@ -111,6 +112,10 @@ public interface CustomerService {
     ProductType getcompanyAffiliation(Integer customerId);
 
     /*设置产品，配件参数*/
+    void setName(CmRelation cr);
+
+    /*设置产品，配件参数*/
+    @Deprecated
     void setName(CustomerCommon cc);
     /**
      * 将原订单生成退货单
@@ -119,31 +124,31 @@ public interface CustomerService {
      * @return
      * @throws Exception
      */
-    void chargebackEfastOrder(CustomerCommon customerCommon, SalesOrder salesOrder,Integer status,Integer returnType);
+    void chargebackEfastOrder(CustomerCommon customerCommon, SalesOrder salesOrder, Integer status, Integer returnType);
     /**
      * 添加仓储
      * @param customerCommon
      * @return
      */
-    void saveComplaintSignclosedInfo(ComplaintSignclosedInfo complaintSignclosedInfo,CustomerCommon customerCommon);
+    void saveComplaintSignclosedInfo(ComplaintSignclosedInfo complaintSignclosedInfo, CustomerCommon customerCommon);
     /**
      * 添加品检
      * @param complaintDetectInfo
      * @param customerCommon
      * @return
      */
-    void saveComplaintDetectInfo(ComplaintDetectInfo complaintDetectInfo,CustomerCommon customerCommon);
+    void saveComplaintDetectInfo(ComplaintDetectInfo complaintDetectInfo, CustomerCommon customerCommon);
     /**
      * 向Efast推送订单  仅换新，维修 ,补发
      * @return
      */
-    Map<String,Object> sendEfastOrder(CustomerCommon customerCommon,SalesOrder salesOrder);
+    Map<String,Object> sendEfastOrder(CustomerCommon customerCommon, SalesOrder salesOrder);
 
     /*查询问题个数*/
     Integer getQuestionNumber(CustomerInfo customerInfo);
 
     /*删除旧的售后信息*/
-    void deleteCustomerAfterSales(CustomerInfo customer);
+    void deleteCustomerAfterSales(CustomerInfo customer, CmRelation cmRelation);
 
     Integer selectNotSolvedCustomer(CustomerInfo customer);
 
@@ -193,4 +198,37 @@ public interface CustomerService {
      * @return
      */
     List<ReturnStatisticsInfo> salesReturnForSecond(SalesOrder salesOrder);
+
+    /**
+     * 查询所有处理类型
+     * @return
+     */
+    List<ProcType> listProcType();
+
+    /**
+     * 根据处理类型查询处理方式
+     * @return
+     */
+    List<ProcMethod> listProcMethod(Integer procTypeId);
+
+    /**
+     * 根据id查询处理方式
+     * @return
+     */
+    ProcMethod getProcMethod(Integer procMethodId);
+
+    /**
+     * 根据id修改处理信息
+     * @return
+     */
+    Integer updateCmRelation(CmRelation cmRelation);
+
+    /**
+     * 查询客诉处理信息
+     * @param cmRelation
+     * @return
+     */
+    CmRelation getCmRelationInfo(CmRelation cmRelation);
+
+    Integer updateRelation(CustomerInfo cm);
 }

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

@@ -7,6 +7,7 @@ import java.util.List;
 /**
  * 客诉-产品配件service
  */
+@Deprecated
 public interface FittingsInfoService {
     /**
      * 添加配件信息

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

@@ -1,8 +1,7 @@
 package com.iamberry.rst.faces.cm;
 
-import com.iamberry.rst.core.cm.FactoryInfo;
-import com.iamberry.rst.core.cm.InventoryLog;
-import com.iamberry.rst.core.cm.WarehouseInfo;
+import com.iamberry.rst.core.fm.InventoryLog;
+import com.iamberry.rst.core.fm.WarehouseInfo;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 

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

@@ -1,10 +1,8 @@
 package com.iamberry.rst.faces.cm;
-import com.iamberry.rst.core.cm.InventoryInfo;
+import com.iamberry.rst.core.fm.InventoryInfo;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 
-import java.util.List;
-
 /**
  * Created by Administrator on 2018/8/15.
  */

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

@@ -5,6 +5,7 @@ import com.iamberry.rst.core.cm.NoreasonBack;
 /**
  * Created by liuzhiwei on 2017/11/14.
  */
+@Deprecated
 public interface NoreasonBackService {
 
     /**

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

@@ -0,0 +1,43 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.ProcMethod;
+
+import java.util.List;
+
+/**
+ *  处理方式接口
+ * @author
+ * @Date 2018-12-28
+ */
+public interface ProcMethodService {
+    /**
+     * 获取集合
+     * @param  procMethod
+     * @return List
+     */
+    List<ProcMethod> getProcMethodList(ProcMethod  procMethod);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  procMethod
+     */
+    ProcMethod  getProcMethodById(Integer  id);
+    /**
+     * 增加数据
+     * @param  procMethod
+     * @return Integer
+     */
+    Integer  save(ProcMethod  procMethod);
+    /**
+     * 修改数据
+     * @param  procMethod
+     * @return Integer
+     */
+    Integer  update(ProcMethod  procMethod);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

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

@@ -0,0 +1,43 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.ProcType;
+
+import java.util.List;
+
+/**
+ *  处理方式类型接口
+ * @author
+ * @Date 2018-12-28
+ */
+public interface ProcTypeService {
+    /**
+     * 获取集合
+     * @param  procType
+     * @return List
+     */
+    List<ProcType> getProcTypeList(ProcType  procType);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  procType
+     */
+    ProcType  getProcTypeById(Integer  id);
+    /**
+     * 增加数据
+     * @param  procType
+     * @return Integer
+     */
+    Integer  save(ProcType procType);
+    /**
+     * 修改数据
+     * @param  procType
+     * @return Integer
+     */
+    Integer  update(ProcType  procType);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

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

@@ -7,6 +7,7 @@ import java.util.List;
 /**
  * Created by Administrator on 2017/11/9.
  */
+@Deprecated
 public interface ReissueService {
 
     /**

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

@@ -49,6 +49,14 @@ public interface RelationOrderService {
     Integer  deleteByRelationId(Integer  relationId);
 
     /**
+     * 删除数据 by relationId
+     * @param  relationOrder
+     * @return Integer
+     */
+    Integer  deleteByRelationOrder(RelationOrder  relationOrder);
+
+
+    /**
      * 增加数据 <集合>
      * @param  relationOrderList
      * @return Integer

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

@@ -9,6 +9,7 @@ import java.util.List;
  * 换新service
  * Created by liuzhiwei on 2017/11/7.
  */
+@Deprecated
 public interface RenewedService {
 
     /**

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

@@ -8,6 +8,7 @@ import java.util.List;
  * 维修Service
  * Created by liuzhiwei on 2017/11/8.
  */
+@Deprecated
 public interface RepairService {
 
     /**

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

@@ -1,37 +1,36 @@
-package com.iamberry.rst.faces.cm;
-
-import com.iamberry.rst.core.cm.AwaitingSignclosedProductInfo;
-import com.iamberry.rst.core.cm.SignclosedProductInfo;
-
-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);
+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);
 }

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

@@ -1,60 +1,59 @@
-package com.iamberry.rst.faces.cm;
-
-import com.iamberry.rst.core.cm.ComplaintDetectInfo;
-import com.iamberry.rst.core.cm.ComplaintDetectItem;
-import com.iamberry.rst.core.cm.DetectionBasis;
-import com.iamberry.rst.core.order.Order;
-import com.iamberry.rst.core.page.PageRequest;
-import com.iamberry.rst.core.page.PagedResult;
-
-import java.util.List;
-
-/**
- * 客诉-品质检测产品service
- */
-public interface ComplaintDetectInfoService {
-    /**
-     * 添加单个品质检测产品
-     * @return
-     */
-    int insert(ComplaintDetectInfo record);
-    /**
-     * 查询单个品质检测产品
-     * @return
-     */
-    ComplaintDetectItem getDetectItemById(Integer detectId);
-    /**
-     * 修改单个待品质检测产品
-     * @return
-     */
-    int updateDetectItemById(ComplaintDetectItem record);
-
-
-    /**
-     * 获取品质检测列表
-     * @return
-     */
-    PagedResult<ComplaintDetectItem> listComplaintDetectItem(PageRequest<ComplaintDetectItem> pageRequest);
-
-    /**
-     * 根据客诉id、查询品检信息
-     * @return
-     */
-    ComplaintDetectInfo getDetectByCustomerId(Integer customerId);
-    /**
-     * 添加品检项
-     * @return
-     */
-    int insertItem(ComplaintDetectItem complaintDetectItem);
-    /**
-     * 删除品检项
-     * @return
-     */
-    int deleteDetectItem(Integer detectItemId);
-
-    /**
-     * 查询检测内容
-     * @return
-     */
-    List<DetectionBasis> listDetectionBasis(DetectionBasis detectionBasis);
+package com.iamberry.rst.faces.fm;
+
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
+import com.iamberry.rst.core.fm.ComplaintDetectItem;
+import com.iamberry.rst.core.fm.DetectionBasis;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+
+import java.util.List;
+
+/**
+ * 客诉-品质检测产品service
+ */
+public interface ComplaintDetectInfoService {
+    /**
+     * 添加单个品质检测产品
+     * @return
+     */
+    int insert(ComplaintDetectInfo record);
+    /**
+     * 查询单个品质检测产品
+     * @return
+     */
+    ComplaintDetectItem getDetectItemById(Integer detectId);
+    /**
+     * 修改单个待品质检测产品
+     * @return
+     */
+    int updateDetectItemById(ComplaintDetectItem record);
+
+
+    /**
+     * 获取品质检测列表
+     * @return
+     */
+    PagedResult<ComplaintDetectItem> listComplaintDetectItem(PageRequest<ComplaintDetectItem> pageRequest);
+
+    /**
+     * 根据客诉id、查询品检信息
+     * @return
+     */
+    ComplaintDetectInfo getDetectByCustomerId(Integer customerId);
+    /**
+     * 添加品检项
+     * @return
+     */
+    int insertItem(ComplaintDetectItem complaintDetectItem);
+    /**
+     * 删除品检项
+     * @return
+     */
+    int deleteDetectItem(Integer detectItemId);
+
+    /**
+     * 查询检测内容
+     * @return
+     */
+    List<DetectionBasis> listDetectionBasis(DetectionBasis detectionBasis);
 }

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

@@ -1,33 +1,32 @@
-package com.iamberry.rst.faces.cm;
-
-import com.iamberry.rst.core.cm.ComplaintMaintenanceInfo;
-import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
-import com.iamberry.rst.core.page.PageRequest;
-import com.iamberry.rst.core.page.PagedResult;
-
-/**
- * 客诉-生产维修Service
- */
-public interface ComplaintMaintenanceInfoService {
-    /**
-     * 添加单个品质检测产品
-     * @return
-     */
-    int insert(ComplaintMaintenanceInfo record);
-    /**
-     * 查询单个品质检测产品
-     * @return
-     */
-    ComplaintMaintenanceInfo getMaintenanceByid(Integer maintenanceId);
-    /**
-     * 修改单个品质检测产品
-     * @return
-     */
-    int updateMaintenanceById(ComplaintMaintenanceInfo record);
-
-    /**
-     * 查询多个品质检测产品
-     * @return
-     */
-    PagedResult<ComplaintMaintenanceInfo> listMaintenance(PageRequest<ComplaintMaintenanceInfo> pageRequest);
+package com.iamberry.rst.faces.fm;
+
+import com.iamberry.rst.core.fm.ComplaintMaintenanceInfo;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+
+/**
+ * 客诉-生产维修Service
+ */
+public interface ComplaintMaintenanceInfoService {
+    /**
+     * 添加单个品质检测产品
+     * @return
+     */
+    int insert(ComplaintMaintenanceInfo record);
+    /**
+     * 查询单个品质检测产品
+     * @return
+     */
+    ComplaintMaintenanceInfo getMaintenanceByid(Integer maintenanceId);
+    /**
+     * 修改单个品质检测产品
+     * @return
+     */
+    int updateMaintenanceById(ComplaintMaintenanceInfo record);
+
+    /**
+     * 查询多个品质检测产品
+     * @return
+     */
+    PagedResult<ComplaintMaintenanceInfo> listMaintenance(PageRequest<ComplaintMaintenanceInfo> pageRequest);
 }

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

@@ -1,64 +1,63 @@
-package com.iamberry.rst.faces.cm;
-
-import com.iamberry.rst.core.cm.ComplaintDetectInfo;
-import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
-import com.iamberry.rst.core.cm.SignclosedProductInfo;
-import com.iamberry.rst.core.page.PageRequest;
-import com.iamberry.rst.core.page.PagedResult;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 客诉-签收表Service
- */
-public interface ComplaintSignclosedInfoService {
-    /**
-     * 添加单个签收记录
-     * @return
-     */
-    boolean insert(ComplaintSignclosedInfo record,String orderItemString);
-    /**
-     * 查询单个签收记录
-     * @return
-     */
-    ComplaintSignclosedInfo getSignclosedById(Integer signclosedId);
-    /**
-     * 修改单个签收记录
-     * @return
-     */
-    boolean updateSignclosedById(ComplaintSignclosedInfo record,
-                             Map<String,Integer> alreadyColorMap,
-                             Map<String,String[]> machineNumberMap,
-                             Map<String,Integer> alreadyFittingsMap);
-
-    /**
-     * 修改单个签收记录
-     * @return
-     */
-    Integer updateSignclosedById(ComplaintSignclosedInfo record);
-
-    /**
-     * 修改单个签收记录
-     * @return
-     */
-    Integer updateSignclosedByCustomerId(ComplaintSignclosedInfo record);
-
-    /**
-     * 查询多个签收记录
-     * @return
-     */
-    PagedResult<ComplaintSignclosedInfo> listSignclosed(PageRequest<ComplaintSignclosedInfo> pageRequest);
-
-    /**
-     * 添加品质信息
-     * @return
-     */
-    int addDetect(ComplaintSignclosedInfo record);
-
-    /**
-     * 查询签收产品集合
-     * @return
-     */
-    List<SignclosedProductInfo> listSignclosedById(Integer signclosedId);
+package com.iamberry.rst.faces.fm;
+
+import com.iamberry.rst.core.fm.ComplaintSignclosedInfo;
+import com.iamberry.rst.core.fm.SignclosedProductInfo;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 客诉-签收表Service
+ */
+public interface ComplaintSignclosedInfoService {
+    /**
+     * 添加单个签收记录
+     * @return
+     */
+    boolean insert(ComplaintSignclosedInfo record,String orderItemString);
+    /**
+     * 查询单个签收记录
+     * @return
+     */
+    ComplaintSignclosedInfo getSignclosedById(Integer signclosedId);
+    /**
+     * 修改单个签收记录
+     * @return
+     */
+    boolean updateSignclosedById(ComplaintSignclosedInfo record,
+                             Map<String,Integer> alreadyColorMap,
+                             Map<String,String[]> machineNumberMap,
+                             Map<String,Integer> alreadyFittingsMap);
+
+    /**
+     * 修改单个签收记录
+     * @return
+     */
+    Integer updateSignclosedById(ComplaintSignclosedInfo record);
+
+    /**
+     * 修改单个签收记录
+     * @return
+     */
+    Integer updateSignclosedByCustomerId(ComplaintSignclosedInfo record);
+
+    /**
+     * 查询多个签收记录
+     * @return
+     */
+    PagedResult<ComplaintSignclosedInfo> listSignclosed(PageRequest<ComplaintSignclosedInfo> pageRequest);
+
+    /**
+     * 添加品质信息
+     * @return
+     */
+    int addDetect(ComplaintSignclosedInfo record);
+
+    /**
+     * 查询签收产品集合
+     * @return
+     */
+    List<SignclosedProductInfo> listSignclosedById(Integer signclosedId);
 }

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

@@ -1,38 +1,38 @@
-package com.iamberry.rst.faces.cm;
-
-import com.iamberry.rst.core.cm.SignclosedProductInfo;
-
-import java.util.List;
-
-/**
- * 客诉-签收产品表Service
- */
-public interface ComplaintSignclosedProductInfoService {
-    /**
-     * 添加单个签收产品记录
-     * @return
-     */
-    int insert(SignclosedProductInfo record);
-    /**
-     * 查询单个签收产品记录
-     * @return
-     */
-    SignclosedProductInfo getSignclosedById(Integer productId);
-
-    /**
-     * 查询多个签收产品记录
-     * @return
-     */
-    List<SignclosedProductInfo> listSignclosedById(Integer signclosedId);
-    /**
-     * 修改单个签收产品记录
-     * @return
-     */
-    int updateSignclosedById(SignclosedProductInfo record);
-
-    /**
-     * 查询单个签收产品
-     * @return
-     */
-    SignclosedProductInfo listSignclosedProductInfoById(Integer productid);
+package com.iamberry.rst.faces.fm;
+
+import com.iamberry.rst.core.fm.SignclosedProductInfo;
+
+import java.util.List;
+
+/**
+ * 客诉-签收产品表Service
+ */
+public interface ComplaintSignclosedProductInfoService {
+    /**
+     * 添加单个签收产品记录
+     * @return
+     */
+    int insert(SignclosedProductInfo record);
+    /**
+     * 查询单个签收产品记录
+     * @return
+     */
+    SignclosedProductInfo getSignclosedById(Integer productId);
+
+    /**
+     * 查询多个签收产品记录
+     * @return
+     */
+    List<SignclosedProductInfo> listSignclosedById(Integer signclosedId);
+    /**
+     * 修改单个签收产品记录
+     * @return
+     */
+    int updateSignclosedById(SignclosedProductInfo record);
+
+    /**
+     * 查询单个签收产品
+     * @return
+     */
+    SignclosedProductInfo listSignclosedProductInfoById(Integer productid);
 }

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

@@ -1,33 +1,33 @@
-package com.iamberry.rst.faces.cm;
-
-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);
-
+package com.iamberry.rst.faces.fm;
+
+import com.iamberry.rst.core.fm.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-service/src/main/java/com/iamberry/rst/service/cm/BackGoodsServiceImpl.java

@@ -77,16 +77,20 @@ public class BackGoodsServiceImpl implements BackGoodsService {
             //批量添加寄回配件
             fittingNum = closedFittingMapper.insert(fittingList);
         }*/
-        int num = backGoodsMapper.updateBackGoods(record);
-        if (num > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+        
+        // TODO: 2018/12/28
+//        int num = backGoodsMapper.updateBackGoods(record);
+//        if (num > 0) {
+//            return 1;
+//        } else {
+//            return 0;
+//        }
+        return 0;
     }
 
     @Override
     public BackGoods getBackGoods(BackGoods backGoods) {
-        return backGoodsMapper.getBackGoods(backGoods);
+//        return backGoodsMapper.getBackGoods(backGoods);
+        return null;
     }
 }

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

@@ -0,0 +1,93 @@
+package com.iamberry.rst.service.cm;
+
+import com.iamberry.rst.core.cm.ClosedProdcue;
+import com.iamberry.rst.core.cm.CmRelation;
+import com.iamberry.rst.core.cm.SendProdcue;
+import com.iamberry.rst.faces.cm.CmRelationService;
+import com.iamberry.rst.service.cm.mapper.ClosedProdcueMapper;
+import com.iamberry.rst.service.cm.mapper.CmRelationMapper;
+import com.iamberry.rst.service.cm.mapper.SendProdcueMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  售后处理接口
+ * @author
+ * @Date 2018-12-28
+ */
+@Service
+public class CmRelationServiceImpl  implements CmRelationService {
+    @Autowired
+    private CmRelationMapper cmRelationMapper;
+    @Autowired
+    private ClosedProdcueMapper closedProdcueMapper;
+    @Autowired
+    private SendProdcueMapper sendProdcueMapper;
+
+    /**
+     * 获取集合
+     * @param  cmRelation
+     * @return List
+     */
+    @Override
+    public List<CmRelation> getCmRelationList(CmRelation  cmRelation){
+        return  cmRelationMapper.getCmRelationList(cmRelation);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  cmRelation
+     */
+    @Override
+    public  CmRelation  getCmRelationById(Integer  id){
+        return  cmRelationMapper.getCmRelationById(id);
+    }
+
+    @Override
+    public CmRelation getCmRelationByCustomerId(Integer id) {
+        return  cmRelationMapper.getCmRelationByCustomerId(id);
+    }
+
+    /**
+     * 增加数据
+     * @param  cmRelation
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(CmRelation  cmRelation){
+        return  cmRelationMapper.save(cmRelation);
+    }
+    /**
+     * 修改数据
+     * @param  cmRelation
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(CmRelation  cmRelation){
+        return  cmRelationMapper.update(cmRelation);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  cmRelationMapper.delete(id);
+    }
+
+    @Override
+    public void getSendAndBackProduct(CmRelation cmRelation) {
+        ClosedProdcue closedProdcue = new ClosedProdcue();
+        closedProdcue.setRelationId(cmRelation.getRelationId());
+        List<ClosedProdcue>  closedProdcueList = closedProdcueMapper.listclosedProdcue(closedProdcue);
+        cmRelation.setClosedProdcues(closedProdcueList);
+
+        SendProdcue sendProdcue = new SendProdcue();
+        sendProdcue.setRelationId(cmRelation.getRelationId());
+        List<SendProdcue> sendProdcueList = sendProdcueMapper.listSendProdcue(sendProdcue);
+        cmRelation.setSendProdcues(sendProdcueList);
+    }
+}

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

@@ -2,13 +2,9 @@ package com.iamberry.rst.service.cm;
 
 
 import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.approval.ApprovalApplyPick;
-import com.iamberry.rst.core.cm.ComplaintDetectInfo;
 import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
 import com.iamberry.rst.core.page.PagedResult;
-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 com.iamberry.rst.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,11 +1,8 @@
 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;

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

@@ -46,14 +46,8 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
     @Autowired
     private SalesOrderMapper salesOrderMapper;
 
-
     @Override
     public CustomerCommon getListProduceAndFitting(CustomerCommon customerCommon) {
-        ClosedFitting closedFitting = new ClosedFitting();
-        closedFitting.setClosedFittingType(customerCommon.getCustomerIsSolve());
-        closedFitting.setRelationId(customerCommon.getRelationId());
-        customerCommon.setClosedFittings(closedFittingMapper.listClosedFitting(closedFitting));
-
         ClosedProdcue closedProdcue = new ClosedProdcue();
         closedProdcue.setClosedProdcueType(customerCommon.getCustomerIsSolve());
         closedProdcue.setRelationId(customerCommon.getRelationId());
@@ -63,12 +57,6 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
         sendProdcue.setSendProduceType(customerCommon.getCustomerIsSolve());
         sendProdcue.setRelationId(customerCommon.getRelationId());
         customerCommon.setSendProdcues(sendProdcueMapper.listSendProdcue(sendProdcue));
-
-        SendFitting sendFitting = new SendFitting();
-        sendFitting.setSendFittingType(customerCommon.getCustomerIsSolve());
-        sendFitting.setRelationId(customerCommon.getRelationId());
-        customerCommon.setSendFittings(sendFittingMapper.listSendFitting(sendFitting));
-
         return customerCommon;
     }
 
@@ -92,6 +80,18 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
                 }
             }
             c.setSalesOrderList(orderList);
+
+            SendProdcue sendProdcue  = new SendProdcue();
+            sendProdcue.setRelationId(c.getRelationId());
+            sendProdcue.setSendProduceType(c.getCustomerIsSolve()); //sendProduceType
+            List<SendProdcue> sendProdcueList = sendProdcueMapper.listSendProdcue(sendProdcue);
+            c.setSendProdcues(sendProdcueList);
+
+            ClosedProdcue closedProdcue = new ClosedProdcue();
+            closedProdcue.setRelationId(c.getRelationId());
+            closedProdcue.setClosedProdcueType(c.getCustomerIsSolve());
+            List<ClosedProdcue> closedProdcueList = closedProdcueMapper.listclosedProdcue(closedProdcue);
+            c.setClosedProdcues(closedProdcueList);
         }
 
 //        List<CustomerCommon> customerCommonList = new ArrayList<>();
@@ -132,31 +132,31 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
     @Transactional
     public Integer updateCustomerCommon(CustomerCommon customerCommon) {
         Integer flag = 0;
-        switch (customerCommon.getCustomerIsSolve()){
-            case 3:
-                Renewed renewed = (Renewed)CustomerCommonUtil.getRelation(3,customerCommon);
-                flag = renewedMapper.updateRenewedInfo(renewed);
-                break;
-            case 4:
-                Repair repair = (Repair)CustomerCommonUtil.getRelation(4,customerCommon);
-                flag = repairMapper.updateRepairInfo(repair);
-                break;
-            case 5:
-                Reissue reissue = (Reissue)CustomerCommonUtil.getRelation(5,customerCommon);
-                flag = reissueMapper.updateReissueInfo(reissue);
-                break;
-            case 6:
-                BackGoods backGoods = (BackGoods)CustomerCommonUtil.getRelation(6,customerCommon);
-                flag = backGoodsMapper.updateBackGoods(backGoods);
-                break;
-            case 7:
-                NoreasonBack noreasonBack = (NoreasonBack)CustomerCommonUtil.getRelation(7,customerCommon);
-                flag = noreasonBackMapper.updateNoreasonBack(noreasonBack);
-                break;
-            default:
-                flag = 0;
-                break;
-        }
+//        switch (customerCommon.getCustomerIsSolve()){
+//            case 3:
+//                Renewed renewed = (Renewed)CustomerCommonUtil.getRelation(3,customerCommon);
+//                flag = renewedMapper.updateRenewedInfo(renewed);
+//                break;
+//            case 4:
+//                Repair repair = (Repair)CustomerCommonUtil.getRelation(4,customerCommon);
+//                flag = repairMapper.updateRepairInfo(repair);
+//                break;
+//            case 5:
+//                Reissue reissue = (Reissue)CustomerCommonUtil.getRelation(5,customerCommon);
+//                flag = reissueMapper.updateReissueInfo(reissue);
+//                break;
+//            case 6:
+//                BackGoods backGoods = (BackGoods)CustomerCommonUtil.getRelation(6,customerCommon);
+//                flag = backGoodsMapper.updateBackGoods(backGoods);
+//                break;
+//            case 7:
+//                NoreasonBack noreasonBack = (NoreasonBack)CustomerCommonUtil.getRelation(7,customerCommon);
+//                flag = noreasonBackMapper.updateNoreasonBack(noreasonBack);
+//                break;
+//            default:
+//                flag = 0;
+//                break;
+//        }
         return flag;
     }
 

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

@@ -1,9 +1,7 @@
 package com.iamberry.rst.service.cm;
 
 
-import com.iamberry.rst.core.cm.AwaitingSignclosedProductInfo;
 import com.iamberry.rst.core.cm.FittingsInfo;
-import com.iamberry.rst.faces.cm.AwaitingSignclosedProductInfoService;
 import com.iamberry.rst.faces.cm.FittingsInfoService;
 import com.iamberry.rst.service.cm.mapper.FittingsInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,21 +16,25 @@ public class FittingsInfoServiceImpl implements FittingsInfoService {
 
     @Override
     public Integer addFittingsInfo(FittingsInfo fittingsInfo) {
-        return fittingsInfoMapper.addFittingsInfo(fittingsInfo);
+//        return fittingsInfoMapper.addFittingsInfo(fittingsInfo);
+        return null;
     }
 
     @Override
     public FittingsInfo getFittingsById(Integer fittingsId) {
-        return fittingsInfoMapper.getFittingsById(fittingsId);
+//        return fittingsInfoMapper.getFittingsById(fittingsId);
+        return null;
     }
 
     @Override
     public Integer updateFittingsInfo(FittingsInfo fittingsInfo) {
-        return fittingsInfoMapper.updateFittingsInfo(fittingsInfo);
+//        return fittingsInfoMapper.updateFittingsInfo(fittingsInfo);
+        return null;
     }
 
     @Override
     public List<FittingsInfo> listFittings(FittingsInfo fittingsInfo) {
-        return fittingsInfoMapper.listFittings(fittingsInfo);
+//        return fittingsInfoMapper.listFittings(fittingsInfo);
+        return null;
     }
 }

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

@@ -1,14 +1,12 @@
 package com.iamberry.rst.service.cm;
 
 import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
-import com.iamberry.rst.core.cm.FactoryInfo;
-import com.iamberry.rst.core.cm.InventoryLog;
-import com.iamberry.rst.core.cm.WarehouseInfo;
+import com.iamberry.rst.core.fm.InventoryLog;
+import com.iamberry.rst.core.fm.WarehouseInfo;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.faces.cm.InventoryLogService;
-import com.iamberry.rst.service.cm.mapper.InventoryLogMapper;
+import com.iamberry.rst.service.fm.mapper.InventoryLogMapper;
 import com.iamberry.rst.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -2,12 +2,11 @@ package com.iamberry.rst.service.cm;
 
 
 import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.cm.InventoryInfo;
-import com.iamberry.rst.core.cm.InventoryLog;
+import com.iamberry.rst.core.fm.InventoryInfo;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.faces.cm.InventoryService;
-import com.iamberry.rst.service.cm.mapper.InventoryMapper;
+import com.iamberry.rst.service.fm.mapper.InventoryMapper;
 import com.iamberry.rst.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -0,0 +1,65 @@
+package com.iamberry.rst.service.cm;
+
+import com.iamberry.rst.core.cm.ProcMethod;
+import com.iamberry.rst.faces.cm.ProcMethodService;
+import com.iamberry.rst.service.cm.mapper.ProcMethodMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  处理方式接口
+ * @author
+ * @Date 2018-12-28
+ */
+@Service
+public class ProcMethodServiceImpl  implements ProcMethodService {
+    @Autowired
+    private ProcMethodMapper procMethodMapper;
+    /**
+     * 获取集合
+     * @param  procMethod
+     * @return List
+     */
+    @Override
+    public List<ProcMethod> getProcMethodList(ProcMethod  procMethod){
+        return  procMethodMapper.getProcMethodList(procMethod);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  procMethod
+     */
+    @Override
+    public ProcMethod getProcMethodById(Integer  id){
+        return  procMethodMapper.getProcMethodById(id);
+    }
+    /**
+     * 增加数据
+     * @param  procMethod
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(ProcMethod  procMethod){
+        return  procMethodMapper.save(procMethod);
+    }
+    /**
+     * 修改数据
+     * @param  procMethod
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(ProcMethod  procMethod){
+        return  procMethodMapper.update(procMethod);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  procMethodMapper.delete(id);
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.iamberry.rst.service.cm;
+
+import com.iamberry.rst.core.cm.ProcType;
+import com.iamberry.rst.faces.cm.ProcTypeService;
+import com.iamberry.rst.service.cm.mapper.ProcTypeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  处理方式类型接口
+ * @author
+ * @Date 2018-12-28
+ */
+@Service
+public class ProcTypeServiceImpl  implements ProcTypeService {
+    @Autowired
+    private ProcTypeMapper procTypeMapper;
+    /**
+     * 获取集合
+     * @param  procType
+     * @return List
+     */
+    @Override
+    public List<ProcType> getProcTypeList(ProcType  procType){
+        return  procTypeMapper.getProcTypeList(procType);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  procType
+     */
+    @Override
+    public  ProcType  getProcTypeById(Integer  id){
+        return  procTypeMapper.getProcTypeById(id);
+    }
+    /**
+     * 增加数据
+     * @param  procType
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(ProcType procType){
+        return  procTypeMapper.save(procType);
+    }
+    /**
+     * 修改数据
+     * @param  procType
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(ProcType  procType){
+        return  procTypeMapper.update(procType);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  procTypeMapper.delete(id);
+    }
+}

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

@@ -20,16 +20,19 @@ public class ReissueServiceImpl implements ReissueService {
 
     @Override
     public Integer updateReissueInfo(Reissue record) {
-        return reissueMapper.updateReissueInfo(record);
+//        return reissueMapper.updateReissueInfo(record);
+        return null;
     }
 
     @Override
     public List<Reissue> listSynchronizingReissue(Reissue reissue) {
-        return reissueMapper.listSynchronizingReissue(reissue);
+//        return reissueMapper.listSynchronizingReissue(reissue);
+        return null;
     }
 
     @Override
     public Reissue getReissue(Reissue reissue) {
-        return reissueMapper.getReissue(reissue);
+//        return reissueMapper.getReissue(reissue);
+        return null;
     }
 }

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

@@ -68,6 +68,11 @@ public class RelationOrderServiceImpl  implements RelationOrderService {
         return  relationOrderMapper.deleteByRelationId(relationId);
     }
 
+    @Override
+    public Integer deleteByRelationOrder(RelationOrder relationOrder) {
+        return  relationOrderMapper.deleteByRelationOrder(relationOrder);
+    }
+
     /**
      * 增加数据 <集合>
      * @param  relationOrderList

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

@@ -30,74 +30,78 @@ public class RenewedServiceImpl implements RenewedService {
 
     @Override
     public List<ClosedFitting> listClosedFitting(ClosedFitting closedFitting) {
-        return renewedMapper.listClosedFitting(closedFitting);
+//        return renewedMapper.listClosedFitting(closedFitting);
+        return null;
     }
 
     @Override
     public Integer updateRenewedInfo(Renewed record, String closedProducts, String closedFittings) {
-        int productNum = 1;
-        int fittingNum = 1;
-        List<ClosedProdcue> produceList = new ArrayList<ClosedProdcue>();
-        List<ClosedFitting> fittingList = new ArrayList<ClosedFitting>();
-        if (StringUtils.isNotEmpty(closedProducts)) {
-            ClosedProdcue closedProdcue = new ClosedProdcue();
-            closedProdcue.setRelationId(record.getRenewedId());
-            closedProdcue.setClosedProdcueType(3);
-            //删除原有寄回产品
-            int delNum = closedProdcueMapper.deleteProduce(closedProdcue);
-            //去掉最后一个","
-            closedProducts = closedProducts.substring(0,closedProducts.length()-1);
-            String[] products = closedProducts.split(",");
-            for (int i = 0;i < products.length;i++) {
-                String[] colors = products[i].split(":");
-                ClosedProdcue prodcue = new ClosedProdcue();
-                prodcue.setRelationId(record.getRenewedId());
-                prodcue.setClosedProdcueType(3);
-                prodcue.setProductId(Integer.parseInt(colors[0]));
-                prodcue.setColorId(Integer.parseInt(colors[1]));
-                prodcue.setClosedProdcueNumber(Integer.parseInt(colors[2]));
-                produceList.add(prodcue);
-            }
-            //批量添加寄回产品
-            productNum = closedProdcueMapper.insert(produceList);
-        }
-        if (StringUtils.isNotEmpty(closedFittings)) {
-            ClosedFitting closedFitting = new ClosedFitting();
-            closedFitting.setRelationId(record.getRenewedId());
-            closedFitting.setClosedFittingType(3);
-            //删除原有寄回配件信息
-            int delNum = closedFittingMapper.deleteFitting(closedFitting);
-            closedFittings = closedFittings.substring(0,closedFittings.length()-1);
-            String[] fittings = closedFittings.split(",");
-            for (int i = 0;i < fittings.length;i++) {
-                String[] fitting = fittings[i].split(":");
-                ClosedFitting cFitting = new ClosedFitting();
-                cFitting.setRelationId(record.getRenewedId());
-                cFitting.setClosedFittingType(3);
-                cFitting.setProductId(Integer.parseInt(fitting[0]));
-                cFitting.setFittingsId(Integer.parseInt(fitting[1]));
-                cFitting.setClosedFittingNumber(Integer.parseInt(fitting[2]));
-                fittingList.add(cFitting);
-            }
-            //批量添加寄回配件
-            fittingNum = closedFittingMapper.insert(fittingList);
-        }
-        //修改换新信息
-        int num = renewedMapper.updateRenewedInfo(record);
-        if (num > 0 && productNum > 0 && fittingNum > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+//        int productNum = 1;
+//        int fittingNum = 1;
+//        List<ClosedProdcue> produceList = new ArrayList<ClosedProdcue>();
+//        List<ClosedFitting> fittingList = new ArrayList<ClosedFitting>();
+//        if (StringUtils.isNotEmpty(closedProducts)) {
+//            ClosedProdcue closedProdcue = new ClosedProdcue();
+//            closedProdcue.setRelationId(record.getRenewedId());
+//            closedProdcue.setClosedProdcueType(3);
+//            //删除原有寄回产品
+//            int delNum = closedProdcueMapper.deleteProduce(closedProdcue);
+//            //去掉最后一个","
+//            closedProducts = closedProducts.substring(0,closedProducts.length()-1);
+//            String[] products = closedProducts.split(",");
+//            for (int i = 0;i < products.length;i++) {
+//                String[] colors = products[i].split(":");
+//                ClosedProdcue prodcue = new ClosedProdcue();
+//                prodcue.setRelationId(record.getRenewedId());
+//                prodcue.setClosedProdcueType(3);
+//                prodcue.setProductId(Integer.parseInt(colors[0]));
+//                prodcue.setColorId(Integer.parseInt(colors[1]));
+//                prodcue.setClosedProdcueNumber(Integer.parseInt(colors[2]));
+//                produceList.add(prodcue);
+//            }
+//            //批量添加寄回产品
+//            productNum = closedProdcueMapper.insert(produceList);
+//        }
+//        if (StringUtils.isNotEmpty(closedFittings)) {
+//            ClosedFitting closedFitting = new ClosedFitting();
+//            closedFitting.setRelationId(record.getRenewedId());
+//            closedFitting.setClosedFittingType(3);
+//            //删除原有寄回配件信息
+//            int delNum = closedFittingMapper.deleteFitting(closedFitting);
+//            closedFittings = closedFittings.substring(0,closedFittings.length()-1);
+//            String[] fittings = closedFittings.split(",");
+//            for (int i = 0;i < fittings.length;i++) {
+//                String[] fitting = fittings[i].split(":");
+//                ClosedFitting cFitting = new ClosedFitting();
+//                cFitting.setRelationId(record.getRenewedId());
+//                cFitting.setClosedFittingType(3);
+//                cFitting.setProductId(Integer.parseInt(fitting[0]));
+//                cFitting.setFittingsId(Integer.parseInt(fitting[1]));
+//                cFitting.setClosedFittingNumber(Integer.parseInt(fitting[2]));
+//                fittingList.add(cFitting);
+//            }
+//            //批量添加寄回配件
+//            fittingNum = closedFittingMapper.insert(fittingList);
+//        }
+//        //修改换新信息
+//        int num = renewedMapper.updateRenewedInfo(record);
+//        if (num > 0 && productNum > 0 && fittingNum > 0) {
+//            return 1;
+//        } else {
+//            return 0;
+//        }
+        return 0;
     }
 
     @Override
     public List<Renewed> listSynchronizingRenewed(Renewed renewed) {
-        return renewedMapper.listSynchronizingRenewed(renewed);
+//        return renewedMapper.listSynchronizingRenewed(renewed);
+        return null;
     }
 
     @Override
     public Renewed getRenewed(Renewed record) {
-        return renewedMapper.getRenewedInfo(record);
+//        return renewedMapper.getRenewedInfo(record);
+       return null;
     }
 }

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

@@ -34,69 +34,72 @@ public class RepairServiceImpl implements RepairService {
     @Transactional
     @Override
     public Integer updateRepairInfo(Repair repair, String closedProducts, String closedFittings) {
-        int productNum = 1;
-        int fittingNum = 1;
-        List<ClosedProdcue> produceList = new ArrayList<ClosedProdcue>();
-        List<ClosedFitting> fittingList = new ArrayList<ClosedFitting>();
-        if (StringUtils.isNotEmpty(closedProducts)) {
-            ClosedProdcue closedProdcue = new ClosedProdcue();
-            closedProdcue.setRelationId(repair.getRepairId());
-            closedProdcue.setClosedProdcueType(4);
-            //删除原有寄回产品
-            int delNum = closedProdcueMapper.deleteProduce(closedProdcue);
-            //去掉最后一个","
-            closedProducts = closedProducts.substring(0,closedProducts.length()-1);
-            String[] products = closedProducts.split(",");
-            for (int i = 0;i < products.length;i++) {
-                String[] colors = products[i].split(":");
-                ClosedProdcue prodcue = new ClosedProdcue();
-                prodcue.setRelationId(repair.getRepairId());
-                prodcue.setClosedProdcueType(4);
-                prodcue.setProductId(Integer.parseInt(colors[0]));
-                prodcue.setColorId(Integer.parseInt(colors[1]));
-                prodcue.setClosedProdcueNumber(Integer.parseInt(colors[2]));
-                produceList.add(prodcue);
-            }
-            //批量添加寄回产品
-            productNum = closedProdcueMapper.insert(produceList);
-        }
-        if (StringUtils.isNotEmpty(closedFittings)) {
-            ClosedFitting closedFitting = new ClosedFitting();
-            closedFitting.setRelationId(repair.getRepairId());
-            closedFitting.setClosedFittingType(4);
-            //删除原有寄回配件信息
-            int delNum = closedFittingMapper.deleteFitting(closedFitting);
-            closedFittings = closedFittings.substring(0,closedFittings.length()-1);
-            String[] fittings = closedFittings.split(",");
-            for (int i = 0;i < fittings.length;i++) {
-                String[] fitting = fittings[i].split(":");
-                ClosedFitting cFitting = new ClosedFitting();
-                cFitting.setRelationId(repair.getRepairId());
-                cFitting.setClosedFittingType(4);
-                cFitting.setProductId(Integer.parseInt(fitting[0]));
-                cFitting.setFittingsId(Integer.parseInt(fitting[1]));
-                cFitting.setClosedFittingNumber(Integer.parseInt(fitting[2]));
-                fittingList.add(cFitting);
-            }
-            //批量添加寄回配件
-            fittingNum = closedFittingMapper.insert(fittingList);
-        }
-
-        int num = repairMapper.updateRepairInfo(repair);
-        if (num > 0 && productNum > 0 && fittingNum > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+//        int productNum = 1;
+//        int fittingNum = 1;
+//        List<ClosedProdcue> produceList = new ArrayList<ClosedProdcue>();
+//        List<ClosedFitting> fittingList = new ArrayList<ClosedFitting>();
+//        if (StringUtils.isNotEmpty(closedProducts)) {
+//            ClosedProdcue closedProdcue = new ClosedProdcue();
+//            closedProdcue.setRelationId(repair.getRepairId());
+//            closedProdcue.setClosedProdcueType(4);
+//            //删除原有寄回产品
+//            int delNum = closedProdcueMapper.deleteProduce(closedProdcue);
+//            //去掉最后一个","
+//            closedProducts = closedProducts.substring(0,closedProducts.length()-1);
+//            String[] products = closedProducts.split(",");
+//            for (int i = 0;i < products.length;i++) {
+//                String[] colors = products[i].split(":");
+//                ClosedProdcue prodcue = new ClosedProdcue();
+//                prodcue.setRelationId(repair.getRepairId());
+//                prodcue.setClosedProdcueType(4);
+//                prodcue.setProductId(Integer.parseInt(colors[0]));
+//                prodcue.setColorId(Integer.parseInt(colors[1]));
+//                prodcue.setClosedProdcueNumber(Integer.parseInt(colors[2]));
+//                produceList.add(prodcue);
+//            }
+//            //批量添加寄回产品
+//            productNum = closedProdcueMapper.insert(produceList);
+//        }
+//        if (StringUtils.isNotEmpty(closedFittings)) {
+//            ClosedFitting closedFitting = new ClosedFitting();
+//            closedFitting.setRelationId(repair.getRepairId());
+//            closedFitting.setClosedFittingType(4);
+//            //删除原有寄回配件信息
+//            int delNum = closedFittingMapper.deleteFitting(closedFitting);
+//            closedFittings = closedFittings.substring(0,closedFittings.length()-1);
+//            String[] fittings = closedFittings.split(",");
+//            for (int i = 0;i < fittings.length;i++) {
+//                String[] fitting = fittings[i].split(":");
+//                ClosedFitting cFitting = new ClosedFitting();
+//                cFitting.setRelationId(repair.getRepairId());
+//                cFitting.setClosedFittingType(4);
+//                cFitting.setProductId(Integer.parseInt(fitting[0]));
+//                cFitting.setFittingsId(Integer.parseInt(fitting[1]));
+//                cFitting.setClosedFittingNumber(Integer.parseInt(fitting[2]));
+//                fittingList.add(cFitting);
+//            }
+//            //批量添加寄回配件
+//            fittingNum = closedFittingMapper.insert(fittingList);
+//        }
+//
+//        int num = repairMapper.updateRepairInfo(repair);
+//        if (num > 0 && productNum > 0 && fittingNum > 0) {
+//            return 1;
+//        } else {
+//            return 0;
+//        }
+        return 0;
     }
 
     @Override
     public List<Repair> listSynchronizingRepair(Repair repair) {
-        return repairMapper.listSynchronizingRepair(repair);
+//        return repairMapper.listSynchronizingRepair(repair);
+        return null;
     }
 
     @Override
     public Repair getRepair(Repair repair) {
-        return repairMapper.getRepairInfo(repair);
+//        return repairMapper.getRepairInfo(repair);
+        return null;
     }
 }

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

@@ -646,29 +646,30 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                     item.setItemProductPrice(color.getColorPrice());
                     item.setItemIsSource(1);
                     itemList.add(item);
-                } else {
-                    //获取配件信息
-                    FittingsInfo fittingsInfo = new FittingsInfo();
-                    fittingsInfo.setFittingsBar(itemJson.getString("goods_sn"));
-                    List<FittingsInfo> Fittings = fittingsInfoMapper.listFittings(fittingsInfo);
-                    if (Fittings == null || Fittings.size() == 0) {
-                        continue;
-                    }
-                    fittingsInfo = Fittings.get(0);
-                    item.setItemColorBar(itemJson.getString("goods_sn"));//商品69码
-                    item.setItemNum(itemJson.getInt("goods_number"));//商品数量
-                    item.setItemCreateTime(salesOrder.getSalesCreateTime());
-                    item.setItemColorId(fittingsInfo.getFittingsId());
-                    item.setItemProductColor(fittingsInfo.getFittingsName());
-                    item.setItemProductDiscount(fittingsInfo.getFittingsDiscount());
-                    item.setItemProductId(fittingsInfo.getProductId());
-                    item.setItemProductName(fittingsInfo.getFittingsName());
-                    item.setItemProductPic("");
-                    item.setItemProductType(0);
-                    item.setItemProductPrice(fittingsInfo.getFittingsPrice());
-                    item.setItemIsSource(2);
-                    itemList.add(item);
                 }
+//                else {
+//                    //获取配件信息
+//                    FittingsInfo fittingsInfo = new FittingsInfo();
+//                    fittingsInfo.setFittingsBar(itemJson.getString("goods_sn"));
+//                    List<FittingsInfo> Fittings = fittingsInfoMapper.listFittings(fittingsInfo);
+//                    if (Fittings == null || Fittings.size() == 0) {
+//                        continue;
+//                    }
+//                    fittingsInfo = Fittings.get(0);
+//                    item.setItemColorBar(itemJson.getString("goods_sn"));//商品69码
+//                    item.setItemNum(itemJson.getInt("goods_number"));//商品数量
+//                    item.setItemCreateTime(salesOrder.getSalesCreateTime());
+//                    item.setItemColorId(fittingsInfo.getFittingsId());
+//                    item.setItemProductColor(fittingsInfo.getFittingsName());
+//                    item.setItemProductDiscount(fittingsInfo.getFittingsDiscount());
+//                    item.setItemProductId(fittingsInfo.getProductId());
+//                    item.setItemProductName(fittingsInfo.getFittingsName());
+//                    item.setItemProductPic("");
+//                    item.setItemProductType(0);
+//                    item.setItemProductPrice(fittingsInfo.getFittingsPrice());
+//                    item.setItemIsSource(2);
+//                    itemList.add(item);
+//                }
             }
             //添加订单和订单项
             try{
@@ -779,29 +780,30 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                 item.setItemProductPrice(color.getColorPrice());
                 item.setItemIsSource(1);
                 itemList.add(item);
-            } else {
-                //获取配件信息
-                FittingsInfo fittingsInfo = new FittingsInfo();
-                fittingsInfo.setFittingsBar(itemJson.getString("goods_barcode"));
-                List<FittingsInfo> Fittings = fittingsInfoMapper.listFittings(fittingsInfo);
-                if (Fittings == null || Fittings.size() == 0) {
-                    continue;
-                }
-                fittingsInfo = Fittings.get(0);
-                item.setItemColorBar(itemJson.getString("goods_barcode"));//商品69码
-                item.setItemNum(itemJson.getInt("goods_number"));//商品数量
-                item.setItemCreateTime(salesOrder.getSalesCreateTime());
-                item.setItemColorId(fittingsInfo.getFittingsId());
-                item.setItemProductColor(fittingsInfo.getFittingsName());
-                item.setItemProductDiscount(fittingsInfo.getFittingsDiscount());
-                item.setItemProductId(fittingsInfo.getProductId());
-                item.setItemProductName(fittingsInfo.getFittingsName());
-                item.setItemProductPic("");
-                item.setItemProductType(0);
-                item.setItemProductPrice(fittingsInfo.getFittingsPrice());
-                item.setItemIsSource(2);
-                itemList.add(item);
             }
+//            else {
+//                //获取配件信息
+//                FittingsInfo fittingsInfo = new FittingsInfo();
+//                fittingsInfo.setFittingsBar(itemJson.getString("goods_barcode"));
+//                List<FittingsInfo> Fittings = fittingsInfoMapper.listFittings(fittingsInfo);
+//                if (Fittings == null || Fittings.size() == 0) {
+//                    continue;
+//                }
+//                fittingsInfo = Fittings.get(0);
+//                item.setItemColorBar(itemJson.getString("goods_barcode"));//商品69码
+//                item.setItemNum(itemJson.getInt("goods_number"));//商品数量
+//                item.setItemCreateTime(salesOrder.getSalesCreateTime());
+//                item.setItemColorId(fittingsInfo.getFittingsId());
+//                item.setItemProductColor(fittingsInfo.getFittingsName());
+//                item.setItemProductDiscount(fittingsInfo.getFittingsDiscount());
+//                item.setItemProductId(fittingsInfo.getProductId());
+//                item.setItemProductName(fittingsInfo.getFittingsName());
+//                item.setItemProductPic("");
+//                item.setItemProductType(0);
+//                item.setItemProductPrice(fittingsInfo.getFittingsPrice());
+//                item.setItemIsSource(2);
+//                itemList.add(item);
+//            }
         }
         boolean flag = salesOrderService.addOrderAndItem(salesOrder,itemList);
         if (flag) {

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

@@ -6,7 +6,7 @@ import java.util.List;
 
 
 public interface BackGoodsMapper {
-    int deleteByPrimaryKey(BackGoods record);
+ /*   int deleteByPrimaryKey(BackGoods record);
 
     int insert(BackGoods record);
 
@@ -14,24 +14,24 @@ public interface BackGoodsMapper {
 
     BackGoods selectByPrimaryKey(Integer backGoodsId);
 
-    /**
+    *//**
      * 查询售后退货信息
      * @param backGoods
      * @return
-     */
+     *//*
     BackGoods getBackGoods(BackGoods backGoods);
 
-    /**
+    *//**
      * 修改售后退货信息
      * @param record
      * @return
-     */
+     *//*
     Integer updateBackGoods(BackGoods record);
 
-    /**
+    *//**
      * 查询售后退货集合
      * @param backGoods
      * @return
-     */
-    List<BackGoods> listBackGoods(BackGoods backGoods);
+     *//*
+    List<BackGoods> listBackGoods(BackGoods backGoods);*/
 }

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

@@ -5,7 +5,7 @@ import com.iamberry.rst.core.cm.ClosedFitting;
 import java.util.List;
 
 public interface ClosedFittingMapper {
-    int deleteByPrimaryKey(ClosedFitting record);
+   /* int deleteByPrimaryKey(ClosedFitting record);
 
     int insert(List<ClosedFitting> record);
 
@@ -14,17 +14,17 @@ public interface ClosedFittingMapper {
     int updateByPrimaryKeySelective(ClosedFitting record);
 
 
-    /**
+    *//**
      * 获取寄回配件集合
      * @param record
      * @return
-     */
+     *//*
     List<ClosedFitting> listClosedFitting(ClosedFitting record);
 
-    /**
+    *//**
      * 删除寄回配件
      * @param record
      * @return
-     */
-    Integer deleteFitting(ClosedFitting record);
+     *//*
+    Integer deleteFitting(ClosedFitting record);*/
 }

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

@@ -0,0 +1,51 @@
+package com.iamberry.rst.service.cm.mapper;
+
+import com.iamberry.rst.core.cm.CmRelation;
+
+import java.util.List;
+
+/**
+ *  售后处理接口
+ * @author
+ * @Date 2018-12-28
+ */
+public interface CmRelationMapper {
+    /**
+     * 获取集合
+     * @param  cmRelation
+     * @return List
+     */
+    List<CmRelation>  getCmRelationList(CmRelation  cmRelation);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  cmRelation
+     */
+    CmRelation  getCmRelationById(Integer  id);
+
+    /**
+     * select relation by customer
+     * @param  id
+     * @return  cmRelation
+     */
+    CmRelation  getCmRelationByCustomerId(Integer  id);
+
+    /**
+     * 增加数据
+     * @param  cmRelation
+     * @return Integer
+     */
+    Integer  save(CmRelation  cmRelation);
+    /**
+     * 修改数据
+     * @param  cmRelation
+     * @return Integer
+     */
+    Integer  update(CmRelation  cmRelation);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

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

@@ -1,9 +1,6 @@
 package com.iamberry.rst.service.cm.mapper;
 
-import com.iamberry.rst.core.cm.CustomerInfo;
-import com.iamberry.rst.core.cm.CustomerStatisticalInfo;
-import com.iamberry.rst.core.cm.ReturnStatisticsInfo;
-import com.iamberry.rst.core.cm.SalesOrder;
+import com.iamberry.rst.core.cm.*;
 import com.iamberry.rst.core.order.ProductType;
 
 import java.util.List;
@@ -87,4 +84,36 @@ public interface CustomerInfoMapper {
      * @return
      */
     List<ReturnStatisticsInfo> salesReturnForSecond(SalesOrder salesOrder);
+
+    /**
+     * 查询所有处理类型
+     * @return
+     */
+    List<ProcType> listProcType();
+
+    /**
+     * 根据处理类型查询处理方式
+     * @return
+     */
+    List<ProcMethod> listProcMethod(Integer procTypeId);
+
+    /**
+     * 根据id查询处理方式
+     * @return
+     */
+    ProcMethod getProcMethod(Integer procMethodId);
+
+    /**
+     * 根据id修改处理信息
+     * @return
+     */
+    Integer updateCmRelation(CmRelation cmRelation);
+
+    /**
+     * 查询客诉处理信息
+     * @param cmRelation
+     * @return
+     */
+    CmRelation getCmRelationInfo(CmRelation cmRelation);
+
 }

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

@@ -6,29 +6,29 @@ import java.util.List;
 
 public interface FittingsInfoMapper {
 
-    /**
+  /*  *//**
      * 添加配件信息
      * @param fittingsInfo
      * @return
-     */
+     *//*
     Integer addFittingsInfo(FittingsInfo fittingsInfo);
 
-    /**
+    *//**
      * 根据id查询配件信息
      * @param fittingsId
      * @return
-     */
+     *//*
     FittingsInfo getFittingsById(Integer fittingsId);
 
-    /**
+    *//**
      * 修改配件信息
      * @param fittingsInfo
      * @return
-     */
+     *//*
     Integer updateFittingsInfo(FittingsInfo fittingsInfo);
-    /**
+    *//**
      * 查询所有配件信息
      * @return
-     */
-    List<FittingsInfo> listFittings(FittingsInfo fittingsInfo);
+     *//*
+    List<FittingsInfo> listFittings(FittingsInfo fittingsInfo);*/
 }

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

@@ -0,0 +1,43 @@
+package com.iamberry.rst.service.cm.mapper;
+
+import com.iamberry.rst.core.cm.ProcMethod;
+
+import java.util.List;
+
+/**
+ *  处理方式接口
+ * @author
+ * @Date 2018-12-28
+ */
+public interface ProcMethodMapper {
+    /**
+     * 获取集合
+     * @param  procMethod
+     * @return List
+     */
+    List<ProcMethod> getProcMethodList(ProcMethod  procMethod);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  procMethod
+     */
+    ProcMethod  getProcMethodById(Integer  id);
+    /**
+     * 增加数据
+     * @param  procMethod
+     * @return Integer
+     */
+    Integer  save(ProcMethod  procMethod);
+    /**
+     * 修改数据
+     * @param  procMethod
+     * @return Integer
+     */
+    Integer  update(ProcMethod  procMethod);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

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

@@ -0,0 +1,43 @@
+package com.iamberry.rst.service.cm.mapper;
+
+import com.iamberry.rst.core.cm.ProcType;
+
+import java.util.List;
+
+/**
+ *  处理方式类型接口
+ * @author
+ * @Date 2018-12-28
+ */
+public interface ProcTypeMapper {
+    /**
+     * 获取集合
+     * @param  procType
+     * @return List
+     */
+    List<ProcType> getProcTypeList(ProcType  procType);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  procType
+     */
+    ProcType  getProcTypeById(Integer  id);
+    /**
+     * 增加数据
+     * @param  procType
+     * @return Integer
+     */
+    Integer  save(ProcType  procType);
+    /**
+     * 修改数据
+     * @param  procType
+     * @return Integer
+     */
+    Integer  update(ProcType  procType);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

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

@@ -5,7 +5,7 @@ import com.iamberry.rst.core.cm.Reissue;
 import java.util.List;
 
 public interface ReissueMapper {
-    int deleteByPrimaryKey(Reissue record);
+    /*int deleteByPrimaryKey(Reissue record);
 
     int insert(Reissue record);
 
@@ -13,32 +13,32 @@ public interface ReissueMapper {
 
     Reissue selectByPrimaryKey(Integer reissueId);
 
-    /**
+    *//**
      * 获取维修信息
      * @param reissue
      * @return
-     */
+     *//*
     Reissue getReissue(Reissue reissue);
 
-    /**
+    *//**
      * 修改售后补发信息
      * @param record
      * @return
-     */
+     *//*
     Integer updateReissueInfo(Reissue record);
 
-    /**
+    *//**
      * 查询售后补发集合
      * @param reissue
      * @return
-     */
+     *//*
     List<Reissue> listReissue(Reissue reissue);
-    /**
+    *//**
      * 查询售后补发集合 同步efast
      * @param reissue
      * @return
-     */
-    List<Reissue> listSynchronizingReissue(Reissue reissue);
+     *//*
+    List<Reissue> listSynchronizingReissue(Reissue reissue);*/
 
 
 }

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

@@ -49,6 +49,13 @@ public interface RelationOrderMapper {
     Integer  deleteByRelationId(Integer  relationId);
 
     /**
+     * 删除数据 by relationId
+     * @param  relationOrder
+     * @return Integer
+     */
+    Integer  deleteByRelationOrder(RelationOrder  relationOrder);
+
+    /**
      * 增加数据 <集合>
      * @param  relationOrderList
      * @return Integer

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

@@ -6,46 +6,46 @@ import com.iamberry.rst.core.cm.Renewed;
 import java.util.List;
 
 public interface RenewedMapper {
-    /**
+  /*  *//**
      * 删除换新数据
      * @param record
      * @return
-     */
+     *//*
     int deleteByPrimaryKey(Renewed record);
 
     int insert(Renewed record);
 
-    /**
+    *//**
      * 修改换新信息
      * @param record
      * @return
-     */
+     *//*
     Integer updateRenewedInfo(Renewed record);
 
-    /**
+    *//**
      * 查询售后换新集合
      * @param renewed
      * @return
-     */
+     *//*
     List<Renewed> listRenewed(Renewed renewed);
 
-    /**
+    *//**
      * 获取换新详情和品质检测信息
      * @param renewed
      * @return
-     */
+     *//*
     Renewed getRenewedInfo(Renewed renewed);
 
-    /**
+    *//**
      * 获取寄回配件集合
      * @param closedFitting
      * @return
-     */
+     *//*
     List<ClosedFitting> listClosedFitting(ClosedFitting closedFitting);
-    /**
+    *//**
      * 获取所有需要同步的换新数据
      * @return
-     */
+     *//*
     List<Renewed> listSynchronizingRenewed(Renewed renewed);
-
+*/
 }

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

@@ -5,7 +5,7 @@ import com.iamberry.rst.core.cm.Repair;
 import java.util.List;
 
 public interface RepairMapper {
-    int deleteByPrimaryKey(Repair record);
+    /*int deleteByPrimaryKey(Repair record);
 
     int insert(Repair record);
 
@@ -13,30 +13,30 @@ public interface RepairMapper {
 
     int updateByPrimaryKeySelective(Repair record);
 
-    /**
+    *//**
      * 查询售后维修集合
      * @param repair
      * @return
-     */
+     *//*
     List<Repair> listRepair(Repair repair);
 
-    /**
+    *//**
      * 获取维修详情和品质检测信息
      * @param repair
      * @return
-     */
+     *//*
     Repair getRepairInfo(Repair repair);
 
-    /**
+    *//**
      * 修改维修信息
      * @param repair
      * @return
-     */
+     *//*
     Integer updateRepairInfo(Repair repair);
-    /**
+    *//**
      * 查询售后维修需要同步订单的数据集合
      * @param repair
      * @return
-     */
-    List<Repair> listSynchronizingRepair(Repair repair);
+     *//*
+    List<Repair> listSynchronizingRepair(Repair repair);*/
 }

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

@@ -5,7 +5,7 @@ import com.iamberry.rst.core.cm.SendFitting;
 import java.util.List;
 
 public interface SendFittingMapper {
-    int deleteByPrimaryKey(SendFitting record);
+   /* int deleteByPrimaryKey(SendFitting record);
 
     int insert(List<SendFitting> record);
 
@@ -16,10 +16,10 @@ public interface SendFittingMapper {
     int updateByPrimaryKeySelective(SendFitting record);
 
 
-    /**
+    *//**
      * 查询寄送的配件集合
      * @param record
      * @return
-     */
-    List<SendFitting> listSendFitting(SendFitting record);
+     *//*
+    List<SendFitting> listSendFitting(SendFitting record);*/
 }

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

@@ -15,18 +15,18 @@
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
-    from tb_rst_closed_prodcue
+    from tb_rst_cm_closed_prodcue
     where closed_prodcue_id = #{closedProdcueId,jdbcType=INTEGER}
   </select>
 
   <insert id="insert" parameterType="ClosedProdcue" >
-    insert into tb_rst_closed_prodcue ( relation_id, product_id, closed_prodcue_machine_no,
-      color_id, closed_prodcue_number,closed_prodcue_type,color_bar)
+    insert into tb_rst_cm_closed_prodcue ( relation_id, product_id, closed_prodcue_machine_no,
+      color_id, closed_prodcue_number,color_bar)
     values
     <foreach collection="list" item="node" index="index" separator="," open="" close="">
       (
         #{node.relationId}, #{node.productId}, #{node.closedProdcueMachineNo},
-       #{node.colorId}, #{node.closedProdcueNumber},#{node.closedProdcueType},#{node.colorBar}
+       #{node.colorId}, #{node.closedProdcueNumber},#{node.colorBar}
       )
     </foreach>
   </insert>
@@ -34,7 +34,7 @@
   <!-- 删除寄回产品信息 -->
   <delete id="deleteProduce" parameterType="ClosedProdcue">
     delete from
-      tb_rst_closed_prodcue
+      tb_rst_cm_closed_prodcue
     where
       relation_id = #{relationId}
     and
@@ -43,11 +43,14 @@
   <!-- 删除寄回产品信息 -->
   <delete id="deleteByPrimaryKey" parameterType="ClosedProdcue">
     delete from
-    tb_rst_closed_prodcue
+    tb_rst_cm_closed_prodcue
     <where>
       <if test="relationId != null and relationId != ''">
         relation_id = #{relationId}
       </if>
+      <if test="relationId != null and relationId != ''">
+        relation_id = #{relationId}
+      </if>
       <if test="closedProdcueId != null and closedProdcueId != ''">
         and closed_prodcue_id = #{closedProdcueId}
       </if>
@@ -55,7 +58,7 @@
   </delete>
 
   <update id="updateByPrimaryKeySelective" parameterType="ClosedProdcue" >
-    update tb_rst_closed_prodcue
+    update tb_rst_cm_closed_prodcue
     <set >
       <if test="relationId != null" >
         relation_id = #{relationId,jdbcType=INTEGER},
@@ -82,7 +85,7 @@
       cp.*,
       pi.product_name closedProductName,
       po.color_name closedColorName
-    from tb_rst_closed_prodcue cp
+    from tb_rst_cm_closed_prodcue cp
     LEFT JOIN tb_rst_product_info pi ON cp.product_id = pi.product_id
     LEFT JOIN tb_rst_product_color po ON cp.color_id = po.color_id
     <where>

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

@@ -0,0 +1,332 @@
+<?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.CmRelationMapper">
+    <resultMap  id="BaseResultMap" type="CmRelation" >
+        <result    column="relation_id"    property="relationId" />
+        <result    column="proc_method_id"    property="procMethodId" />
+        <result    column="customer_id"    property="customerId" />
+        <result    column="signclosed_id"    property="signclosedId" />
+        <result    column="relation_back_efast_order_id"    property="relationBackEfastOrderId" />
+        <result    column="relation_back_status"    property="relationBackStatus" />
+        <result    column="relation_back_name"    property="relationBackName" />
+        <result    column="relation_back_tel"    property="relationBackTel" />
+        <result    column="relation_back_logistics_company"    property="relationBackLogisticsCompany" />
+        <result    column="relation_back_logistics_no"    property="relationBackLogisticsNo" />
+        <result    column="relation_back_postage"    property="relationBackPostage" />
+        <result    column="relation_back_machine_no"    property="relationBackMachineNo" />
+        <result    column="relation_send_status"    property="relationSendStatus" />
+        <result    column="relation_send_name"    property="relationSendName" />
+        <result    column="relation_send_tel"    property="relationSendTel" />
+        <result    column="province_number"    property="provinceNumber" />
+        <result    column="city_number"    property="cityNumber" />
+        <result    column="area_number"    property="areaNumber" />
+        <result    column="relation_send_merge_address"    property="relationSendMergeAddress" />
+        <result    column="relation_send_address"    property="relationSendAddress" />
+        <result    column="relation_send_logistics_company"    property="relationSendLogisticsCompany" />
+        <result    column="relation_send_logistics_no"    property="relationSendLogisticsNo" />
+        <result    column="relation_desc"    property="relationDesc" />
+        <result    column="relation_state"    property="relationState" />
+        <result    column="relation_alipay"    property="relationAlipay" />
+        <result    column="relation_is_transfer"    property="relationIsTransfer" />
+        <result    column="relation_alipay_name"    property="relationAlipayName" />
+        <result    column="relation_back_receipt_date"    property="relationBackReceiptDate" />
+        <result    column="relation_factory_costs"    property="relationFactoryCosts" />
+        <result    column="relation_customer_costs"    property="relationCustomerCosts" />
+        <result    column="relation_create_time"    property="relationCreateTime" />
+        <result    column="relation_update_time"    property="relationUpdateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.relation_id,
+        t.proc_method_id,
+        t.customer_id,
+        t.signclosed_id,
+        t.relation_back_efast_order_id,
+        t.relation_back_status,
+        t.relation_back_name,
+        t.relation_back_tel,
+        t.relation_back_logistics_company,
+        t.relation_back_logistics_no,
+        t.relation_back_postage,
+        t.relation_back_machine_no,
+        t.relation_send_status,
+        t.relation_send_name,
+        t.relation_send_tel,
+        t.province_number,
+        t.city_number,
+        t.area_number,
+        t.relation_send_merge_address,
+        t.relation_send_address,
+        t.relation_send_logistics_company,
+        t.relation_send_logistics_no,
+        t.relation_desc,
+        t.relation_state,
+        t.relation_alipay,
+        t.relation_is_transfer,
+        t.relation_alipay_name,
+        t.relation_back_receipt_date,
+        t.relation_factory_costs,
+        t.relation_customer_costs,
+        t.relation_create_time,
+        t.relation_update_time
+    </sql>
+    <select id="getCmRelationList" resultMap="BaseResultMap" parameterType="CmRelation" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_cm_relation t
+        <where>
+            <if test="relationId != null ">
+                AND t.relation_id = #{relationId}
+            </if >
+            <if test="procMethodId != null ">
+                AND t.proc_method_id = #{procMethodId}
+            </if >
+            <if test="customerId != null ">
+                AND t.customer_id = #{customerId}
+            </if >
+            <if test="signclosedId != null ">
+                AND t.signclosed_id = #{signclosedId}
+            </if >
+            <if test="relationBackEfastOrderId != null and relationBackEfastOrderId != ''">
+                AND t.relation_back_efast_order_id = #{relationBackEfastOrderId}
+            </if >
+            <if test="relationBackStatus != null ">
+                AND t.relation_back_status = #{relationBackStatus}
+            </if >
+            <if test="relationBackName != null and relationBackName != ''">
+                AND t.relation_back_name  like  CONCAT ('%',#{relationBackName},'%')
+            </if >
+            <if test="relationBackTel != null and relationBackTel != ''">
+                AND t.relation_back_tel  like  CONCAT ('%',#{relationBackTel},'%')
+            </if >
+            <if test="relationBackLogisticsCompany != null and relationBackLogisticsCompany != ''">
+                AND t.relation_back_logistics_company = #{relationBackLogisticsCompany}
+            </if >
+            <if test="relationBackLogisticsNo != null and relationBackLogisticsNo != ''">
+                AND t.relation_back_logistics_no  like  CONCAT ('%',#{relationBackLogisticsNo},'%')
+            </if >
+            <if test="relationBackMachineNo != null and relationBackMachineNo != ''">
+                AND t.relation_back_machine_no  like  CONCAT ('%',#{relationBackMachineNo},'%')
+            </if >
+            <if test="relationSendStatus != null ">
+                AND t.relation_send_status = #{relationSendStatus}
+            </if >
+            <if test="relationSendName != null and relationSendName != ''">
+                AND t.relation_send_name  like  CONCAT ('%',#{relationSendName},'%')
+            </if >
+            <if test="relationSendTel != null and relationSendTel != ''">
+                AND t.relation_send_tel  like  CONCAT ('%',#{relationSendTel},'%')
+            </if >
+            <if test="relationSendAddress != null and relationSendAddress != ''">
+                AND t.relation_send_address  like  CONCAT ('%',#{relationSendAddress},'%')
+            </if >
+            <if test="relationSendLogisticsCompany != null and relationSendLogisticsCompany != ''">
+                AND t.relation_send_logistics_company = #{relationSendLogisticsCompany}
+            </if >
+            <if test="relationSendLogisticsNo != null and relationSendLogisticsNo != ''">
+                AND t.relation_send_logistics_no  like  CONCAT ('%',#{relationSendLogisticsNo},'%')
+            </if >
+            <if test="relationState != null ">
+                AND t.relation_state = #{relationState}
+            </if >
+            <if test="relationIsTransfer != null ">
+                AND t.relation_is_transfer = #{relationIsTransfer}
+            </if >
+            <if test="relationCreateTime != null and relationCreateTime != ''">
+                <![CDATA[
+                    AND t.relation_create_time >= #{beginTime}
+                ]]>
+            </if >
+            <if test="relationCreateTime != null and relationCreateTime != ''">
+                <![CDATA[
+                    AND t.relation_create_time <= #{endTime}
+                ]]>
+            </if >
+        </where>
+    </select>
+    <select id="getCmRelationById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_cm_relation t
+        where t.relation_id= #{relationId}
+    </select>
+
+    <select id="getCmRelationByCustomerId" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_cm_relation t
+        where t.customer_id= #{customerId}
+    </select>
+
+    <insert id="save" parameterType="CmRelation"  useGeneratedKeys="true"  keyProperty="relationId" >
+        insert into
+        tb_rst_cm_relation
+        (
+        relation_id,
+        proc_method_id,
+        customer_id,
+        signclosed_id,
+        relation_back_efast_order_id,
+        relation_back_status,
+        relation_back_name,
+        relation_back_tel,
+        relation_back_logistics_company,
+        relation_back_logistics_no,
+        relation_back_postage,
+        relation_back_machine_no,
+        relation_send_status,
+        relation_send_name,
+        relation_send_tel,
+        province_number,
+        city_number,
+        area_number,
+        relation_send_merge_address,
+        relation_send_address,
+        relation_send_logistics_company,
+        relation_send_logistics_no,
+        relation_desc,
+        relation_state,
+        relation_alipay,
+        relation_is_transfer,
+        relation_alipay_name,
+        relation_back_receipt_date,
+        relation_factory_costs,
+        relation_customer_costs,
+        relation_create_time,
+        relation_update_time
+        )
+        values
+        (
+         #{relationId},
+        #{procMethodId},
+        #{customerId},
+        #{signclosedId},
+        #{relationBackEfastOrderId},
+        #{relationBackStatus},
+        #{relationBackName},
+        #{relationBackTel},
+        #{relationBackLogisticsCompany},
+        #{relationBackLogisticsNo},
+        #{relationBackPostage},
+        #{relationBackMachineNo},
+        #{relationSendStatus},
+        #{relationSendName},
+        #{relationSendTel},
+        #{provinceNumber},
+        #{cityNumber},
+        #{areaNumber},
+        #{relationSendMergeAddress},
+        #{relationSendAddress},
+        #{relationSendLogisticsCompany},
+        #{relationSendLogisticsNo},
+        #{relationDesc},
+        #{relationState},
+        #{relationAlipay},
+        #{relationIsTransfer},
+        #{relationAlipayName},
+        #{relationBackReceiptDate},
+        #{relationFactoryCosts},
+        #{relationCustomerCosts},
+        #{relationCreateTime},
+        #{relationUpdateTime}
+        )
+    </insert>
+    <update id="update" parameterType="CmRelation" >
+        update
+        tb_rst_cm_relation
+        <set >
+            <if test="procMethodId != null ">
+                proc_method_id = #{procMethodId},
+            </if >
+            <if test="customerId != null ">
+                customer_id = #{customerId},
+            </if >
+            <if test="signclosedId != null ">
+                signclosed_id = #{signclosedId},
+            </if >
+            <if test="relationBackEfastOrderId != null and relationBackEfastOrderId != ''">
+                relation_back_efast_order_id = #{relationBackEfastOrderId},
+            </if >
+            <if test="relationBackStatus != null ">
+                relation_back_status = #{relationBackStatus},
+            </if >
+            <if test="relationBackName != null and relationBackName != ''">
+                relation_back_name = #{relationBackName},
+            </if >
+            <if test="relationBackTel != null and relationBackTel != ''">
+                relation_back_tel = #{relationBackTel},
+            </if >
+            <if test="relationBackLogisticsCompany != null and relationBackLogisticsCompany != ''">
+                relation_back_logistics_company = #{relationBackLogisticsCompany},
+            </if >
+            <if test="relationBackLogisticsNo != null and relationBackLogisticsNo != ''">
+                relation_back_logistics_no = #{relationBackLogisticsNo},
+            </if >
+            <if test="relationBackPostage != null ">
+                relation_back_postage = #{relationBackPostage},
+            </if >
+            <if test="relationBackMachineNo != null and relationBackMachineNo != ''">
+                relation_back_machine_no = #{relationBackMachineNo},
+            </if >
+            <if test="relationSendStatus != null ">
+                relation_send_status = #{relationSendStatus},
+            </if >
+            <if test="relationSendName != null and relationSendName != ''">
+                relation_send_name = #{relationSendName},
+            </if >
+            <if test="relationSendTel != null and relationSendTel != ''">
+                relation_send_tel = #{relationSendTel},
+            </if >
+            <if test="provinceNumber != null ">
+                province_number = #{provinceNumber},
+            </if >
+            <if test="cityNumber != null ">
+                city_number = #{cityNumber},
+            </if >
+            <if test="areaNumber != null ">
+                area_number = #{areaNumber},
+            </if >
+            <if test="relationSendMergeAddress != null and relationSendMergeAddress != ''">
+                relation_send_merge_address = #{relationSendMergeAddress},
+            </if >
+            <if test="relationSendAddress != null and relationSendAddress != ''">
+                relation_send_address = #{relationSendAddress},
+            </if >
+            <if test="relationSendLogisticsCompany != null and relationSendLogisticsCompany != ''">
+                relation_send_logistics_company = #{relationSendLogisticsCompany},
+            </if >
+            <if test="relationSendLogisticsNo != null and relationSendLogisticsNo != ''">
+                relation_send_logistics_no = #{relationSendLogisticsNo},
+            </if >
+            <if test="relationDesc != null and relationDesc != ''">
+                relation_desc = #{relationDesc},
+            </if >
+            <if test="relationState != null ">
+                relation_state = #{relationState},
+            </if >
+            <if test="relationAlipay != null and relationAlipay != ''">
+                relation_alipay = #{relationAlipay},
+            </if >
+            <if test="relationIsTransfer != null ">
+                relation_is_transfer = #{relationIsTransfer},
+            </if >
+            <if test="relationAlipayName != null and relationAlipayName != ''">
+                relation_alipay_name = #{relationAlipayName},
+            </if >
+            <if test="relationBackReceiptDate != null and relationBackReceiptDate != ''">
+                relation_back_receipt_date = #{relationBackReceiptDate},
+            </if >
+            <if test="relationFactoryCosts != null ">
+                relation_factory_costs = #{relationFactoryCosts},
+            </if >
+            <if test="relationCustomerCosts != null ">
+                relation_customer_costs = #{relationCustomerCosts},
+            </if >
+        </set >
+        where relation_id= #{relationId}
+    </update>
+    <delete id="delete" parameterType="Integer" >
+        delete FROM
+        tb_rst_cm_relation
+        where relation_id=#{relationId}
+    </delete>
+</mapper>

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

@@ -35,43 +35,43 @@
         t.question_create_time,
         t.question_update_time,
         sc.complaint_id
-    from tb_rst_complaint_question t
-    LEFT JOIN tb_rst_complaint_small_class sc ON  t.small_class_id = sc.small_class_id
+    from tb_rst_cm_complaint_question t
+    LEFT JOIN tb_rst_cm_complaint_small_class sc ON  t.small_class_id = sc.small_class_id
     where question_id = #{questionId,jdbcType=INTEGER}
   </select>
 
   <select id="listComplaintQuestionInfo" resultType="ComplaintQuestionInfo" parameterType="ComplaintQuestionInfo" >
     SELECT
-      tb_rst_complaint_question.question_id,
-      tb_rst_complaint_question.small_class_id,
-      tb_rst_complaint_question.question_name,
-      tb_rst_complaint_question.question_profile,
-      tb_rst_complaint_question.question_state,
-      tb_rst_complaint_question.question_is_qc_detect,
-      tb_rst_complaint_question.question_create_time,
-      tb_rst_complaint_question.question_update_time,
-      tb_rst_complaint_question.question_resolved_num,
-      tb_rst_complaint_question.question_not_solved_num,
-      tb_rst_complaint_type.complaint_id AS complaintId
+      tb_rst_cm_complaint_question.question_id,
+      tb_rst_cm_complaint_question.small_class_id,
+      tb_rst_cm_complaint_question.question_name,
+      tb_rst_cm_complaint_question.question_profile,
+      tb_rst_cm_complaint_question.question_state,
+      tb_rst_cm_complaint_question.question_is_qc_detect,
+      tb_rst_cm_complaint_question.question_create_time,
+      tb_rst_cm_complaint_question.question_update_time,
+      tb_rst_cm_complaint_question.question_resolved_num,
+      tb_rst_cm_complaint_question.question_not_solved_num,
+      tb_rst_cm_complaint_type.complaint_id AS complaintId
     FROM
-      tb_rst_complaint_question
-    INNER JOIN tb_rst_complaint_small_class ON tb_rst_complaint_question.small_class_id = tb_rst_complaint_small_class.small_class_id
-    INNER JOIN tb_rst_complaint_type ON tb_rst_complaint_small_class.complaint_id = tb_rst_complaint_type.complaint_id
+      tb_rst_cm_complaint_question
+    INNER JOIN tb_rst_cm_complaint_small_class ON tb_rst_cm_complaint_question.small_class_id = tb_rst_cm_complaint_small_class.small_class_id
+    INNER JOIN tb_rst_cm_complaint_type ON tb_rst_cm_complaint_small_class.complaint_id = tb_rst_cm_complaint_type.complaint_id
     <where>
       <if test="questionId !=null">
         AND question_id = #{questionId}
       </if>
       <if test="smallClassId !=null">
-        AND tb_rst_complaint_small_class.small_class_id = #{smallClassId}
+        AND tb_rst_cm_complaint_small_class.small_class_id = #{smallClassId}
       </if>
       <if test="complaintId !=null">
-        AND tb_rst_complaint_type.complaint_id = #{complaintId}
+        AND tb_rst_cm_complaint_type.complaint_id = #{complaintId}
       </if>
       <if test="questionName !=null and questionName !=''">
         AND question_name like CONCAT('%',#{questionName},'%')
       </if>
       <if test="complaintType != null">
-        AND tb_rst_complaint_type.complaint_consulting_type = #{complaintType}
+        AND tb_rst_cm_complaint_type.complaint_consulting_type = #{complaintType}
       </if>
       AND question_state = 1
     </where>
@@ -80,7 +80,7 @@
   </select>
 
   <insert id="insert" parameterType="ComplaintQuestionInfo"  useGeneratedKeys="true" keyProperty="questionId">
-    insert into tb_rst_complaint_question (small_class_id, question_name,
+    insert into tb_rst_cm_complaint_question (small_class_id, question_name,
       question_state, question_is_qc_detect, question_create_time, 
       question_update_time, question_profile,question_resolved_num,question_not_solved_num
       )
@@ -91,7 +91,7 @@
       )
   </insert>
   <update id="updateQuestionById" parameterType="ComplaintQuestionInfo" >
-    update tb_rst_complaint_question
+    update tb_rst_cm_complaint_question
     <set >
       <if test="smallClassId != null" >
         small_class_id = #{smallClassId,jdbcType=INTEGER},

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

@@ -17,14 +17,14 @@
   <select id="getTypeById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
-    from tb_rst_complaint_type
+    from tb_rst_cm_complaint_type
     where complaint_id = #{complaintId,jdbcType=INTEGER}
   </select>
 
   <select id="listComplaintTypeInfo" resultMap="BaseResultMap" parameterType="ComplaintTypeInfo" >
     select
     <include refid="Base_Column_List" />
-    from tb_rst_complaint_type
+    from tb_rst_cm_complaint_type
     <where>
       <if test="complaintConsultingType !=null">
         AND complaint_consulting_type = #{complaintConsultingType}
@@ -35,7 +35,7 @@
 
 
   <insert id="insert" parameterType="ComplaintTypeInfo" >
-    insert into tb_rst_complaint_type (complaint_id, complaint_consulting_type, 
+    insert into tb_rst_cm_complaint_type (complaint_id, complaint_consulting_type,
       complaint_class_name, complaint_class_profile, 
       complaint_class_state, complaint_create_time, 
       complaint_update_time)
@@ -45,7 +45,7 @@
       #{complaintUpdateTime,jdbcType=TIMESTAMP})
   </insert>
   <update id="updateTypeById" parameterType="ComplaintTypeInfo" >
-    update tb_rst_complaint_type
+    update tb_rst_cm_complaint_type
     <set >
       <if test="complaintConsultingType != null" >
         complaint_consulting_type = #{complaintConsultingType,jdbcType=TINYINT},
@@ -78,7 +78,7 @@
     <result column="complaint_create_time" property="complaintCreateTime"  />
     <result column="complaint_update_time" property="complaintUpdateTime" />
     <collection property="smallClassInfoList" column="complaintId" javaType="ArrayList"
-                ofType="com.iamberry.rst.core.cm.ComplaintSmallClassInfo" select="getListComplaintSmallClassInfo"/>
+                ofType="com.iamberry.rst.core.fm.ComplaintSmallClassInfo" select="getListComplaintSmallClassInfo"/>
   </resultMap>
   <resultMap id="complaintSmallClassInfoMap" type="ComplaintSmallClassInfo" >
     <id column="smallClassId" property="smallClassId"  />
@@ -112,7 +112,7 @@
       complaint_class_state,
       complaint_create_time,
       complaint_update_time
-    from tb_rst_complaint_type
+    from tb_rst_cm_complaint_type
   </select>
   <select id="getListComplaintSmallClassInfo" resultMap="complaintSmallClassInfoMap" parameterType="java.lang.Integer" >
     select
@@ -124,7 +124,7 @@
       small_question_num,
       small_class_create_time,
       small_class_update_time
-    from tb_rst_complaint_small_class
+    from tb_rst_cm_complaint_small_class
     where
       complaint_id = #{complaintId}
   </select>
@@ -140,8 +140,8 @@
       cq.question_create_time,
       cq.question_update_time,
       COUNT(ci.customer_id) AS questionNum
-    from tb_rst_complaint_question cq
-    LEFT JOIN tb_rst_customer_info ci ON cq.question_id = ci.question_id
+    from tb_rst_cm_complaint_question cq
+    LEFT JOIN tb_rst_cm_customer_info ci ON cq.question_id = ci.question_id
     where
       cq.small_class_id = #{smallClassId}
     GROUP BY cq.question_id

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

@@ -176,7 +176,7 @@
         NULL AS relationCustomerCosts
         FROM tb_rst_noreason_back
         )cc
-        LEFT JOIN tb_rst_customer_info c on cc.customerId = c.customer_id
+        LEFT JOIN tb_rst_cm_customer_info c on cc.customerId = c.customer_id
         <where>
             <if test="customerId != null and customerId != ''">
                 AND cc.customerId = #{customerId}
@@ -194,7 +194,7 @@
                 and cc.relationId = #{relationId}
             </if>
         </where>
-  </select>
+    </select>
 
 
     <select id="listCustomerCommonByStatus" parameterType="CustomerCommon" resultType="Integer">
@@ -254,7 +254,7 @@
         noreason_back_create_time AS relationCreateTime,
         '0' AS relationBackEfastOrderId
         FROM tb_rst_noreason_back
-        )cc LEFT JOIN tb_rst_customer_info c on cc.customerId = c.customer_id
+        )cc LEFT JOIN tb_rst_cm_customer_info c on cc.customerId = c.customer_id
         <where>
             <if test="relationBackStatus != null and relationBackStatus != ''">
                 AND cc.relationBackStatus = #{relationBackStatus}

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

@@ -58,13 +58,16 @@
       t.customer_out_damaged,
       t.customer_secondary_customer,
       t.customer_last_id,
-      t.customer_initial_id
-    from tb_rst_customer_info t
+      t.customer_initial_id,
+      t.customer_province_id,
+      t.customer_city_id,
+      t.customer_district_id
+    from tb_rst_cm_customer_info t
     where t.customer_id = #{customerId,jdbcType=INTEGER}
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from tb_rst_customer_info
+    delete from tb_rst_cm_customer_info
     where customer_id = #{customerId,jdbcType=INTEGER}
   </delete>
 
@@ -109,16 +112,16 @@
       d.describe_handle_desc,
       d.describe_content
     from
-      tb_rst_customer_info c
-    LEFT JOIN tb_rst_question_describe d ON c.customer_id = d.customer_id
+      tb_rst_cm_customer_info c
+    LEFT JOIN tb_rst_cm_question_describe d ON c.customer_id = d.customer_id
     LEFT JOIN tb_rst_product_type t ON c.type_id = t.type_id
-    LEFT JOIN tb_rst_complaint_question q ON c.question_id = q.question_id
-    LEFT JOIN tb_rst_complaint_small_class s ON q.small_class_id = s.small_class_id
-    LEFT JOIN tb_rst_complaint_type ct ON s.complaint_id = ct.complaint_id
+    LEFT JOIN tb_rst_cm_complaint_question q ON c.question_id = q.question_id
+    LEFT JOIN tb_rst_cm_complaint_small_class s ON q.small_class_id = s.small_class_id
+    LEFT JOIN tb_rst_cm_complaint_type ct ON s.complaint_id = ct.complaint_id
     LEFT JOIN tb_rst_sales_company sc ON c.company_id = sc.company_id
     LEFT JOIN tb_rst_store_info si ON c.store_id = si.store_id
     LEFT JOIN tb_rst_sys_admin a ON c.admin_id = a.admin_id
-    LEFT JOIN tb_rst_visit v ON v.customer_id = c.customer_id
+    LEFT JOIN tb_rst_cm_visit v ON v.customer_id = c.customer_id
     LEFT JOIN tb_rst_sys_admin sa ON v.designated_admin_id = sa.admin_id
     <where>
       <if test="customerName != null and customerName != ''">
@@ -281,106 +284,48 @@
     cc.relationSendLogisticsCompany AS sendLogisticsCompany,
     cc.relationBackLogisticsNo AS backLogisticsNo,
     cc.relationBackLogisticsCompany AS backLogisticsCompany,
-    oi.sales_pay_time AS salesTime
+    oi.sales_pay_time AS salesTime,
+    cc.procMethodId as procMethodId,
+    cc.procMethodName as procMethodName,
+    cc.procTypeId as procTypeId,
+    cc.procTypeName as procTypeName,
+    cc.customerIsSolve as customerIsSolve
     FROM
-    tb_rst_customer_info c
+    tb_rst_cm_customer_info c
     LEFT JOIN (
-      SELECT
+        SELECT
         xx.*
-      FROM
+        FROM
         (
-          SELECT
-          '3' AS customerIsSolve,
-          renewed_id AS relationId,
-          customer_id AS customerId,
-          tb_rst_relation_order.sales_id AS orderId,
-          signclosed_id AS signclosedId,
-          renewed_back_status AS relationBackStatus,
-          renewed_send_status AS relationSendStatus,
-          renewed_send_logistics_no AS relationSendLogisticsNo,
-          renewed_send_logistics_company AS relationSendLogisticsCompany,
-          renewed_back_logistics_no AS relationBackLogisticsNo,
-          renewed_back_logistics_company AS relationBackLogisticsCompany
-          FROM
-            tb_rst_renewed
-          LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_renewed.renewed_id
-          AND tb_rst_relation_order.relation_type = '3'
-        UNION ALL
-          SELECT
-          '4' AS customerIsSolve,
-          repair_id AS relationId,
-          customer_id AS customerId,
-          tb_rst_relation_order.sales_id AS orderId,
-          signclosed_id AS signclosedId,
-          repair_back_status AS relationBackStatus,
-          repair_send_status AS relationSendStatus,
-          repair_send_logistics_no AS relationSendLogisticsNo,
-          repair_send_logistics_company AS relationSendLogisticsCompany,
-          repair_back_logistics_no AS relationBackLogisticsNo,
-          repair_back_logistics_company AS relationBackLogisticsCompany
-          FROM
-          tb_rst_repair
-          LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_repair.repair_id
-          AND tb_rst_relation_order.relation_type = '4'
-        UNION ALL
-          SELECT
-          '5' AS customerIsSolve,
-          reissue_id AS relationId,
-          customer_id AS customerId,
-          tb_rst_relation_order.sales_id AS orderId,
-          NULL AS signclosedId,
-          NULL AS relationBackStatus,
-          reissue_send_status AS relationSendStatus,
-          reissue_send_logistics_no AS relationSendLogisticsNo,
-          reissue_send_logistics_company AS relationSendLogisticsCompany,
-          NULL AS relationBackLogisticsNo,
-          NULL AS relationBackLogisticsCompany
-          FROM
-          tb_rst_reissue
-          LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_reissue.reissue_id
-          AND tb_rst_relation_order.relation_type = '5'
-        UNION ALL
-          SELECT
-          '6' AS customerIsSolve,
-          back_goods_id AS relationId,
-          customer_id AS customerId,
-          tb_rst_relation_order.sales_id AS orderId,
-          signclosed_id AS signclosedId,
-          back_goods_back_status AS relationBackStatus,
-          NULL AS relationSendStatus,
-          NULL AS relationSendLogisticsNo,
-          NULL AS relationSendLogisticsCompany,
-          back_goods_back_logistics_no AS relationBackLogisticsNo,
-          back_goods_back_logistics_company AS relationBackLogisticsCompany
-          FROM
-          tb_rst_back_goods
-          LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_back_goods.back_goods_id
-          AND tb_rst_relation_order.relation_type = '6'
-        UNION ALL
-          SELECT
-          '7' AS customerIsSolve,
-          noreason_back_id AS relationId,
-          customer_id AS customerId,
-          tb_rst_relation_order.sales_id AS orderId,
-          signclosed_id AS signclosedId,
-          noreason_back_back_status AS relationBackStatus,
-          NULL AS relationSendStatus,
-          NULL AS relationSendLogisticsNo,
-          NULL AS relationSendLogisticsCompany,
-          noreason_back_back_logistics_no AS relationBackLogisticsNo,
-          noreason_back_back_logistics_company AS relationBackLogisticsCompany
-          FROM
-          tb_rst_noreason_back
-          LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_noreason_back.noreason_back_id
-          AND tb_rst_relation_order.relation_type = '7'
-      ) xx
+        SELECT
+        tb_rst_cm_proc_method.proc_type_id AS customerIsSolve,
+        tb_rst_cm_relation.relation_id AS relationId,
+        customer_id AS customerId,
+        tb_rst_cm_relation_order.sales_id AS orderId,
+        signclosed_id AS signclosedId,
+        relation_back_status AS relationBackStatus,
+        relation_send_status AS relationSendStatus,
+        relation_send_logistics_no AS relationSendLogisticsNo,
+        relation_send_logistics_company AS relationSendLogisticsCompany,
+        relation_back_logistics_no AS relationBackLogisticsNo,
+        relation_back_logistics_company AS relationBackLogisticsCompany,
+        tb_rst_cm_proc_method.proc_method_id AS procMethodId,
+        tb_rst_cm_proc_method.proc_method_name AS procMethodName,
+        tb_rst_cm_proc_type.proc_type_id AS procTypeId,
+        tb_rst_cm_proc_type.proc_type_name AS procTypeName
+        FROM
+        tb_rst_cm_relation
+        LEFT JOIN tb_rst_cm_proc_method ON tb_rst_cm_proc_method.proc_method_id = tb_rst_cm_relation.proc_method_id
+        LEFT JOIN tb_rst_cm_proc_type ON tb_rst_cm_proc_type.proc_type_id = tb_rst_cm_proc_method.proc_type_id
+        LEFT JOIN tb_rst_cm_relation_order ON tb_rst_cm_relation_order.relation_id = tb_rst_cm_relation.relation_id
+        ) xx
     ) cc ON cc.customerId = c.customer_id
-    LEFT JOIN tb_rst_visit v ON v.customer_id = c.customer_id
+    LEFT JOIN tb_rst_cm_visit v ON v.customer_id = c.customer_id
     LEFT JOIN tb_rst_sales_order_info oi ON cc.orderId = oi.sales_id
-    LEFT JOIN tb_rst_question_describe qd ON c.customer_id = qd.customer_id
-    LEFT JOIN tb_rst_complaint_question cq ON c.question_id = cq.question_id
-    LEFT JOIN tb_rst_complaint_small_class csc ON csc.small_class_id = cq.small_class_id
-    LEFT JOIN tb_rst_complaint_type ct ON ct.complaint_id = csc.complaint_id
+    LEFT JOIN tb_rst_cm_question_describe qd ON c.customer_id = qd.customer_id
+    LEFT JOIN tb_rst_cm_complaint_question cq ON c.question_id = cq.question_id
+    LEFT JOIN tb_rst_cm_complaint_small_class csc ON csc.small_class_id = cq.small_class_id
+    LEFT JOIN tb_rst_cm_complaint_type ct ON ct.complaint_id = csc.complaint_id
     LEFT JOIN tb_rst_sales_company sc ON c.company_id = sc.company_id
     LEFT JOIN tb_rst_store_info si ON c.store_id = si.store_id
     LEFT JOIN tb_rst_product_type t ON c.type_id = t.type_id
@@ -393,7 +338,7 @@
         c.customer_wechat_name like CONCAT('%',#{customerName},'%')
       </if>
       <if test="customerIsSolve != null">
-        AND c.customer_is_solve = #{customerIsSolve}
+        AND cc.customerIsSolve = #{customerIsSolve}
       </if>
       <if test="customerTel != null and customerTel != ''">
         and c.customer_tel like CONCAT('%',#{customerTel},'%')
@@ -440,39 +385,15 @@
       <if test="backStatus != null and backStatus != ''">
         and c.customer_id in (
         SELECT customer_id
-        FROM tb_rst_renewed trr
-        WHERE renewed_back_status = #{backStatus}
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_repair
-        WHERE repair_back_status =#{backStatus}
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_back_goods
-        WHERE back_goods_back_status = #{backStatus}
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_noreason_back
-        WHERE noreason_back_back_status = #{backStatus}
+        FROM tb_rst_cm_relation trr
+        WHERE relation_back_status = #{backStatus}
         )
       </if>
       <if test="backStatus == 1">
         and c.customer_id in (
         SELECT customer_id
-        FROM tb_rst_renewed trr
-        WHERE DATEDIFF(NOW(), renewed_create_time) &gt; 3
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_repair
-        WHERE DATEDIFF(NOW(), repair_create_time) &gt; 3
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_back_goods
-        WHERE DATEDIFF(NOW(), back_goods_create_time) &gt; 3
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_noreason_back
-        WHERE DATEDIFF(NOW(), noreason_back_create_time) &gt; 3
+        FROM tb_rst_cm_relation trr
+        WHERE DATEDIFF(NOW(), relation_create_time) &gt; 3
         )
       </if>
     </where>
@@ -531,24 +452,27 @@
   </select>
 
   <insert id="insert" parameterType="CustomerInfo"  useGeneratedKeys="true"  keyProperty="customerId">
-    insert into tb_rst_customer_info (customer_id, admin_id, question_id, 
+    insert into tb_rst_cm_customer_info (customer_id, admin_id, question_id,
       company_id, store_id, customer_source_type, 
       customer_source, customer_counsel_type, customer_name, 
       customer_tel,customer_wechat_name, customer_is_solve, customer_is_visit,
-      customer_in_TDS, customer_out_TDS, customer_area, type_id, customer_desc, customer_out_damaged, customer_secondary_customer, customer_last_id, customer_initial_id
+      customer_in_TDS, customer_out_TDS, customer_area, type_id, customer_desc, customer_out_damaged, customer_secondary_customer, customer_last_id,
+       customer_province_id,customer_city_id,customer_district_id,
+       customer_initial_id
       )
     values (#{customerId,jdbcType=INTEGER}, #{adminId,jdbcType=INTEGER}, #{questionId,jdbcType=INTEGER}, 
       #{companyId,jdbcType=INTEGER}, #{storeId,jdbcType=INTEGER}, #{customerSourceType,jdbcType=TINYINT}, 
       #{customerSource,jdbcType=VARCHAR}, #{customerCounselType,jdbcType=BIT}, #{customerName,jdbcType=VARCHAR}, 
       #{customerTel,jdbcType=VARCHAR},#{customerWechatName,jdbcType=VARCHAR}, #{customerIsSolve,jdbcType=TINYINT}, #{customerIsVisit,jdbcType=VARCHAR},
-      #{customerInTDS,jdbcType=INTEGER}, #{customerOutTDS,jdbcType=INTEGER}, #{customerArea,jdbcType=VARCHAR},#{typeId},#{customerDesc},#{customerOutDamaged},#{customerSecondaryCustomer}
-      ,#{customerLastId},#{customerInitialId}
+      #{customerInTDS,jdbcType=INTEGER}, #{customerOutTDS,jdbcType=INTEGER}, #{customerArea,jdbcType=VARCHAR},#{typeId},#{customerDesc},#{customerOutDamaged},#{customerSecondaryCustomer},#{customerLastId},
+      #{customerProvinceId},#{customerCityId},#{customerDistrictId},
+      #{customerInitialId}
       )
   </insert>
 
   <!-- 修改客诉信息 -->
   <update id="updateCustomerInfo" parameterType="CustomerInfo" >
-    update tb_rst_customer_info
+    update tb_rst_cm_customer_info
     <set >
       <if test="adminId != null" >
         admin_id = #{adminId},
@@ -617,7 +541,16 @@
         customer_last_id = #{customerLastId},
       </if>
       <if test="customerInitialId != null" >
-        customer_initial_id = #{customerInitialId}
+        customer_initial_id = #{customerInitialId},
+      </if>
+      <if test="customerProvinceId != null" >
+        customer_province_id = #{customerProvinceId},
+      </if>
+      <if test="customerCityId != null" >
+        customer_city_id = #{customerCityId},
+      </if>
+      <if test="customerDistrictId != null" >
+        customer_district_id = #{customerDistrictId},
       </if>
       <if test="factoryId != null" >
         factory_id = #{factoryId}
@@ -631,7 +564,7 @@
         pt.*
     FROM
         tb_rst_product_type pt
-    LEFT JOIN tb_rst_customer_info ci ON pt.type_id = ci.type_id
+    LEFT JOIN tb_rst_cm_customer_info ci ON pt.type_id = ci.type_id
     where
     ci.customer_id = #{customerId}
   </select>
@@ -640,7 +573,7 @@
       SELECT
         COUNT(customer_id)
       FROM
-        tb_rst_customer_info
+        tb_rst_cm_customer_info
       <where>
         <if test="questionId != null" >
            question_id = #{questionId}
@@ -698,16 +631,16 @@
     d.describe_handle_desc,
     d.describe_content
     from
-    tb_rst_customer_info c
-    LEFT JOIN tb_rst_question_describe d ON c.customer_id = d.customer_id
+    tb_rst_cm_customer_info c
+    LEFT JOIN tb_rst_cm_question_describe d ON c.customer_id = d.customer_id
     LEFT JOIN tb_rst_product_type t ON c.type_id = t.type_id
-    LEFT JOIN tb_rst_complaint_question q ON c.question_id = q.question_id
-    LEFT JOIN tb_rst_complaint_small_class s ON q.small_class_id = s.small_class_id
-    LEFT JOIN tb_rst_complaint_type ct ON s.complaint_id = ct.complaint_id
+    LEFT JOIN tb_rst_cm_complaint_question q ON c.question_id = q.question_id
+    LEFT JOIN tb_rst_cm_complaint_small_class s ON q.small_class_id = s.small_class_id
+    LEFT JOIN tb_rst_cm_complaint_type ct ON s.complaint_id = ct.complaint_id
     LEFT JOIN tb_rst_sales_company sc ON c.company_id = sc.company_id
     LEFT JOIN tb_rst_store_info si ON c.store_id = si.store_id
     LEFT JOIN tb_rst_sys_admin a ON c.admin_id = a.admin_id
-    LEFT JOIN tb_rst_visit v ON v.customer_id = c.customer_id
+    LEFT JOIN tb_rst_cm_visit v ON v.customer_id = c.customer_id
     LEFT JOIN tb_rst_sys_admin sa ON v.designated_admin_id = sa.admin_id
     <where>
       <if test="customerName != null and customerName != ''">
@@ -804,11 +737,11 @@ ELSE
 END) AS customerSecondaryCustomer,
 sa.admin_name AS adminName
 FROM
-	tb_rst_customer_info c
-LEFT JOIN tb_rst_question_describe qd ON c.customer_id = qd.customer_id
-LEFT JOIN tb_rst_complaint_question cq ON c.question_id = cq.question_id
-LEFT JOIN tb_rst_complaint_small_class csc ON csc.small_class_id = cq.small_class_id
-LEFT JOIN tb_rst_complaint_type ct ON ct.complaint_id = csc.complaint_id
+	tb_rst_cm_customer_info c
+LEFT JOIN tb_rst_cm_question_describe qd ON c.customer_id = qd.customer_id
+LEFT JOIN tb_rst_cm_complaint_question cq ON c.question_id = cq.question_id
+LEFT JOIN tb_rst_cm_complaint_small_class csc ON csc.small_class_id = cq.small_class_id
+LEFT JOIN tb_rst_cm_complaint_type ct ON ct.complaint_id = csc.complaint_id
 LEFT JOIN tb_rst_sales_company sc ON c.company_id = sc.company_id
 LEFT JOIN tb_rst_store_info si ON c.store_id = si.store_id
 LEFT JOIN tb_rst_sys_admin sa ON c.admin_id = sa.admin_id
@@ -870,7 +803,7 @@ LEFT JOIN tb_rst_sys_admin sa ON c.admin_id = sa.admin_id
       </if>
     </where>
     GROUP BY oi.sales_id) salesNum
-    LEFT JOIN tb_rst_relation_order ro
+    LEFT JOIN tb_rst_cm_relation_order ro
     on ro.sales_id = salesNum.sales_id
     WHERE relation_type = 3) salesExchange
     GROUP BY
@@ -904,7 +837,7 @@ LEFT JOIN tb_rst_sys_admin sa ON c.admin_id = sa.admin_id
       </if>
     </where>
     GROUP BY oi.sales_id) salesNum
-    LEFT JOIN tb_rst_relation_order ro
+    LEFT JOIN tb_rst_cm_relation_order ro
     on ro.sales_id = salesNum.sales_id
     WHERE relation_type in (6,7)) salesExchange
     GROUP BY
@@ -938,11 +871,11 @@ LEFT JOIN tb_rst_sys_admin sa ON c.admin_id = sa.admin_id
       </if>
     </where>
     GROUP BY oi.sales_id) salesNum
-    LEFT JOIN tb_rst_relation_order ro
+    LEFT JOIN tb_rst_cm_relation_order ro
     on ro.sales_id = salesNum.sales_id
     LEFT JOIN tb_rst_renewed rr
     on ro.relation_id = rr.renewed_id
-    LEFT JOIN tb_rst_customer_info ci
+    LEFT JOIN tb_rst_cm_customer_info ci
     ON rr.customer_id = ci.customer_id
     WHERE relation_type = 3 and ci.customer_secondary_customer = 1) salesExchange
     GROUP BY
@@ -976,16 +909,139 @@ LEFT JOIN tb_rst_sys_admin sa ON c.admin_id = sa.admin_id
       </if>
     </where>
     GROUP BY oi.sales_id) salesNum
-    LEFT JOIN tb_rst_relation_order ro
+    LEFT JOIN tb_rst_cm_relation_order ro
     on ro.sales_id = salesNum.sales_id
     LEFT JOIN tb_rst_renewed rr
     on ro.relation_id = rr.renewed_id
-    LEFT JOIN tb_rst_customer_info ci
+    LEFT JOIN tb_rst_cm_customer_info ci
     ON rr.customer_id = ci.customer_id
     WHERE relation_type in(6,7) and ci.customer_secondary_customer = 1) salesExchange
     GROUP BY
     MONTH (salesExchange.sales_create_time)
   </select>
   <!-- 退换货统计sql end -->
+  <!-- 查询所有处理类型-->
+  <select id="listProcType" resultType="ProcType">
+    SELECT * from tb_rst_cm_proc_type
+  </select>
+  <!-- 根据处理类型查询处理方式-->
+  <select id="listProcMethod" parameterType="Integer" resultType="ProcMethod">
+    SELECT * from tb_rst_cm_proc_method WHERE proc_type_id = #{procTypeId}
+  </select>
+  <!-- 根据id查询处理方式-->
+  <select id="getProcMethod" parameterType="Integer" resultType="ProcMethod">
+    SELECT * from tb_rst_cm_proc_method WHERE proc_method_id = #{procMethodId}
+  </select>
+
+  <!-- 修改售后处理信息 -->
+  <update id="updateCmRelation" parameterType="CmRelation" >
+    UPDATE tb_rst_cm_relation
+      <set>
+        <if test="signclosedId != null and signclosedId != ''">
+          signclosed_id = #{"signclosedId"},
+        </if>
+        <if test="relationBackStatus != null and relationBackStatus != ''" >
+          relation_back_status = #{relationBackStatus},
+        </if>
+        <if test="relationBackName != null and relationBackName != ''" >
+          relation_back_name = #{relationBackName},
+        </if>
+        <if test="relationBackTel != null and relationBackTel != ''" >
+          relation_back_tel = #{relationBackTel},
+        </if>
+        <if test="relationBackLogisticsCompany != null and relationBackLogisticsCompany != ''" >
+          relation_back_logistics_company = #{relationBackTel},
+        </if>
+        <if test="relationBackLogisticsNo != null and relationBackLogisticsNo != ''" >
+          relation_back_logistics_no = #{relationBackLogisticsNo},
+        </if>
+        <if test="relationBackPostage != null and relationBackPostage != ''" >
+          relation_back_postage = #{relationBackPostage},
+        </if>
+        <if test="relationBackMachineNo != null and relationBackMachineNo != ''" >
+          relation_back_machine_no = #{relationBackMachineNo},
+        </if>
+        <if test="relationSendStatus != null and relationSendStatus != ''" >
+          relation_send_status = #{relationSendStatus},
+        </if>
+        <if test="relationBackEfastOrderId != null and relationBackEfastOrderId != ''" >
+          relation_back_efast_order_id = #{relationBackEfastOrderId},
+        </if>
+        <if test="relationSendName != null and relationSendName != ''" >
+          relation_send_name = #{relationSendName},
+        </if>
+        <if test="relationSendTel != null and relationSendTel != ''" >
+          relation_send_tel = #{relationSendTel},
+        </if>
+        <if test="provinceNumber != null and provinceNumber != ''" >
+          province_number = #{provinceNumber},
+        </if>
+        <if test="cityNumber != null and cityNumber != ''" >
+          city_number = #{cityNumber},
+        </if>
+        <if test="areaNumber != null and areaNumber != ''" >
+          area_number = #{areaNumber},
+        </if>
+        <if test="relationSendMergeAddress != null and relationSendMergeAddress != ''" >
+          relation_send_merge_address = #{relationSendMergeAddress},
+        </if>
+        <if test="relationSendAddress != null and relationSendAddress != ''" >
+          relation_send_address = #{relationSendAddress},
+        </if>
+        <if test="relationSendLogisticsCompany != null and relationSendLogisticsCompany != ''" >
+          relation_send_logistics_company = #{relationSendLogisticsCompany},
+        </if>
+        <if test="relationSendLogisticsNo != null and relationSendLogisticsNo != ''" >
+          relation_send_logistics_no = #{relationSendLogisticsNo},
+        </if>
+        <if test="relationDesc != null and relationDesc != ''" >
+          relation_desc = #{relationDesc},
+        </if>
+        <if test="relationState != null and relationState != ''" >
+          relation_state = #{relationState},
+        </if>
+        <if test="relationAlipay != null and relationAlipay != ''" >
+          relation_alipay = #{relationAlipay},
+        </if>
+        <if test="relationAlipayName != null and relationAlipayName != ''" >
+          relation_alipay_name = #{relationAlipayName},
+        </if>
+        <if test="relationIsTransfer != null and relationIsTransfer != ''" >
+          relation_is_transfer = #{relationIsTransfer},
+        </if>
+        <if test="relationCreateTime != null and relationCreateTime != ''" >
+          relation_create_time = #{relationCreateTime},
+        </if>
+        <if test="relationUpdateTime != null and relationUpdateTime != ''" >
+          relation_update_time = #{relationUpdateTime},
+        </if>
+        <if test="relationFactoryCosts != null and relationFactoryCosts != ''" >
+          relation_factory_costs = #{relationFactoryCosts},
+        </if>
+        <if test="relationCustomerCosts != null and relationCustomerCosts != ''" >
+          relation_customer_costs = #{relationCustomerCosts},
+        </if>
+        <if test="relationBackReceiptDate != null and relationBackReceiptDate != ''" >
+          relation_back_receipt_date = #{relationBackReceiptDate}
+        </if>
+      </set>
+      <where>
+        relation_id = #{relationId}
+      </where>
+  </update>
 
+  <select id="getCmRelationInfo" parameterType="CmRelation" resultType="CmRelation">
+    SELECT
+      *
+     FROM
+     tb_rst_cm_relation
+    <where>
+      <if test="relationId != null and relationId != ''">
+        relation_id = #{relationId},
+      </if>
+      <if test="customerId != null and customerId != ''">
+        customer_id = #{customerId}
+      </if>
+    </where>
+  </select>
 </mapper>

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

@@ -243,7 +243,7 @@
         LEFT JOIN tb_rst_sales_company trsc ON t.sales_company_id = trsc.company_id
         LEFT JOIN tb_rst_store_info si ON t.sales_store_id = si.store_id
         LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
-        LEFT JOIN tb_rst_customer_info ci ON t.sales_customer_id = ci.customer_id
+        LEFT JOIN tb_rst_cm_customer_info ci ON t.sales_customer_id = ci.customer_id
         <where>
             <if test="isCustmerAddOrder !=null and isCustmerAddOrder == 2">
                 AND sales_batch_id != 'KS00000000000001'

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

@@ -0,0 +1,103 @@
+<?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.ProcMethodMapper">
+    <resultMap  id="BaseResultMap" type="ProcMethod" >
+        <result    column="proc_method_id"    property="procMethodId" />
+        <result    column="proc_type_id"    property="procTypeId" />
+        <result    column="proc_method_name"    property="procMethodName" />
+        <result    column="proc_method_status"    property="procMethodStatus" />
+        <result    column="proc_method_desc"    property="procMethodDesc" />
+        <result    column="proc_method_is_back"    property="procMethodIsBack" />
+        <result    column="proc_method_is_send"    property="procMethodIsSend" />
+        <result    column="proc_method_create_time"    property="procMethodCreateTime" />
+        <result    column="proc_method_update_time"    property="procMethodUpdateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.proc_method_id,
+        t.proc_type_id,
+        t.proc_method_name,
+        t.proc_method_status,
+        t.proc_method_desc,
+        t.proc_method_is_back,
+        t.proc_method_is_send,
+        t.proc_method_create_time,
+        t.proc_method_update_time
+    </sql>
+    <select id="getProcMethodList" resultMap="BaseResultMap" parameterType="ProcMethod" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_cm_proc_method t
+        <where>
+            <if test="procMethodId != null ">
+                AND t.proc_method_id = #{procMethodId}
+            </if >
+            <if test="procTypeId != null ">
+                AND t.proc_type_id = #{procTypeId}
+            </if >
+            <if test="procMethodName != null and procMethodName != ''">
+                AND t.proc_method_name  like  CONCAT ('%',#{procMethodName},'%')
+            </if >
+            <if test="procMethodStatus != null ">
+                AND t.proc_method_status = #{procMethodStatus}
+            </if >
+            <if test="procMethodIsBack != null ">
+                AND t.proc_method_is_back = #{procMethodIsBack}
+            </if >
+            <if test="procMethodIsSend != null ">
+                AND t.proc_method_is_send = #{procMethodIsSend}
+            </if >
+        </where>
+    </select>
+    <select id="getProcMethodById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_cm_proc_method t
+        where t.proc_method_id= #{procMethodId}
+    </select>
+    <insert id="save" parameterType="ProcMethod" >
+        insert into
+        tb_rst_cm_proc_method
+        (
+        proc_type_id,
+        proc_method_name,
+        proc_method_status,
+        proc_method_desc,
+        proc_method_is_back,
+        proc_method_is_send
+        )
+        values
+        (
+        #{procTypeId},
+        #{procMethodName},
+        #{procMethodStatus},
+        #{procMethodDesc},
+        #{procMethodIsBack},
+        #{procMethodIsSend}
+        )
+    </insert>
+    <update id="update" parameterType="ProcMethod" >
+        update
+        tb_rst_cm_proc_method
+        <set >
+            <if test="procTypeId != null ">
+                proc_type_id = #{procTypeId},
+            </if >
+            <if test="procMethodName != null and procMethodName != ''">
+                proc_method_name = #{procMethodName},
+            </if >
+            <if test="procMethodStatus != null ">
+                proc_method_status = #{procMethodStatus},
+            </if >
+            <if test="procMethodDesc != null and procMethodDesc != ''">
+                proc_method_desc = #{procMethodDesc},
+            </if >
+            <if test="procMethodIsBack != null ">
+                proc_method_is_back = #{procMethodIsBack},
+            </if >
+            <if test="procMethodIsSend != null ">
+                proc_method_is_send = #{procMethodIsSend},
+            </if >
+        </set >
+        where proc_method_id= #{procMethodId}
+    </update>
+</mapper>

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

@@ -0,0 +1,85 @@
+<?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.ProcTypeMapper">
+    <resultMap  id="BaseResultMap" type="ProcType" >
+        <result    column="proc_type_id"    property="procTypeId" />
+        <result    column="proc_type_name"    property="procTypeName" />
+        <result    column="proc_type_status"    property="procTypeStatus" />
+        <result    column="proc_type_sale_status"    property="procTypeSaleStatus" />
+        <result    column="proc_type_desc"    property="procTypeDesc" />
+        <result    column="proc_type_create_time"    property="procTypeCreateTime" />
+        <result    column="proc_type_update_time"    property="procTypeUpdateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.proc_type_id,
+        t.proc_type_name,
+        t.proc_type_sale_status,
+        t.proc_type_status,
+        t.proc_type_desc,
+        t.proc_type_create_time,
+        t.proc_type_update_time
+    </sql>
+    <select id="getProcTypeList" resultMap="BaseResultMap" parameterType="ProcType" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_cm_proc_type t
+        <where>
+            <if test="procTypeId != null ">
+                AND t.proc_type_id = #{procTypeId}
+            </if >
+            <if test="procTypeName != null and procTypeName != ''">
+                AND t.proc_type_name  like  CONCAT ('%',#{procTypeName},'%')
+            </if >
+            <if test="procTypeStatus != null ">
+                AND t.proc_type_status = #{procTypeStatus}
+            </if >
+            <if test="procTypeSaleStatus != null ">
+                AND t.proc_type_sale_status = #{procTypeSaleStatus}
+            </if >
+        </where>
+    </select>
+    <select id="getProcTypeById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_cm_proc_type t
+        where t.proc_type_id= #{procTypeId}
+    </select>
+    <insert id="save" parameterType="ProcType" >
+        insert into
+        tb_rst_cm_proc_type
+        (
+        proc_type_name,
+        proc_type_status,
+        proc_type_sale_status,
+        proc_type_desc
+        )
+        values
+        (
+        #{procTypeName},
+        #{procTypeStatus},
+        #{procTypeSaleStatus},
+        #{procTypeDesc}
+        )
+    </insert>
+    <update id="update" parameterType="ProcType" >
+        update
+        tb_rst_cm_proc_type
+        <set >
+            <if test="procTypeName != null and procTypeName != ''">
+                proc_type_name = #{procTypeName},
+            </if >
+            <if test="procTypeStatus != null ">
+                proc_type_status = #{procTypeStatus},
+            </if >
+            <if test="procTypeDesc != null and procTypeDesc != ''">
+                proc_type_desc = #{procTypeDesc},
+            </if >
+        </set >
+        where proc_type_id= #{procTypeId}
+    </update>
+    <delete id="delete" parameterType="Integer" >
+        delete FROM
+        tb_rst_cm_proc_type
+        where proc_type_id=#{procTypeId}
+    </delete>
+</mapper>

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

@@ -17,37 +17,37 @@
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
-    from tb_rst_question_describe
+    from tb_rst_cm_question_describe
     where describe_id = #{describeId,jdbcType=INTEGER}
   </select>
 
   <!-- 查询问题集合 -->
   <select id="listQuestionDescribe" parameterType="QuestionDescribe" resultType="QuestionDescribe">
     select
-    tb_rst_question_describe.*,
-    tb_rst_customer_info.customer_desc,
-    tb_rst_customer_info.customer_create_time
-    from tb_rst_question_describe
-    LEFT JOIN tb_rst_customer_info on tb_rst_customer_info.customer_id = tb_rst_question_describe.customer_id
+    tb_rst_cm_question_describe.*,
+    tb_rst_cm_customer_info.customer_desc,
+    tb_rst_cm_customer_info.customer_create_time
+    from tb_rst_cm_question_describe
+    LEFT JOIN tb_rst_cm_customer_info on tb_rst_cm_customer_info.customer_id = tb_rst_cm_question_describe.customer_id
     <where>
       <if test="customerId">
-        tb_rst_question_describe.customer_id = #{customerId}
+        tb_rst_cm_question_describe.customer_id = #{customerId}
       </if>
     </where>
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from tb_rst_question_describe
+    delete from tb_rst_cm_question_describe
     where describe_id = #{describeId,jdbcType=INTEGER}
   </delete>
 
   <insert id="insert" parameterType="QuestionDescribe" >
-    insert into tb_rst_question_describe (describe_id, describe_content, customer_id,describe_title,describe_handle_desc)
+    insert into tb_rst_cm_question_describe (describe_id, describe_content, customer_id,describe_title,describe_handle_desc)
     values (#{describeId,jdbcType=INTEGER}, #{describeContent,jdbcType=VARCHAR}, #{customerId,jdbcType=INTEGER}, #{describeTitle}, #{describeHandleDesc})
   </insert>
 
   <insert id="insertSelective" parameterType="QuestionDescribe" >
-    insert into tb_rst_question_describe
+    insert into tb_rst_cm_question_describe
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="describeId != null" >
         describe_id,
@@ -72,7 +72,7 @@
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="QuestionDescribe" >
-    update tb_rst_question_describe
+    update tb_rst_cm_question_describe
     <set >
       <if test="describeContent != null" >
         describe_content = #{describeContent,jdbcType=VARCHAR},
@@ -90,7 +90,7 @@
     where describe_id = #{describeId,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="QuestionDescribe" >
-    update tb_rst_question_describe
+    update tb_rst_cm_question_describe
     set describe_content = #{describeContent,jdbcType=VARCHAR},
       customer_id = #{customerId,jdbcType=INTEGER}
     where describe_id = #{describeId,jdbcType=INTEGER}

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

@@ -16,7 +16,7 @@
     <select id="getRelationOrderList" resultMap="BaseResultMap" parameterType="RelationOrder" >
         select
         <include refid="Base_List" />
-        from tb_rst_relation_order t
+        from tb_rst_cm_relation_order t
         <where>
             <if test="relationOrderId != null ">
                 AND t.relation_order_id = #{relationOrderId}
@@ -38,12 +38,12 @@
     <select id="getRelationOrderById" resultMap="BaseResultMap" parameterType="Integer" >
         select
         <include refid="Base_List" />
-        from tb_rst_relation_order t
+        from tb_rst_cm_relation_order t
         where t.relation_order_id= #{relationOrderId}
     </select>
     <insert id="save" parameterType="RelationOrder" >
         insert into
-        tb_rst_relation_order
+        tb_rst_cm_relation_order
         (
         relation_order_id,
         relation_customer_id,
@@ -62,7 +62,7 @@
     </insert>
     <update id="update" parameterType="RelationOrder" >
         update
-        tb_rst_relation_order
+        tb_rst_cm_relation_order
         <set >
             <if test="relationCustomerId != null ">
                 relation_customer_id = #{relationCustomerId},
@@ -82,19 +82,27 @@
 
     <delete id="delete" parameterType="Integer" >
         delete FROM
-        tb_rst_relation_order
+        tb_rst_cm_relation_order
         where relation_order_id=#{relationOrderId}
     </delete>
 
     <delete id="deleteByRelationId" parameterType="Integer" >
         delete FROM
-          tb_rst_relation_order
+          tb_rst_cm_relation_order
         where relation_id=#{relationId}
     </delete>
 
+    <delete id="deleteByRelationOrder" parameterType="Integer" >
+        delete FROM
+        tb_rst_cm_relation_order
+        where
+              relation_id=#{relationId}
+        AND relation_type =#{relationType}
+    </delete>
+
     <insert id="saveList" parameterType="java.util.List" >
         insert into
-        tb_rst_relation_order
+        tb_rst_cm_relation_order
         (
         relation_order_id,
         relation_customer_id,

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

@@ -55,7 +55,7 @@
     LEFT JOIN tb_rst_sales_company trsc ON t.sales_company_id = trsc.company_id
     LEFT JOIN tb_rst_store_info trsi ON t.sales_store_id = trsi.store_id
      LEFT JOIN tb_rst_order_batch od ON t.sales_batch_id = od.batch_id
-    LEFT JOIN tb_rst_customer_info ci ON t.sales_customer_id = ci.customer_id
+    LEFT JOIN tb_rst_cm_customer_info ci ON t.sales_customer_id = ci.customer_id
     where sales_id = #{salesId}
   </select>
 
@@ -66,7 +66,7 @@
             temp.*,
             trsc.company_name companyName,
             trsi.store_name  storeName,
-            ci.customer_is_solve customerIsSolve,
+            pt.proc_type_name procTypeName,
             od.batch_create_time  batchCreateTime,
             ao.admin_name  salesAdminName
         FROM
@@ -161,7 +161,9 @@
         LEFT JOIN tb_rst_sales_company trsc ON temp.sales_company_id = trsc.company_id
         LEFT JOIN tb_rst_store_info trsi ON temp.sales_store_id = trsi.store_id
         LEFT JOIN tb_rst_order_batch od ON temp.sales_batch_id = od.batch_id
-        LEFT JOIN tb_rst_customer_info ci ON temp.sales_customer_id = ci.customer_id
+        LEFT JOIN tb_rst_cm_relation cr ON temp.sales_customer_id = cr.customer_id
+        LEFT JOIN tb_rst_cm_proc_method pm ON pm.proc_method_id = cr.proc_method_id
+        LEFT JOIN tb_rst_cm_proc_type pt ON pt.proc_type_id = pm.proc_type_id
         LEFT JOIN tb_rst_sys_admin ao ON temp.sales_admin_id = ao.admin_id
     </select>
 
@@ -178,7 +180,7 @@
     LEFT JOIN tb_rst_sales_company trsc ON tb_rst_sales_order_info.sales_company_id = trsc.company_id
     LEFT JOIN tb_rst_store_info trsi ON tb_rst_sales_order_info.sales_store_id = trsi.store_id
     LEFT JOIN tb_rst_order_batch od ON tb_rst_sales_order_info.sales_batch_id = od.batch_id
-    LEFT JOIN tb_rst_customer_info ci ON tb_rst_sales_order_info.sales_customer_id = ci.customer_id
+    LEFT JOIN tb_rst_cm_customer_info ci ON tb_rst_sales_order_info.sales_customer_id = ci.customer_id
     LEFT JOIN tb_rst_sales_order_item oi ON tb_rst_sales_order_info.sales_id = oi.item_order_id
     LEFT JOIN tb_rst_sys_admin ao ON tb_rst_sales_order_info.sales_admin_id = ao.admin_id
     <where>
@@ -269,7 +271,7 @@
         LEFT JOIN tb_rst_sales_company trsc ON tb_rst_sales_order_info.sales_company_id = trsc.company_id
         LEFT JOIN tb_rst_store_info trsi ON tb_rst_sales_order_info.sales_store_id = trsi.store_id
         LEFT JOIN tb_rst_order_batch od ON tb_rst_sales_order_info.sales_batch_id = od.batch_id
-        LEFT JOIN tb_rst_customer_info ci ON tb_rst_sales_order_info.sales_customer_id = ci.customer_id
+        LEFT JOIN tb_rst_cm_customer_info ci ON tb_rst_sales_order_info.sales_customer_id = ci.customer_id
         LEFT JOIN tb_rst_sales_order_item oi ON tb_rst_sales_order_info.sales_id = oi.item_order_id
         <where>
             tb_rst_sales_order_info.sales_batch_id != 'KS00000000000001'
@@ -1140,7 +1142,7 @@
         LEFT JOIN tb_rst_sales_company trsc ON t.sales_company_id = trsc.company_id
         LEFT JOIN tb_rst_store_info si ON t.sales_store_id = si.store_id
         LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
-        LEFT JOIN tb_rst_customer_info ci ON t.sales_customer_id = ci.customer_id
+        LEFT JOIN tb_rst_cm_customer_info ci ON t.sales_customer_id = ci.customer_id
       <where>
             t.sales_batch_id != 'KS00000000000001'
           <if test="salesIsDownload !=null ">

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

@@ -15,7 +15,7 @@
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
-    from tb_rst_send_prodcue
+    from tb_rst_cm_send_prodcue
     where send_prodcue_id = #{sendProdcueId,jdbcType=INTEGER}
   </select>
 
@@ -26,7 +26,7 @@
       pi.product_name sendProduceName,
       po.color_name sendColorName
     from
-      tb_rst_send_prodcue sp
+      tb_rst_cm_send_prodcue sp
     LEFT JOIN tb_rst_product_info pi ON sp.product_id = pi.product_id
     LEFT JOIN tb_rst_product_color po ON sp.color_id = po.color_id
     <where>
@@ -40,7 +40,7 @@
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="SendProdcue" >
-    delete from tb_rst_send_prodcue
+    delete from tb_rst_cm_send_prodcue
     <where>
       <if test="sendProdcueId != null and sendProdcueId != ''">
         send_prodcue_id = #{sendProdcueId}
@@ -48,24 +48,27 @@
       <if test="relationId != null and relationId != ''">
         and relation_id = #{relationId}
       </if>
+      <if test="sendProduceType != null and sendProduceType != ''">
+        and send_produce_type = #{sendProduceType}
+      </if>
     </where>
   </delete>
 
   <insert id="insert" parameterType="SendProdcue" >
-    insert into tb_rst_send_prodcue ( relation_id, product_id,
-      color_id, send_prodcue_number,send_produce_type,color_bar)
+    insert into tb_rst_cm_send_prodcue ( relation_id, product_id,
+      color_id, send_prodcue_number,color_bar)
     values
     <foreach collection="list" item="node" index="index" separator="," open="" close="">
       (
         #{node.relationId}, #{node.productId},
-        #{node.colorId}, #{node.sendProdcueNumber}, #{node.sendProduceType}, #{node.colorBar}
+        #{node.colorId}, #{node.sendProdcueNumber},  #{node.colorBar}
       )
     </foreach>
 
   </insert>
 
   <insert id="insertSelective" parameterType="SendProdcue" >
-    insert into tb_rst_send_prodcue
+    insert into tb_rst_cm_send_prodcue
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="sendProdcueId != null" >
         send_prodcue_id,
@@ -108,7 +111,7 @@
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="SendProdcue" >
-    update tb_rst_send_prodcue
+    update tb_rst_cm_send_prodcue
     <set >
       <if test="relationId != null" >
         relation_id = #{relationId,jdbcType=INTEGER},

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

@@ -38,7 +38,7 @@
   <select id="getVisit" resultMap="BaseResultMap" parameterType="Visit" >
     select 
     <include refid="Base_Column_List" />
-    from tb_rst_visit
+    from tb_rst_cm_visit
     <where>
       <if test="visitId != null" >
         AND visit_id = #{visitId}
@@ -56,7 +56,7 @@
       a.admin_name designatedAdminName,
       sa.admin_name adminName
     FROM
-      tb_rst_visit v
+      tb_rst_cm_visit v
     LEFT JOIN tb_rst_sys_admin a ON v.designated_admin_id = a.admin_id
     LEFT JOIN tb_rst_sys_admin sa ON v.admin_id = sa.admin_id
     <where>
@@ -65,7 +65,7 @@
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from tb_rst_visit
+    delete from tb_rst_cm_visit
     <where>
       customer_id = #{customerId}
     </where>
@@ -73,7 +73,7 @@
 
   <!-- 添加客诉回访信息 -->
   <insert id="addVisitInfo" parameterType="Visit" useGeneratedKeys="true"  keyProperty="visitId" >
-    insert into tb_rst_visit (visit_id, customer_id, admin_id, designated_admin_id,
+    insert into tb_rst_cm_visit (visit_id, customer_id, admin_id, designated_admin_id,
       visit_name, visit_tel, visit_date, 
       visit_time_select, visit_status, visit_complete_date, 
       visit_complete_name, visit_complete_tel, visit_complete_remark, 
@@ -86,7 +86,7 @@
   </insert>
   <!-- 修改回访信息内容 -->
   <update id="updateVisit" parameterType="Visit" >
-    update tb_rst_visit
+    update tb_rst_cm_visit
     <set >
       <if test="adminId != null" >
         admin_id = #{adminId},

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

@@ -1,40 +1,40 @@
-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;
-
-import java.util.List;
-
-@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 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);
-    }
+package com.iamberry.rst.service.fm;
+
+
+import com.iamberry.rst.core.fm.AwaitingSignclosedProductInfo;
+import com.iamberry.rst.faces.fm.AwaitingSignclosedProductInfoService;
+import com.iamberry.rst.service.fm.mapper.AwaitingSignclosedProductMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@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 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/cm/ComplaintDetectInfoServiceImpl.java

@@ -1,72 +1,68 @@
-package com.iamberry.rst.service.cm;
-
-
-import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.cm.ComplaintDetectInfo;
-import com.iamberry.rst.core.cm.ComplaintDetectItem;
-import com.iamberry.rst.core.cm.ComplaintMaintenanceInfo;
-import com.iamberry.rst.core.cm.DetectionBasis;
-import com.iamberry.rst.core.order.Order;
-import com.iamberry.rst.core.page.PageRequest;
-import com.iamberry.rst.core.page.PagedResult;
-import com.iamberry.rst.faces.cm.ComplaintDetectInfoService;
-import com.iamberry.rst.service.cm.mapper.AwaitingSignclosedProductMapper;
-import com.iamberry.rst.service.cm.mapper.ComplaintDetectInfoMapper;
-import com.iamberry.rst.service.cm.mapper.ComplaintMaintenanceInfoMapper;
-import com.iamberry.rst.util.PageUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-@Service
-public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoService {
-    @Autowired
-    private ComplaintDetectInfoMapper complaintDetectInfoMapper;
-    @Autowired
-    private ComplaintMaintenanceInfoMapper complaintMaintenanceInfoMapper;
-
-    @Override
-    public int insert(ComplaintDetectInfo record) {
-        return complaintDetectInfoMapper.insert(record);
-    }
-
-    @Override
-    public ComplaintDetectItem getDetectItemById(Integer detectId) {
-        return complaintDetectInfoMapper.getDetectItemById(detectId);
-    }
-
-    @Override
-    public int updateDetectItemById(ComplaintDetectItem record) {
-        return complaintDetectInfoMapper.updateDetectItemById(record);
-    }
-
-
-    @Override
-    public PagedResult<ComplaintDetectItem> listComplaintDetectItem(PageRequest<ComplaintDetectItem> pageRequest) {
-        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
-        List<ComplaintDetectItem> detedctList = complaintDetectInfoMapper.listComplaintDetectItem(pageRequest.getData());
-        return PageUtil.getPage(detedctList);
-    }
-
-    @Override
-    public ComplaintDetectInfo getDetectByCustomerId(Integer customerId) {
-        return complaintDetectInfoMapper.getDetectByCustomerId(customerId);
-    }
-
-    @Override
-    public int insertItem(ComplaintDetectItem complaintDetectItem) {
-        return complaintDetectInfoMapper.insertItem(complaintDetectItem);
-    }
-
-    @Override
-    public int deleteDetectItem(Integer detectItemId) {
-        return complaintDetectInfoMapper.deleteDetectItem(detectItemId);
-    }
-
-    @Override
-    public List<DetectionBasis> listDetectionBasis(DetectionBasis detectionBasis) {
-        return complaintDetectInfoMapper.listDetectionBasis(detectionBasis);
-    }
+package com.iamberry.rst.service.fm;
+
+
+import com.github.pagehelper.PageHelper;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
+import com.iamberry.rst.core.fm.ComplaintDetectItem;
+import com.iamberry.rst.core.fm.DetectionBasis;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.faces.fm.ComplaintDetectInfoService;
+import com.iamberry.rst.service.fm.mapper.ComplaintDetectInfoMapper;
+import com.iamberry.rst.service.fm.mapper.ComplaintMaintenanceInfoMapper;
+import com.iamberry.rst.util.PageUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoService {
+    @Autowired
+    private ComplaintDetectInfoMapper complaintDetectInfoMapper;
+    @Autowired
+    private ComplaintMaintenanceInfoMapper complaintMaintenanceInfoMapper;
+
+    @Override
+    public int insert(ComplaintDetectInfo record) {
+        return complaintDetectInfoMapper.insert(record);
+    }
+
+    @Override
+    public ComplaintDetectItem getDetectItemById(Integer detectId) {
+        return complaintDetectInfoMapper.getDetectItemById(detectId);
+    }
+
+    @Override
+    public int updateDetectItemById(ComplaintDetectItem record) {
+        return complaintDetectInfoMapper.updateDetectItemById(record);
+    }
+
+
+    @Override
+    public PagedResult<ComplaintDetectItem> listComplaintDetectItem(PageRequest<ComplaintDetectItem> pageRequest) {
+        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+        List<ComplaintDetectItem> detedctList = complaintDetectInfoMapper.listComplaintDetectItem(pageRequest.getData());
+        return PageUtil.getPage(detedctList);
+    }
+
+    @Override
+    public ComplaintDetectInfo getDetectByCustomerId(Integer customerId) {
+        return complaintDetectInfoMapper.getDetectByCustomerId(customerId);
+    }
+
+    @Override
+    public int insertItem(ComplaintDetectItem complaintDetectItem) {
+        return complaintDetectInfoMapper.insertItem(complaintDetectItem);
+    }
+
+    @Override
+    public int deleteDetectItem(Integer detectItemId) {
+        return complaintDetectInfoMapper.deleteDetectItem(detectItemId);
+    }
+
+    @Override
+    public List<DetectionBasis> listDetectionBasis(DetectionBasis detectionBasis) {
+        return complaintDetectInfoMapper.listDetectionBasis(detectionBasis);
+    }
 }

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

@@ -1,46 +1,42 @@
-package com.iamberry.rst.service.cm;
-
-
-import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.cm.ComplaintDetectInfo;
-import com.iamberry.rst.core.cm.ComplaintMaintenanceInfo;
-import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
-import com.iamberry.rst.core.page.PageRequest;
-import com.iamberry.rst.core.page.PagedResult;
-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 com.iamberry.rst.util.PageUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@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);
-    }
-
-    @Override
-    public PagedResult<ComplaintMaintenanceInfo> listMaintenance(PageRequest<ComplaintMaintenanceInfo> pageRequest) {
-        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
-        List<ComplaintMaintenanceInfo> signclosedList = complaintMaintenanceInfoMapper.listMaintenance(pageRequest.getData());
-        return PageUtil.getPage(signclosedList);
-    }
+package com.iamberry.rst.service.fm;
+
+
+import com.github.pagehelper.PageHelper;
+import com.iamberry.rst.core.fm.ComplaintMaintenanceInfo;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.faces.fm.ComplaintMaintenanceInfoService;
+import com.iamberry.rst.service.fm.mapper.ComplaintMaintenanceInfoMapper;
+import com.iamberry.rst.util.PageUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@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);
+    }
+
+    @Override
+    public PagedResult<ComplaintMaintenanceInfo> listMaintenance(PageRequest<ComplaintMaintenanceInfo> pageRequest) {
+        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+        List<ComplaintMaintenanceInfo> signclosedList = complaintMaintenanceInfoMapper.listMaintenance(pageRequest.getData());
+        return PageUtil.getPage(signclosedList);
+    }
 }

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

@@ -1,253 +1,257 @@
-package com.iamberry.rst.service.cm;
-
-
-import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.cm.*;
-import com.iamberry.rst.core.order.Product;
-import com.iamberry.rst.core.order.ProductColor;
-import com.iamberry.rst.core.page.PageRequest;
-import com.iamberry.rst.core.page.PagedResult;
-import com.iamberry.rst.faces.cm.ComplaintQuestionInfoService;
-import com.iamberry.rst.faces.cm.ComplaintSignclosedInfoService;
-import com.iamberry.rst.service.cm.mapper.*;
-import com.iamberry.rst.service.product.mapper.ProductMapper;
-import com.iamberry.rst.util.PageUtil;
-import com.iamberry.wechat.tools.ResponseJson;
-import net.sf.json.JSONArray;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedInfoService {
-    @Autowired
-    private ComplaintSignclosedInfoMapper complaintSignclosedInfoMapper;
-    @Autowired
-    private ProductMapper productMapper;
-    @Autowired
-    private AwaitingSignclosedProductMapper awaitingSignclosedProductMapper;
-    @Autowired
-    private ComplaintSignclosedProductInfoMapper complaintSignclosedProductInfoMapper;
-    @Autowired
-    private FittingsInfoMapper fittingsInfoMapper;
-    @Autowired
-    private ComplaintDetectInfoMapper complaintDetectInfoMapper;
-    @Autowired
-    private CustomerInfoMapper customerInfoMapper;
-
-    @Override
-    @Transactional
-    public boolean insert(ComplaintSignclosedInfo record,
-                          String orderItemString) {
-        boolean msg = true;
-        int num = complaintSignclosedInfoMapper.insert(record);
-        if(num < 1){
-            msg = false;
-        }else{
-            if(orderItemString != null){
-                JSONArray jsonArray = JSONArray.fromObject(orderItemString);
-                List<SalesOrderItem> salesOrderItemList = (List) JSONArray.toCollection(jsonArray, SalesOrderItem.class);
-                    for (SalesOrderItem salesOrderItem:salesOrderItemList) {
-                        if(salesOrderItem.getItemNum() > 0 && salesOrderItem.getItemColorId() > 0){
-                        int i = 0;
-                        SignclosedProductInfo signclosedProductInfo = new SignclosedProductInfo();
-                        //根据颜色id获取产品信息获取产品信息
-                            ProductColor productColor = productMapper.getProduceColor(salesOrderItem.getItemColorId());
-                            if(productColor == null){
-                                msg = false;
-                            }
-                        for (int j = 0;j<salesOrderItem.getItemNum();j++){
-                            signclosedProductInfo.setSignclosedId(record.getSignclosedId());
-                            signclosedProductInfo.setProductName(productColor.getProductName());
-                            signclosedProductInfo.setProductNum(1);
-                            signclosedProductInfo.setSignclosedProductType(1);
-                            signclosedProductInfo.setSignclosedProductId(productColor.getColorProductId());
-                            signclosedProductInfo.setSignclosedProductColor(salesOrderItem.getItemColorId());
-                            signclosedProductInfo.setSignclosedCreateTime(new Date());
-                            complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
-                            i++;
-                        }
-
-                    }
-                }
-            }
-        }
-        //关联客诉/判断是否生成客诉信息
-        try {
-            addDetect(record);
-        }catch (Exception e){
-            throw new RuntimeException("------------关联客诉出错------------");
-        }
-
-        return msg;
-    }
-
-    /*关联客诉*/
-    public int addDetect(ComplaintSignclosedInfo record){
-        CustomerInfo customerInfo = new CustomerInfo();
-        if(record.getSignclosedLogisticsNumber() != null){
-            customerInfo.setSendLogisticsNo(record.getSignclosedLogisticsNumber());
-        }
-        if(record.getSignclosedCustomerId() != null){
-            customerInfo.setCustomerId(record.getSignclosedCustomerId());
-        }
-        List<CustomerInfo> listCustomer = customerInfoMapper.listCustomer(customerInfo);
-        if(listCustomer.size() > 0){
-            customerInfo = listCustomer.get(0);
-            ComplaintSignclosedInfo signclosedInfo = new ComplaintSignclosedInfo();
-            signclosedInfo.setSignclosedCustomerId(customerInfo.getCustomerId());
-            signclosedInfo.setSignclosedId(record.getSignclosedId());
-            Integer msg = complaintSignclosedInfoMapper.updateSignclosedById(signclosedInfo);
-            if(msg != 1){
-                return 0;
-            }
-
-//            if(customerInfo.getIsQuality() != null){
-//                if(customerInfo.getIsQuality() == 1){//需要品检
-//                    //根据客诉id查询是否已存在品检信息
-//                    ComplaintDetectInfo complaintDetectInfo = new ComplaintDetectInfo();
-//                    if(complaintDetectInfoMapper.getDetectByCustomerId(customerInfo.getCustomerId()) == null){
-//                        complaintDetectInfo.setCustomerId(customerInfo.getCustomerId());
-//                        complaintDetectInfo.setSignclosedId(record.getSignclosedId());
-//                        complaintDetectInfo.setDetectCreateTime(new Date());
-//                        Integer msg2 = complaintDetectInfoMapper.insert(complaintDetectInfo);
-//                        if(msg2 != 1){
-//                            return 0;
-//                        }
-//                    }
-//                    //添加品检项
-//                    /*List<SignclosedProductInfo> listProductInfo = complaintSignclosedInfoMapper.listSignclosedById(record.getSignclosedId());
-//                    List<ComplaintDetectItem> listDetectItem = new ArrayList<>();
-//                    for(SignclosedProductInfo productInfo : listProductInfo){
-//                        ComplaintDetectItem detectItem = new ComplaintDetectItem();
-//                        detectItem.setDetectId(complaintDetectInfo.getDetectId());
-//                        detectItem.setDetectItemCreateTime(new Date());
-//                        detectItem.setProductId(productInfo.getProductId());
-//                        detectItem.setDetectProductNumber(productInfo.getProductNumber());
-//                        detectItem.setDetectItemState(1);
-//                        listDetectItem.add(detectItem);
-//                    }
-//                    Integer msg3 =  complaintDetectInfoMapper.insertItemList(listDetectItem);
-//                    if(msg3 != 1){
-//                        return 0;
-//                    }*/
-//                }
-//            }
-
-        }
-        return 1;
-    }
-
-    @Override
-    public List<SignclosedProductInfo> listSignclosedById(Integer signclosedId) {
-        return complaintSignclosedInfoMapper.listSignclosedById(signclosedId);
-    }
-
-    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) {
-        return complaintSignclosedInfoMapper.getSignclosedById(signclosedId);
-    }
-    @Transactional
-    @Override
-    public boolean updateSignclosedById(ComplaintSignclosedInfo record,
-                                    Map<String,Integer> alreadyColorMap,
-                                    Map<String,String[]> machineNumberMap,
-                                    Map<String,Integer> alreadyFittingsMap) {
-        boolean msg = true;
-        int num = complaintSignclosedInfoMapper.updateSignclosedById(record);
-        if(num < 1){
-            msg = false;
-        }else{
-            if(alreadyColorMap != null || alreadyColorMap.size() != 0){
-                for (Map.Entry<String,Integer> entry : alreadyColorMap.entrySet()) {
-                    int i = 0;
-                    SignclosedProductInfo signclosedProductInfo = new SignclosedProductInfo();
-                    //根据颜色id获取产品信息获取产品信息
-                    Product product = productMapper.getProductById(Integer.valueOf(entry.getKey()));
-                    if(product == null){
-                        return false;
-                    }
-                    for (int j = 0;j<entry.getValue();j++){
-                        signclosedProductInfo.setSignclosedId(record.getSignclosedId());
-                        signclosedProductInfo.setProductName(product.getProductName());
-                        signclosedProductInfo.setProductNum(1);
-                        signclosedProductInfo.setSignclosedProductType(1);
-                        signclosedProductInfo.setSignclosedProductId(product.getProductId());
-                        signclosedProductInfo.setSignclosedProductColor(Integer.valueOf(entry.getKey()));
-                        signclosedProductInfo.setSignclosedCreateTime(new Date());
-                        complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
-                        i++;
-                    }
-
-                }
-            }
-            if(alreadyFittingsMap != null || alreadyFittingsMap.size() != 0){
-                for (Map.Entry<String,Integer> entry : alreadyFittingsMap.entrySet()) {
-                    SignclosedProductInfo signclosedProductInfo = new SignclosedProductInfo();
-                    //根据配件id获取配件信息
-                    FittingsInfo fittingsInfo = fittingsInfoMapper.getFittingsById(Integer.valueOf(entry.getKey()));
-                    if(fittingsInfo == null){
-                        return false;
-                    }
-                    for (int j = 0;j<entry.getValue();j++){
-                        signclosedProductInfo.setSignclosedId(record.getSignclosedId());
-                        signclosedProductInfo.setProductName(fittingsInfo.getFittingsName());
-                        signclosedProductInfo.setProductNum(1);
-                        signclosedProductInfo.setSignclosedProductType(2);
-                        signclosedProductInfo.setSignclosedProductId(fittingsInfo.getFittingsId());
-                        signclosedProductInfo.setSignclosedProductColor(null);
-                        signclosedProductInfo.setSignclosedCreateTime(new Date());
-                        complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
-                    }
-                }
-            }
-        }
-        return msg;
-    }
-
-    @Override
-    public Integer updateSignclosedById(ComplaintSignclosedInfo record) {
-        return complaintSignclosedInfoMapper.updateSignclosedById(record);
-    }
-
-    @Override
-    public Integer updateSignclosedByCustomerId(ComplaintSignclosedInfo record) {
-        return complaintSignclosedInfoMapper.updateSignclosedByCustomerId(record);
-    }
-
-    @Override
-    public PagedResult<ComplaintSignclosedInfo> listSignclosed(PageRequest<ComplaintSignclosedInfo> pageRequest) {
-        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
-        List<ComplaintSignclosedInfo> signclosedList = complaintSignclosedInfoMapper.listSignclosed(pageRequest.getData());
-        return PageUtil.getPage(signclosedList);
-
-    }
-
+package com.iamberry.rst.service.fm;
+
+
+import com.github.pagehelper.PageHelper;
+import com.iamberry.rst.core.cm.*;
+import com.iamberry.rst.core.fm.AwaitingSignclosedProductInfo;
+import com.iamberry.rst.core.fm.ComplaintSignclosedInfo;
+import com.iamberry.rst.core.fm.SignclosedProductInfo;
+import com.iamberry.rst.core.order.Product;
+import com.iamberry.rst.core.order.ProductColor;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.faces.fm.ComplaintSignclosedInfoService;
+import com.iamberry.rst.service.cm.mapper.*;
+import com.iamberry.rst.service.fm.mapper.AwaitingSignclosedProductMapper;
+import com.iamberry.rst.service.fm.mapper.ComplaintDetectInfoMapper;
+import com.iamberry.rst.service.fm.mapper.ComplaintSignclosedInfoMapper;
+import com.iamberry.rst.service.fm.mapper.ComplaintSignclosedProductInfoMapper;
+import com.iamberry.rst.service.product.mapper.ProductMapper;
+import com.iamberry.rst.util.PageUtil;
+import net.sf.json.JSONArray;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedInfoService {
+    @Autowired
+    private ComplaintSignclosedInfoMapper complaintSignclosedInfoMapper;
+    @Autowired
+    private ProductMapper productMapper;
+    @Autowired
+    private AwaitingSignclosedProductMapper awaitingSignclosedProductMapper;
+    @Autowired
+    private ComplaintSignclosedProductInfoMapper complaintSignclosedProductInfoMapper;
+    @Autowired
+    private FittingsInfoMapper fittingsInfoMapper;
+    @Autowired
+    private ComplaintDetectInfoMapper complaintDetectInfoMapper;
+    @Autowired
+    private CustomerInfoMapper customerInfoMapper;
+
+    @Override
+    @Transactional
+    public boolean insert(ComplaintSignclosedInfo record,
+                          String orderItemString) {
+        boolean msg = true;
+        int num = complaintSignclosedInfoMapper.insert(record);
+        if(num < 1){
+            msg = false;
+        }else{
+            if(orderItemString != null){
+                JSONArray jsonArray = JSONArray.fromObject(orderItemString);
+                List<SalesOrderItem> salesOrderItemList = (List) JSONArray.toCollection(jsonArray, SalesOrderItem.class);
+                    for (SalesOrderItem salesOrderItem:salesOrderItemList) {
+                        if(salesOrderItem.getItemNum() > 0 && salesOrderItem.getItemColorId() > 0){
+                        int i = 0;
+                        SignclosedProductInfo signclosedProductInfo = new SignclosedProductInfo();
+                        //根据颜色id获取产品信息获取产品信息
+                            ProductColor productColor = productMapper.getProduceColor(salesOrderItem.getItemColorId());
+                            if(productColor == null){
+                                msg = false;
+                            }
+                        for (int j = 0;j<salesOrderItem.getItemNum();j++){
+                            signclosedProductInfo.setSignclosedId(record.getSignclosedId());
+                            signclosedProductInfo.setProductName(productColor.getProductName());
+                            signclosedProductInfo.setProductNum(1);
+                            signclosedProductInfo.setSignclosedProductType(1);
+                            signclosedProductInfo.setSignclosedProductId(productColor.getColorProductId());
+                            signclosedProductInfo.setSignclosedProductColor(salesOrderItem.getItemColorId());
+                            signclosedProductInfo.setSignclosedCreateTime(new Date());
+                            complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                            i++;
+                        }
+
+                    }
+                }
+            }
+        }
+        //关联客诉/判断是否生成客诉信息
+        try {
+            addDetect(record);
+        }catch (Exception e){
+            throw new RuntimeException("------------关联客诉出错------------");
+        }
+
+        return msg;
+    }
+
+    /*关联客诉*/
+    public int addDetect(ComplaintSignclosedInfo record){
+        CustomerInfo customerInfo = new CustomerInfo();
+        if(record.getSignclosedLogisticsNumber() != null){
+            customerInfo.setSendLogisticsNo(record.getSignclosedLogisticsNumber());
+        }
+        if(record.getSignclosedCustomerId() != null){
+            customerInfo.setCustomerId(record.getSignclosedCustomerId());
+        }
+        List<CustomerInfo> listCustomer = customerInfoMapper.listCustomer(customerInfo);
+        if(listCustomer.size() > 0){
+            customerInfo = listCustomer.get(0);
+            ComplaintSignclosedInfo signclosedInfo = new ComplaintSignclosedInfo();
+            signclosedInfo.setSignclosedCustomerId(customerInfo.getCustomerId());
+            signclosedInfo.setSignclosedId(record.getSignclosedId());
+            Integer msg = complaintSignclosedInfoMapper.updateSignclosedById(signclosedInfo);
+            if(msg != 1){
+                return 0;
+            }
+
+//            if(customerInfo.getIsQuality() != null){
+//                if(customerInfo.getIsQuality() == 1){//需要品检
+//                    //根据客诉id查询是否已存在品检信息
+//                    ComplaintDetectInfo complaintDetectInfo = new ComplaintDetectInfo();
+//                    if(complaintDetectInfoMapper.getDetectByCustomerId(customerInfo.getCustomerId()) == null){
+//                        complaintDetectInfo.setCustomerId(customerInfo.getCustomerId());
+//                        complaintDetectInfo.setSignclosedId(record.getSignclosedId());
+//                        complaintDetectInfo.setDetectCreateTime(new Date());
+//                        Integer msg2 = complaintDetectInfoMapper.insert(complaintDetectInfo);
+//                        if(msg2 != 1){
+//                            return 0;
+//                        }
+//                    }
+//                    //添加品检项
+//                    /*List<SignclosedProductInfo> listProductInfo = complaintSignclosedInfoMapper.listSignclosedById(record.getSignclosedId());
+//                    List<ComplaintDetectItem> listDetectItem = new ArrayList<>();
+//                    for(SignclosedProductInfo productInfo : listProductInfo){
+//                        ComplaintDetectItem detectItem = new ComplaintDetectItem();
+//                        detectItem.setDetectId(complaintDetectInfo.getDetectId());
+//                        detectItem.setDetectItemCreateTime(new Date());
+//                        detectItem.setProductId(productInfo.getProductId());
+//                        detectItem.setDetectProductNumber(productInfo.getProductNumber());
+//                        detectItem.setDetectItemState(1);
+//                        listDetectItem.add(detectItem);
+//                    }
+//                    Integer msg3 =  complaintDetectInfoMapper.insertItemList(listDetectItem);
+//                    if(msg3 != 1){
+//                        return 0;
+//                    }*/
+//                }
+//            }
+
+        }
+        return 1;
+    }
+
+    @Override
+    public List<SignclosedProductInfo> listSignclosedById(Integer signclosedId) {
+        return complaintSignclosedInfoMapper.listSignclosedById(signclosedId);
+    }
+
+    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) {
+        return complaintSignclosedInfoMapper.getSignclosedById(signclosedId);
+    }
+    @Transactional
+    @Override
+    public boolean updateSignclosedById(ComplaintSignclosedInfo record,
+                                    Map<String,Integer> alreadyColorMap,
+                                    Map<String,String[]> machineNumberMap,
+                                    Map<String,Integer> alreadyFittingsMap) {
+        boolean msg = true;
+        int num = complaintSignclosedInfoMapper.updateSignclosedById(record);
+        if(num < 1){
+            msg = false;
+        }else{
+            if(alreadyColorMap != null || alreadyColorMap.size() != 0){
+                for (Map.Entry<String,Integer> entry : alreadyColorMap.entrySet()) {
+                    int i = 0;
+                    SignclosedProductInfo signclosedProductInfo = new SignclosedProductInfo();
+                    //根据颜色id获取产品信息获取产品信息
+                    Product product = productMapper.getProductById(Integer.valueOf(entry.getKey()));
+                    if(product == null){
+                        return false;
+                    }
+                    for (int j = 0;j<entry.getValue();j++){
+                        signclosedProductInfo.setSignclosedId(record.getSignclosedId());
+                        signclosedProductInfo.setProductName(product.getProductName());
+                        signclosedProductInfo.setProductNum(1);
+                        signclosedProductInfo.setSignclosedProductType(1);
+                        signclosedProductInfo.setSignclosedProductId(product.getProductId());
+                        signclosedProductInfo.setSignclosedProductColor(Integer.valueOf(entry.getKey()));
+                        signclosedProductInfo.setSignclosedCreateTime(new Date());
+                        complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                        i++;
+                    }
+
+                }
+            }
+//            if(alreadyFittingsMap != null || alreadyFittingsMap.size() != 0){
+//                for (Map.Entry<String,Integer> entry : alreadyFittingsMap.entrySet()) {
+//                    SignclosedProductInfo signclosedProductInfo = new SignclosedProductInfo();
+//                    //根据配件id获取配件信息
+//                    FittingsInfo fittingsInfo = fittingsInfoMapper.getFittingsById(Integer.valueOf(entry.getKey()));
+//                    if(fittingsInfo == null){
+//                        return false;
+//                    }
+//                    for (int j = 0;j<entry.getValue();j++){
+//                        signclosedProductInfo.setSignclosedId(record.getSignclosedId());
+//                        signclosedProductInfo.setProductName(fittingsInfo.getFittingsName());
+//                        signclosedProductInfo.setProductNum(1);
+//                        signclosedProductInfo.setSignclosedProductType(2);
+//                        signclosedProductInfo.setSignclosedProductId(fittingsInfo.getFittingsId());
+//                        signclosedProductInfo.setSignclosedProductColor(null);
+//                        signclosedProductInfo.setSignclosedCreateTime(new Date());
+//                        complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+//                    }
+//                }
+//            }
+        }
+        return msg;
+    }
+
+    @Override
+    public Integer updateSignclosedById(ComplaintSignclosedInfo record) {
+        return complaintSignclosedInfoMapper.updateSignclosedById(record);
+    }
+
+    @Override
+    public Integer updateSignclosedByCustomerId(ComplaintSignclosedInfo record) {
+        return complaintSignclosedInfoMapper.updateSignclosedByCustomerId(record);
+    }
+
+    @Override
+    public PagedResult<ComplaintSignclosedInfo> listSignclosed(PageRequest<ComplaintSignclosedInfo> pageRequest) {
+        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+        List<ComplaintSignclosedInfo> signclosedList = complaintSignclosedInfoMapper.listSignclosed(pageRequest.getData());
+        return PageUtil.getPage(signclosedList);
+
+    }
+
 }

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

@@ -1,45 +1,42 @@
-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;
-
-import java.util.List;
-
-@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 List<SignclosedProductInfo> listSignclosedById(Integer signclosedId) {
-        return complaintSignclosedProductInfoMapper.listSignclosedById(signclosedId);
-    }
-
-    @Override
-    public int updateSignclosedById(SignclosedProductInfo record) {
-        return complaintSignclosedProductInfoMapper.updateSignclosedById(record);
-    }
-
-    @Override
-    public SignclosedProductInfo listSignclosedProductInfoById(Integer productid) {
-        return complaintSignclosedProductInfoMapper.listSignclosedProductInfoById(productid);
-    }
+package com.iamberry.rst.service.fm;
+
+
+import com.iamberry.rst.core.fm.SignclosedProductInfo;
+import com.iamberry.rst.faces.fm.ComplaintSignclosedProductInfoService;
+import com.iamberry.rst.service.fm.mapper.ComplaintSignclosedProductInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@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 List<SignclosedProductInfo> listSignclosedById(Integer signclosedId) {
+        return complaintSignclosedProductInfoMapper.listSignclosedById(signclosedId);
+    }
+
+    @Override
+    public int updateSignclosedById(SignclosedProductInfo record) {
+        return complaintSignclosedProductInfoMapper.updateSignclosedById(record);
+    }
+
+    @Override
+    public SignclosedProductInfo listSignclosedProductInfoById(Integer productid) {
+        return complaintSignclosedProductInfoMapper.listSignclosedProductInfoById(productid);
+    }
 }

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

@@ -1,37 +1,37 @@
-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;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-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);
-    }
+package com.iamberry.rst.service.fm;
+
+
+import com.iamberry.rst.core.fm.ComplaintSmallClassInfo;
+import com.iamberry.rst.faces.fm.ComplaintSmallClassInfoService;
+import com.iamberry.rst.service.fm.mapper.ComplaintSmallClassInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+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);
+    }
 }