客诉修改

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

@@ -1,331 +1,331 @@
-package com.iamberry.rst.core.cm;
-
-import  java.util.Date;
-import  java.io.Serializable;
-/**
- *  售后处理类
- * @author
- * @Date 2018-12-28
- */
-public class CmRelation implements  Serializable{
-    //处理主键
-    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;
-    //签收日期
-    private Date relationBackReceiptDate;
-    //工厂维修报价
-    private Integer relationFactoryCosts;
-    //客户报价
-    private Integer relationCustomerCosts;
-    //创建时间
-    private Date relationCreateTime;
-    //修改时间
-    private Date relationUpdateTime;
-
-    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;
-    }
+package com.iamberry.rst.core.cm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  售后处理类
+ * @author
+ * @Date 2018-12-28
+ */
+public class CmRelation implements  Serializable{
+    //处理主键
+    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;
+    //签收日期
+    private Date relationBackReceiptDate;
+    //工厂维修报价
+    private Integer relationFactoryCosts;
+    //客户报价
+    private Integer relationCustomerCosts;
+    //创建时间
+    private Date relationCreateTime;
+    //修改时间
+    private Date relationUpdateTime;
+
+    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;
+    }
 }

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

@@ -1,101 +1,101 @@
-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{
-    //处理方式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;
-    }
-}
+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{
+    //处理方式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

@@ -1,71 +1,71 @@
-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 Integer procTypeId;
-    //处理方式类型名称
-    private String procTypeName;
-    //处理方式状态 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;
-    }
+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 Integer procTypeId;
+    //处理方式类型名称
+    private String procTypeName;
+    //处理方式状态 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;
+    }
 }

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

@@ -1,114 +1,114 @@
-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;
-    }
-}
+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/fm/ComplaintDetectInfo.java

@@ -1,71 +1,71 @@
-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;
-    }
-}
+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/fm/ComplaintDetectItem.java

@@ -1,246 +1,246 @@
-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;
-    }
-}
+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/fm/ComplaintMaintenanceInfo.java

@@ -1,215 +1,215 @@
-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;
-    }
+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/fm/ComplaintSignclosedInfo.java

@@ -1,214 +1,214 @@
-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;
-    }
-}
+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/fm/ComplaintSmallClassInfo.java

@@ -1,111 +1,111 @@
-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;
-    }
-}
+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/fm/DetectionBasis.java

@@ -1,110 +1,110 @@
-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;
-    }
-}
+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/fm/FactoryInfo.java

@@ -1,48 +1,48 @@
-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;
-    }
-}
+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/fm/InventoryInfo.java

@@ -1,84 +1,84 @@
-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;
-    }
-}
+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/fm/InventoryLog.java

@@ -1,112 +1,112 @@
-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;
-    }
-}
+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/fm/SignclosedProductInfo.java

@@ -1,123 +1,123 @@
-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;
-    }
-}
+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/fm/WarehouseInfo.java

@@ -1,57 +1,57 @@
-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;
-    }
-}
+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/CmRelationService.java

@@ -1,43 +1,43 @@
-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);
-    /**
-     * 增加数据
-     * @param  cmRelation
-     * @return Integer
-     */
-    Integer  save(CmRelation  cmRelation);
-    /**
-     * 修改数据
-     * @param  cmRelation
-     * @return Integer
-     */
-    Integer  update(CmRelation  cmRelation);
-    /**
-     * 删除数据
-     * @param  id
-     * @return Integer
-     */
-    Integer  delete(Integer  id);
-}
+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);
+    /**
+     * 增加数据
+     * @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-interface/src/main/java/com/iamberry/rst/faces/cm/ProcMethodService.java

@@ -1,43 +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);
-}
+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

@@ -1,43 +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);
+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/fm/AwaitingSignclosedProductInfoService.java

@@ -1,36 +1,36 @@
-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);
+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/fm/ComplaintDetectInfoService.java

@@ -1,59 +1,59 @@
-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);
+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/fm/ComplaintMaintenanceInfoService.java

@@ -1,32 +1,32 @@
-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);
+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/fm/ComplaintSignclosedInfoService.java

@@ -1,63 +1,63 @@
-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);
+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/fm/ComplaintSignclosedProductInfoService.java

@@ -1,38 +1,38 @@
-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);
+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/fm/ComplaintSmallClassInfoService.java

@@ -1,33 +1,33 @@
-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);
-
+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/CmRelationServiceImpl.java

@@ -1,65 +1,65 @@
-package com.iamberry.rst.service.cm;
-
-import com.iamberry.rst.core.cm.CmRelation;
-import com.iamberry.rst.faces.cm.CmRelationService;
-import com.iamberry.rst.service.cm.mapper.CmRelationMapper;
-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;
-    /**
-     * 获取集合
-     * @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);
-    }
-    /**
-     * 增加数据
-     * @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);
-    }
+package com.iamberry.rst.service.cm;
+
+import com.iamberry.rst.core.cm.CmRelation;
+import com.iamberry.rst.faces.cm.CmRelationService;
+import com.iamberry.rst.service.cm.mapper.CmRelationMapper;
+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;
+    /**
+     * 获取集合
+     * @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);
+    }
+    /**
+     * 增加数据
+     * @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);
+    }
 }

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

@@ -1,65 +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);
-    }
+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

@@ -1,65 +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);
-    }
+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/mapper/CmRelationMapper.java

@@ -1,43 +1,43 @@
-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);
-    /**
-     * 增加数据
-     * @param  cmRelation
-     * @return Integer
-     */
-    Integer  save(CmRelation  cmRelation);
-    /**
-     * 修改数据
-     * @param  cmRelation
-     * @return Integer
-     */
-    Integer  update(CmRelation  cmRelation);
-    /**
-     * 删除数据
-     * @param  id
-     * @return Integer
-     */
-    Integer  delete(Integer  id);
+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);
+    /**
+     * 增加数据
+     * @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/ProcMethodMapper.java

@@ -1,43 +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);
+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

@@ -1,43 +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);
+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/fm/AwaitingSignclosedProductInfoServiceImpl.java

@@ -1,40 +1,40 @@
-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);
-    }
+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/fm/ComplaintDetectInfoServiceImpl.java

@@ -1,68 +1,68 @@
-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);
-    }
+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/fm/ComplaintMaintenanceInfoServiceImpl.java

@@ -1,42 +1,42 @@
-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);
-    }
+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/fm/ComplaintSignclosedInfoServiceImpl.java

@@ -1,257 +1,257 @@
-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);
-
-    }
-
+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/fm/ComplaintSignclosedProductInfoServiceImpl.java

@@ -1,42 +1,42 @@
-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);
-    }
+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/fm/ComplaintSmallClassInfoServiceImpl.java

@@ -1,37 +1,37 @@
-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);
-    }
+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);
+    }
 }

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

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

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

@@ -1,65 +1,65 @@
-package com.iamberry.rst.service.fm.mapper;
-
-import com.iamberry.rst.core.fm.ComplaintDetectInfo;
-import com.iamberry.rst.core.fm.ComplaintDetectItem;
-import com.iamberry.rst.core.fm.DetectionBasis;
-
-import java.util.List;
-
-/**
- * 客诉-品质检测产品mapper
- */
-public interface ComplaintDetectInfoMapper {
-    /**
-     * 添加单个品质检测产品
-     * @return
-     */
-    int insert(ComplaintDetectInfo record);
-
-    /**
-     * 批量添加品检项
-     * @return
-     */
-    int insertItemList(List<ComplaintDetectItem> detectItemList);
-
-    /**
-     * 查询单个品质检测产品
-     * @return
-     */
-    ComplaintDetectItem getDetectItemById(Integer detectId);
-    /**
-     * 修改单个待品质检测产品
-     * @return
-     */
-    int updateDetectItemById(ComplaintDetectItem record);
-
-    /**
-     * 获取品质检测项列表
-     * @return
-     */
-    List<ComplaintDetectItem> listComplaintDetectItem(ComplaintDetectItem item);
-
-    /**
-     * 根据客诉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.service.fm.mapper;
+
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
+import com.iamberry.rst.core.fm.ComplaintDetectItem;
+import com.iamberry.rst.core.fm.DetectionBasis;
+
+import java.util.List;
+
+/**
+ * 客诉-品质检测产品mapper
+ */
+public interface ComplaintDetectInfoMapper {
+    /**
+     * 添加单个品质检测产品
+     * @return
+     */
+    int insert(ComplaintDetectInfo record);
+
+    /**
+     * 批量添加品检项
+     * @return
+     */
+    int insertItemList(List<ComplaintDetectItem> detectItemList);
+
+    /**
+     * 查询单个品质检测产品
+     * @return
+     */
+    ComplaintDetectItem getDetectItemById(Integer detectId);
+    /**
+     * 修改单个待品质检测产品
+     * @return
+     */
+    int updateDetectItemById(ComplaintDetectItem record);
+
+    /**
+     * 获取品质检测项列表
+     * @return
+     */
+    List<ComplaintDetectItem> listComplaintDetectItem(ComplaintDetectItem item);
+
+    /**
+     * 根据客诉id、查询品检信息
+     * @return
+     */
+    ComplaintDetectInfo getDetectByCustomerId(Integer customerId);
+
+    /**
+     * 添加品检项
+     * @return
+     */
+    int insertItem(ComplaintDetectItem complaintDetectItem);
+
+    /**
+     * 删除品检项
+     * @return
+     */
+    int deleteDetectItem(Integer detectItemId);
+
+    /**
+     * 查询检测内容
+     * @return
+     */
+    List<DetectionBasis> listDetectionBasis(DetectionBasis detectionBasis);
 }

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

@@ -1,32 +1,32 @@
-package com.iamberry.rst.service.fm.mapper;
-
-import com.iamberry.rst.core.fm.ComplaintMaintenanceInfo;
-
-import java.util.List;
-
-/**
- * 客诉-生产维修mapper
- */
-public interface ComplaintMaintenanceInfoMapper {
-    /**
-     * 添加单个品质检测产品
-     * @return
-     */
-    int insert(ComplaintMaintenanceInfo record);
-    /**
-     * 查询单个品质检测产品
-     * @return
-     */
-    ComplaintMaintenanceInfo getMaintenanceByid(Integer maintenanceId);
-    /**
-     * 修改单个品质检测产品
-     * @return
-     */
-    int updateMaintenanceById(ComplaintMaintenanceInfo record);
-
-    /**
-     * 查询多个品质检测产品
-     * @return
-     */
-    List<ComplaintMaintenanceInfo> listMaintenance(ComplaintMaintenanceInfo record);
+package com.iamberry.rst.service.fm.mapper;
+
+import com.iamberry.rst.core.fm.ComplaintMaintenanceInfo;
+
+import java.util.List;
+
+/**
+ * 客诉-生产维修mapper
+ */
+public interface ComplaintMaintenanceInfoMapper {
+    /**
+     * 添加单个品质检测产品
+     * @return
+     */
+    int insert(ComplaintMaintenanceInfo record);
+    /**
+     * 查询单个品质检测产品
+     * @return
+     */
+    ComplaintMaintenanceInfo getMaintenanceByid(Integer maintenanceId);
+    /**
+     * 修改单个品质检测产品
+     * @return
+     */
+    int updateMaintenanceById(ComplaintMaintenanceInfo record);
+
+    /**
+     * 查询多个品质检测产品
+     * @return
+     */
+    List<ComplaintMaintenanceInfo> listMaintenance(ComplaintMaintenanceInfo record);
 }

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

@@ -1,43 +1,43 @@
-package com.iamberry.rst.service.fm.mapper;
-
-import com.iamberry.rst.core.fm.ComplaintSignclosedInfo;
-import com.iamberry.rst.core.fm.SignclosedProductInfo;
-
-import java.util.List;
-
-/**
- * 客诉-签收表mapper
- */
-public interface ComplaintSignclosedInfoMapper {
-    /**
-     * 添加单个签收记录
-     * @return
-     */
-    int insert(ComplaintSignclosedInfo record);
-    /**
-     * 查询单个签收记录
-     * @return
-     */
-    ComplaintSignclosedInfo getSignclosedById(Integer signclosedId);
-    /**
-     * 修改单个签收记录
-     * @return
-     */
-    int updateSignclosedById(ComplaintSignclosedInfo record);
-
-    /**
-     * 修改单个签收记录
-     * @return
-     */
-    int updateSignclosedByCustomerId(ComplaintSignclosedInfo record);
-    /**
-     * 查询多个签收记录
-     * @return
-     */
-    List<ComplaintSignclosedInfo> listSignclosed(ComplaintSignclosedInfo record);
-    /**
-     * 查询签收产品集合
-     * @return
-     */
-    List<SignclosedProductInfo> listSignclosedById(Integer signclosedId);
+package com.iamberry.rst.service.fm.mapper;
+
+import com.iamberry.rst.core.fm.ComplaintSignclosedInfo;
+import com.iamberry.rst.core.fm.SignclosedProductInfo;
+
+import java.util.List;
+
+/**
+ * 客诉-签收表mapper
+ */
+public interface ComplaintSignclosedInfoMapper {
+    /**
+     * 添加单个签收记录
+     * @return
+     */
+    int insert(ComplaintSignclosedInfo record);
+    /**
+     * 查询单个签收记录
+     * @return
+     */
+    ComplaintSignclosedInfo getSignclosedById(Integer signclosedId);
+    /**
+     * 修改单个签收记录
+     * @return
+     */
+    int updateSignclosedById(ComplaintSignclosedInfo record);
+
+    /**
+     * 修改单个签收记录
+     * @return
+     */
+    int updateSignclosedByCustomerId(ComplaintSignclosedInfo record);
+    /**
+     * 查询多个签收记录
+     * @return
+     */
+    List<ComplaintSignclosedInfo> listSignclosed(ComplaintSignclosedInfo record);
+    /**
+     * 查询签收产品集合
+     * @return
+     */
+    List<SignclosedProductInfo> listSignclosedById(Integer signclosedId);
 }

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

@@ -1,48 +1,48 @@
-package com.iamberry.rst.service.fm.mapper;
-
-import com.iamberry.rst.core.fm.AwaitingSignclosedProductInfo;
-import com.iamberry.rst.core.fm.SignclosedProductInfo;
-
-import java.util.List;
-
-/**
- * 客诉-签收产品表mapper
- */
-public interface ComplaintSignclosedProductInfoMapper {
-    /**
-     * 添加单个签收产品记录
-     * @return
-     */
-    int insert(SignclosedProductInfo record);
-
-    /**
-     * 添加签收  产品集合
-     * @return
-     */
-    int insertList(List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfoList);
-
-    /**
-     * 查询单个签收产品记录
-     * @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.service.fm.mapper;
+
+import com.iamberry.rst.core.fm.AwaitingSignclosedProductInfo;
+import com.iamberry.rst.core.fm.SignclosedProductInfo;
+
+import java.util.List;
+
+/**
+ * 客诉-签收产品表mapper
+ */
+public interface ComplaintSignclosedProductInfoMapper {
+    /**
+     * 添加单个签收产品记录
+     * @return
+     */
+    int insert(SignclosedProductInfo record);
+
+    /**
+     * 添加签收  产品集合
+     * @return
+     */
+    int insertList(List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfoList);
+
+    /**
+     * 查询单个签收产品记录
+     * @return
+     */
+    SignclosedProductInfo getSignclosedById(Integer productId);
+    /**
+     * 查询多个签收产品记录
+     * @return
+     */
+    List<SignclosedProductInfo> listSignclosedById(Integer signclosedId);
+
+
+    /**
+     * 修改单个签收产品记录
+     * @return
+     */
+    int updateSignclosedById(SignclosedProductInfo record);
+
+
+    /**
+     * 查询单个签收产品
+     * @return
+     */
+    SignclosedProductInfo listSignclosedProductInfoById(Integer productid);
 }

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

@@ -1,32 +1,32 @@
-package com.iamberry.rst.service.fm.mapper;
-
-import com.iamberry.rst.core.fm.ComplaintSmallClassInfo;
-
-import java.util.List;
-
-/**
- * 客诉-客诉小类mapper
- */
-public interface ComplaintSmallClassInfoMapper {
-    /**
-     * 添加单个客诉小类
-     * @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.service.fm.mapper;
+
+import com.iamberry.rst.core.fm.ComplaintSmallClassInfo;
+
+import java.util.List;
+
+/**
+ * 客诉-客诉小类mapper
+ */
+public interface ComplaintSmallClassInfoMapper {
+    /**
+     * 添加单个客诉小类
+     * @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/fm/mapper/InventoryLogMapper.java

@@ -1,45 +1,45 @@
-package com.iamberry.rst.service.fm.mapper;
-
-import com.iamberry.rst.core.fm.InventoryLog;
-import com.iamberry.rst.core.fm.WarehouseInfo;
-
-import java.util.List;
-
-/**
- * Created by Administrator on 2018/8/14.
- */
-public interface InventoryLogMapper {
-    /**
-     * 查询单个日志
-     * @param logId
-     * @return
-     */
-    InventoryLog getByInventoryLogId(Integer logId);
-
-    /**
-     * 查询日志列表
-     * @param inventoryLog
-     * @return
-     */
-    List<InventoryLog> listByInventoryLogId(InventoryLog inventoryLog);
-
-    /**
-     * 修改库存日志
-     * @param inventoryLog
-     * @return
-     */
-    Integer updateById(InventoryLog inventoryLog);
-
-    /**
-     * 增加库存日志
-     * @param inventoryLog
-     * @return
-     */
-    Integer insert(InventoryLog inventoryLog);
-
-    /**
-     * 查询仓库集合
-     * @return
-     */
-    List<WarehouseInfo> listFactoryInfo();
-}
+package com.iamberry.rst.service.fm.mapper;
+
+import com.iamberry.rst.core.fm.InventoryLog;
+import com.iamberry.rst.core.fm.WarehouseInfo;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2018/8/14.
+ */
+public interface InventoryLogMapper {
+    /**
+     * 查询单个日志
+     * @param logId
+     * @return
+     */
+    InventoryLog getByInventoryLogId(Integer logId);
+
+    /**
+     * 查询日志列表
+     * @param inventoryLog
+     * @return
+     */
+    List<InventoryLog> listByInventoryLogId(InventoryLog inventoryLog);
+
+    /**
+     * 修改库存日志
+     * @param inventoryLog
+     * @return
+     */
+    Integer updateById(InventoryLog inventoryLog);
+
+    /**
+     * 增加库存日志
+     * @param inventoryLog
+     * @return
+     */
+    Integer insert(InventoryLog inventoryLog);
+
+    /**
+     * 查询仓库集合
+     * @return
+     */
+    List<WarehouseInfo> listFactoryInfo();
+}

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

@@ -1,25 +1,25 @@
-package com.iamberry.rst.service.fm.mapper;
-
-import com.iamberry.rst.core.fm.InventoryInfo;
-
-import java.util.List;
-
-/**
- * Created by Administrator on 2018/8/14.
- */
-public interface InventoryMapper {
-    /**
-     * 获取单个库存信息
-     * @param inventoryId
-     * @return
-     */
-    InventoryInfo getByInventoryId(Integer inventoryId);
-    /**
-     * 获取库存信息列表
-     */
-    List<InventoryInfo> listByInventoryId(InventoryInfo inventoryInfo);
-    /**
-     * 获取库存信息列表
-     */
-    Integer updateById(InventoryInfo inventoryInfo);
-}
+package com.iamberry.rst.service.fm.mapper;
+
+import com.iamberry.rst.core.fm.InventoryInfo;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2018/8/14.
+ */
+public interface InventoryMapper {
+    /**
+     * 获取单个库存信息
+     * @param inventoryId
+     * @return
+     */
+    InventoryInfo getByInventoryId(Integer inventoryId);
+    /**
+     * 获取库存信息列表
+     */
+    List<InventoryInfo> listByInventoryId(InventoryInfo inventoryInfo);
+    /**
+     * 获取库存信息列表
+     */
+    Integer updateById(InventoryInfo inventoryInfo);
+}

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

@@ -1,98 +1,98 @@
-<?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.fm.mapper.AwaitingSignclosedProductMapper" >
-  <resultMap id="BaseResultMap" type="AwaitingSignclosedProductInfo" >
-    <id column="product_id" property="productId" jdbcType="INTEGER" />
-    <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
-    <result column="product_name" property="productName" jdbcType="VARCHAR" />
-    <result column="product_num" property="productNum" jdbcType="INTEGER" />
-    <result column="signclosed_create_time" property="signclosedCreateTime" jdbcType="TIMESTAMP" />
-    <result column="signclosed_update_time" property="signclosedUpdateTime" jdbcType="TIMESTAMP" />
-    <result column="signclosed_product_type" property="signclosedProductType" jdbcType="INTEGER" />
-    <result column="signclosed_product_id" property="signclosedProductId" jdbcType="INTEGER" />
-    <result column="signclosed_product_color" property="signclosedProductColor" jdbcType="INTEGER" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    product_id, signclosed_id, product_name, product_num, signclosed_create_time, signclosed_update_time,
-    signclosed_product_type,signclosed_product_id,signclosed_product_color
-  </sql>
-  <select id="getByPrimaryId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from tb_rst_complaint_awaiting_signclosed_product
-    where product_id = #{productId,jdbcType=INTEGER}
-  </select>
-  <select id="listByPrimaryId" resultMap="BaseResultMap" parameterType="AwaitingSignclosedProductInfo" >
-    select
-    sp.product_id productId,
-	sp.signclosed_id signclosedId,
-	sp.product_name productName,
-	sp.product_num productNum,
-	sp.signclosed_create_time signclosedCreateTime,
-	sp.signclosed_update_time signclosedUpdateTime,
-	sp.signclosed_product_type signclosedProductType,
-	sp.signclosed_product_id signclosedProductId,
-	sp.signclosed_product_color signclosedProductColor,
-    pc.color_name colorName,
-    pi.product_number productNumber
-    from
-    tb_rst_complaint_awaiting_signclosed_product sp
-    LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
-    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
-    where signclosed_id = #{signclosedId,jdbcType=INTEGER}
-  </select>
-  <insert id="insert" parameterType="AwaitingSignclosedProductInfo" useGeneratedKeys="true" keyProperty="productId">
-    insert into tb_rst_complaint_awaiting_signclosed_product (product_id, signclosed_id, product_name, 
-      product_num, signclosed_create_time, signclosed_update_time,signclosed_product_type,signclosed_product_id,signclosed_product_color
-      )
-    values (#{productId,jdbcType=INTEGER}, #{signclosedId,jdbcType=INTEGER}, #{productName,jdbcType=VARCHAR}, 
-      #{productNum,jdbcType=INTEGER}, #{signclosedCreateTime,jdbcType=TIMESTAMP}, #{signclosedUpdateTime,jdbcType=TIMESTAMP}
-      ,#{signclosedProductType,jdbcType=INTEGER}, #{signclosedProductId,jdbcType=INTEGER}, #{signclosedProductColor,jdbcType=INTEGER}
-      )
-  </insert>
-
-  <update id="updateById" parameterType="AwaitingSignclosedProductInfo" >
-    update tb_rst_complaint_awaiting_signclosed_product
-    <set >
-      <if test="signclosedId != null" >
-        signclosed_id = #{signclosedId,jdbcType=INTEGER},
-      </if>
-      <if test="productName != null" >
-        product_name = #{productName,jdbcType=VARCHAR},
-      </if>
-      <if test="productNum != null" >
-        product_num = #{productNum,jdbcType=INTEGER},
-      </if>
-      <if test="signclosedCreateTime != null" >
-        signclosed_create_time = #{signclosedCreateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="signclosedUpdateTime != null" >
-        signclosed_update_time = #{signclosedUpdateTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where product_id = #{productId,jdbcType=INTEGER}
-  </update>
-
-
-
-  <select id="listBySignclosedId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    SELECT
-      sp.product_id productId,
-      sp.signclosed_id signclosedId,
-      sp.product_name productName,
-
-      sp.signclosed_create_time signclosedCreateTime,
-      sp.signclosed_update_time signclosedUpdateTime,
-      sp.signclosed_product_type signclosedProductType,
-      sp.signclosed_product_id signclosedProductId,
-      sp.signclosed_product_color signclosedProductColor,
-      pc.color_name colorName,
-      count(1) productNum
-      FROM
-      tb_rst_complaint_awaiting_signclosed_product sp
-      LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
-      WHERE
-      signclosed_id = #{signclosedId}
-      GROUP BY sp.product_name,pc.color_name
-  </select>
+<?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.fm.mapper.AwaitingSignclosedProductMapper" >
+  <resultMap id="BaseResultMap" type="AwaitingSignclosedProductInfo" >
+    <id column="product_id" property="productId" jdbcType="INTEGER" />
+    <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
+    <result column="product_name" property="productName" jdbcType="VARCHAR" />
+    <result column="product_num" property="productNum" jdbcType="INTEGER" />
+    <result column="signclosed_create_time" property="signclosedCreateTime" jdbcType="TIMESTAMP" />
+    <result column="signclosed_update_time" property="signclosedUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="signclosed_product_type" property="signclosedProductType" jdbcType="INTEGER" />
+    <result column="signclosed_product_id" property="signclosedProductId" jdbcType="INTEGER" />
+    <result column="signclosed_product_color" property="signclosedProductColor" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    product_id, signclosed_id, product_name, product_num, signclosed_create_time, signclosed_update_time,
+    signclosed_product_type,signclosed_product_id,signclosed_product_color
+  </sql>
+  <select id="getByPrimaryId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tb_rst_complaint_awaiting_signclosed_product
+    where product_id = #{productId,jdbcType=INTEGER}
+  </select>
+  <select id="listByPrimaryId" resultMap="BaseResultMap" parameterType="AwaitingSignclosedProductInfo" >
+    select
+    sp.product_id productId,
+	sp.signclosed_id signclosedId,
+	sp.product_name productName,
+	sp.product_num productNum,
+	sp.signclosed_create_time signclosedCreateTime,
+	sp.signclosed_update_time signclosedUpdateTime,
+	sp.signclosed_product_type signclosedProductType,
+	sp.signclosed_product_id signclosedProductId,
+	sp.signclosed_product_color signclosedProductColor,
+    pc.color_name colorName,
+    pi.product_number productNumber
+    from
+    tb_rst_complaint_awaiting_signclosed_product sp
+    LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
+    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
+    where signclosed_id = #{signclosedId,jdbcType=INTEGER}
+  </select>
+  <insert id="insert" parameterType="AwaitingSignclosedProductInfo" useGeneratedKeys="true" keyProperty="productId">
+    insert into tb_rst_complaint_awaiting_signclosed_product (product_id, signclosed_id, product_name, 
+      product_num, signclosed_create_time, signclosed_update_time,signclosed_product_type,signclosed_product_id,signclosed_product_color
+      )
+    values (#{productId,jdbcType=INTEGER}, #{signclosedId,jdbcType=INTEGER}, #{productName,jdbcType=VARCHAR}, 
+      #{productNum,jdbcType=INTEGER}, #{signclosedCreateTime,jdbcType=TIMESTAMP}, #{signclosedUpdateTime,jdbcType=TIMESTAMP}
+      ,#{signclosedProductType,jdbcType=INTEGER}, #{signclosedProductId,jdbcType=INTEGER}, #{signclosedProductColor,jdbcType=INTEGER}
+      )
+  </insert>
+
+  <update id="updateById" parameterType="AwaitingSignclosedProductInfo" >
+    update tb_rst_complaint_awaiting_signclosed_product
+    <set >
+      <if test="signclosedId != null" >
+        signclosed_id = #{signclosedId,jdbcType=INTEGER},
+      </if>
+      <if test="productName != null" >
+        product_name = #{productName,jdbcType=VARCHAR},
+      </if>
+      <if test="productNum != null" >
+        product_num = #{productNum,jdbcType=INTEGER},
+      </if>
+      <if test="signclosedCreateTime != null" >
+        signclosed_create_time = #{signclosedCreateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="signclosedUpdateTime != null" >
+        signclosed_update_time = #{signclosedUpdateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where product_id = #{productId,jdbcType=INTEGER}
+  </update>
+
+
+
+  <select id="listBySignclosedId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    SELECT
+      sp.product_id productId,
+      sp.signclosed_id signclosedId,
+      sp.product_name productName,
+
+      sp.signclosed_create_time signclosedCreateTime,
+      sp.signclosed_update_time signclosedUpdateTime,
+      sp.signclosed_product_type signclosedProductType,
+      sp.signclosed_product_id signclosedProductId,
+      sp.signclosed_product_color signclosedProductColor,
+      pc.color_name colorName,
+      count(1) productNum
+      FROM
+      tb_rst_complaint_awaiting_signclosed_product sp
+      LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
+      WHERE
+      signclosed_id = #{signclosedId}
+      GROUP BY sp.product_name,pc.color_name
+  </select>
 </mapper>

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

@@ -1,302 +1,302 @@
-<?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.fm.mapper.ComplaintDetectInfoMapper" >
-  <resultMap id="BaseResultMap" type="ComplaintDetectInfo" >
-  <id column="detect_id" property="detectId" jdbcType="INTEGER" />
-  <result column="customer_id" property="customerId" jdbcType="INTEGER" />
-  <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
-  <result column="detect_desc" property="detectDesc" jdbcType="VARCHAR" />
-  <result column="detect_create_time" property="detectCreateTime" jdbcType="TIMESTAMP" />
-  <result column="detect_update_time" property="detectUpdateTime" jdbcType="TIMESTAMP" />
-</resultMap>
-  <sql id="Base_Column_List" >
-    detect_id, customer_id,signclosed_id,detect_desc,
-    detect_create_time, detect_update_time
-  </sql>
-  <select id="getDetectItemById" resultType="ComplaintDetectItem" parameterType="java.lang.Integer" >
-    select 
-      detect_item_id detectItemId,
-      detect_id detectId,
-      product_id productId,
-      detect_product_number detectProductNumber,
-      detect_item_state detectItemState,
-      customer_id customerId,
-      detect_item_phenomenon detectItemPhenomenon,
-      detect_item_classification detectItemClassification,
-      detect_item_failure_cause detectItemFailureCause,
-      detect_item_results detectItemResults,
-      detect_item_point detectItemPoint,
-      detect_item_nalysis detectItemNalysis,
-      detect_item_content detectItemContent,
-      customer_id customerId,
-      is_maintenance isMaintenance,
-      maintenance_results maintenanceResults,
-      detect_item_desc detectItemDesc,
-      detect_item_date detectItemDate,
-      detect_item_create_time detectItemCreateTime,
-      detect_item_update_time detectItemUpdateTime
-    from tb_rst_complaint_detect_item
-    where detect_item_id = #{detectItemId,jdbcType=INTEGER}
-  </select>
-
-  <select id="getDetectByCustomerId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select
-    <include refid="Base_Column_List" />
-    from tb_rst_complaint_detect
-    where customer_id = #{customerId,jdbcType=INTEGER}
-  </select>
-  <select id="listComplaintDetectItem" resultType="ComplaintDetectItem" parameterType="ComplaintDetectItem" >
-    select
-    cd.detect_item_id detectItemId,
-    cd.detect_id detectId,
-    cd.product_id productId,
-    cd.detect_product_number detectProductNumber,
-    cd.detect_item_state detectItemState,
-    cd.customer_id customerId,
-    cd.detect_item_phenomenon detectItemPhenomenon,
-    cd.detect_item_classification detectItemClassification,
-    cd.detect_item_failure_cause detectItemFailureCause,
-    cd.detect_item_results detectItemResults,
-    cd.detect_item_point detectItemPoint,
-    cd.detect_item_nalysis detectItemNalysis,
-    cd.detect_item_content detectItemContent,
-    cd.customer_id customerId,
-    cd.is_maintenance isMaintenance,
-    cd.maintenance_results maintenanceResults,
-    cd.detect_item_desc detectItemDesc,
-    cd.detect_item_date detectItemDate,
-    cd.detect_item_create_time detectItemCreateTime,
-    cd.detect_item_update_time detectItemUpdateTime,
-    qd.describe_title questionTitle,
-    pi.product_name productName,
-    pt.type_name productTypeName,
-    ci.color_name colorName
-    from tb_rst_complaint_detect_item cd
-    LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
-    LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
-    LEFT JOIN tb_rst_product_type pt on pi.product_type = pt.type_id
-    LEFT JOIN tb_rst_product_color ci on cd.product_color_id = ci.color_id
-    <where>
-      <if test="productTypeId != null" >
-        AND pt.type_id = #{productTypeId,jdbcType=INTEGER}
-      </if>
-      <if test="customerId != null" >
-        AND cd.customer_id = #{customerId}
-      </if>
-      <if test="productId != null" >
-        AND cd.product_id = #{productId}
-      </if>
-      <if test="productColorId != null" >
-        AND cd.product_color_id = #{productColorId}
-      </if>
-      <if test="detectItemPhenomenon != null and detectItemPhenomenon != ''" >
-        AND cd.detect_item_phenomenon = #{detectItemPhenomenon}
-      </if>
-      <if test="detectItemClassification != null and detectItemClassification != ''" >
-        AND cd.detect_item_classification = #{detectItemClassification}
-      </if>
-      <if test="detectItemFailureCause != null and detectItemFailureCause != ''" >
-        AND cd.detect_item_failure_cause = #{detectItemFailureCause}
-      </if>
-      <if test="detectItemResults != null and detectItemResults != ''" >
-        AND cd.detect_item_results = #{detectItemResults}
-      </if>
-      <if test="detectItemPoint != null and detectItemPoint != ''" >
-        AND cd.detect_item_point = #{detectItemPoint}
-      </if>
-      <if test="detectItemNalysis != null and detectItemNalysis != ''" >
-        AND cd.detect_item_nalysis = #{detectItemNalysis}
-      </if>
-      <if test="detectItemContent != null and detectItemContent != ''" >
-        AND cd.detect_item_content = #{detectItemContent}
-      </if>
-      <if test="isMaintenance != null and isMaintenance != ''" >
-        AND cd.is_maintenance = #{isMaintenance}
-      </if>
-      <if test="maintenanceResults != null and maintenanceResults != ''" >
-        AND cd.maintenance_results = #{maintenanceResults}
-      </if>
-    </where>
-      ORDER BY cd.detect_item_create_time DESC
-  </select>
-  <insert id="insert" parameterType="ComplaintDetectInfo"  useGeneratedKeys="true" keyProperty="detectId" >
-    insert into tb_rst_complaint_detect (
-      customer_id,
-      signclosed_id,
-      detect_desc,
-      detect_create_time
-      )
-    values (
-      #{customerId,jdbcType=INTEGER},
-      #{signclosedId,jdbcType=INTEGER},
-      #{detectDesc,jdbcType=VARCHAR},
-      #{detectCreateTime,jdbcType=TIMESTAMP}
-      )
-  </insert>
-
-  <update id="updateDetectItemById" parameterType="ComplaintDetectItem" >
-    update tb_rst_complaint_detect_item
-    <set >
-      <if test="customerId != null" >
-        customer_id = #{customerId,jdbcType=INTEGER},
-      </if>
-      <if test="detectItemState != null" >
-        detect_item_state = #{detectItemState,jdbcType=INTEGER},
-      </if>
-      <if test="detectItemPhenomenon != null" >
-        detect_item_phenomenon = #{detectItemPhenomenon,jdbcType=VARCHAR},
-      </if>
-      <if test="detectItemClassification != null" >
-        detect_item_classification = #{detectItemClassification,jdbcType=VARCHAR},
-      </if>
-      <if test="detectItemFailureCause != null" >
-        detect_item_failure_cause = #{detectItemFailureCause,jdbcType=VARCHAR},
-      </if>
-      <if test="detectItemResults != null" >
-        detect_item_results = #{detectItemResults,jdbcType=VARCHAR},
-      </if>
-      <if test="detectItemPoint != null" >
-        detect_item_point = #{detectItemPoint,jdbcType=VARCHAR},
-      </if>
-      <if test="detectItemNalysis != null" >
-        detect_item_nalysis = #{detectItemNalysis,jdbcType=VARCHAR},
-      </if>
-      <if test="detectItemContent != null" >
-        detect_item_content = #{detectItemContent,jdbcType=VARCHAR},
-      </if>
-      <if test="isMaintenance != null" >
-        is_maintenance = #{isMaintenance,jdbcType=INTEGER},
-      </if>
-      <if test="maintenanceResults != null" >
-        maintenance_results = #{maintenanceResults,jdbcType=INTEGER},
-      </if>
-      <if test="detectItemDesc != null" >
-        detect_item_desc = #{detectItemDesc,jdbcType=INTEGER},
-      </if>
-      <if test="detectItemDate != null" >
-        detect_item_date = #{detectItemDate,jdbcType=INTEGER},
-      </if>
-      <if test="detectItemUpdateTime != null" >
-        detect_item_update_time = #{detectItemUpdateTime,jdbcType=TIMESTAMP}
-      </if>
-    </set>
-    <where>
-      <if test="detectItemId != null and detectItemId != ''" >
-        AND detect_item_id = #{detectItemId,jdbcType=INTEGER}
-      </if>
-    </where>
-  </update>
-
-  <insert id="insertItemList" parameterType="java.util.List" >
-    insert into tb_rst_complaint_detect_item
-    (
-    detect_id,
-    product_id,
-    machine_no,
-    detect_product_number,
-    detect_item_state,
-    detect_item_phenomenon,
-    detect_item_classification,
-    detect_item_failure_cause,
-    detect_item_results,
-    detect_item_point,
-    detect_item_nalysis,
-    detect_item_content,
-    is_maintenance,
-    maintenance_results,
-    detect_item_desc,
-    detect_item_date,
-    detect_item_create_time,
-    product_color_id
-    )
-    values
-    <foreach collection="list" item="node" index="index" separator="," open="" close="">
-      (
-      #{node.detectId},
-      #{node.productId},
-      #{node.machineNo},
-      #{node.detectProductNumber},
-      #{node.detectItemState},
-      #{node.detectItemPhenomenon},
-      #{node.detectItemClassification},
-      #{node.detectItemFailureCause},
-      #{node.detectItemResults},
-      #{node.detectItemPoint},
-      #{node.detectItemNalysis},
-      #{node.detectItemContent},
-      #{node.isMaintenance},
-      #{node.maintenanceResults},
-      #{node.detectItemDesc},
-      #{node.detectItemDate},
-      #{node.detectItemCreateTime},
-      #{node.productColorId}
-      )
-    </foreach>
-  </insert>
-
-  <insert id="insertItem" parameterType="ComplaintDetectItem"   useGeneratedKeys="true" keyProperty="detectItemId">
-    insert into tb_rst_complaint_detect_item
-    (
-    detect_id,
-    product_id,
-    machine_no,
-    detect_product_number,
-    detect_item_state,
-    detect_item_phenomenon,
-    detect_item_classification,
-    detect_item_failure_cause,
-    detect_item_results,
-    detect_item_point,
-    detect_item_nalysis,
-    detect_item_content,
-    is_maintenance,
-    maintenance_results,
-    detect_item_desc,
-    detect_item_date,
-    detect_item_create_time,
-    product_color_id,
-    customer_id
-    )
-    values
-      (
-      #{detectId},
-      #{productId},
-      #{machineNo},
-      #{detectProductNumber},
-      #{detectItemState},
-      #{detectItemPhenomenon},
-      #{detectItemClassification},
-      #{detectItemFailureCause},
-      #{detectItemResults},
-      #{detectItemPoint},
-      #{detectItemNalysis},
-      #{detectItemContent},
-      #{isMaintenance},
-      #{maintenanceResults},
-      #{detectItemDesc},
-      #{detectItemDate},
-      #{detectItemCreateTime},
-      #{productColorId},
-      #{customerId}
-      )
-  </insert>
-
-  <delete id="deleteDetectItem" parameterType="Integer">
-    DELETE FROM tb_rst_complaint_detect_item WHERE detect_item_id = #{detectItemId}
-  </delete>
-
-  <select id="listDetectionBasis" parameterType="DetectionBasis" resultType="DetectionBasis">
-      select * from tb_rst_complaint_detection_basis
-    <where>
-      <if test="basisState != null" >
-        AND basis_state = #{basisState,jdbcType=INTEGER}
-      </if>
-      <if test="basisPhenomenon != null" >
-        AND basis_phenomenon like CONCAT('%',#{basisPhenomenon},'%')
-      </if>
-      <if test="basisId != null" >
-        AND basis_id = #{basisId}
-      </if>
-    </where>
-  </select>
+<?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.fm.mapper.ComplaintDetectInfoMapper" >
+  <resultMap id="BaseResultMap" type="ComplaintDetectInfo" >
+  <id column="detect_id" property="detectId" jdbcType="INTEGER" />
+  <result column="customer_id" property="customerId" jdbcType="INTEGER" />
+  <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
+  <result column="detect_desc" property="detectDesc" jdbcType="VARCHAR" />
+  <result column="detect_create_time" property="detectCreateTime" jdbcType="TIMESTAMP" />
+  <result column="detect_update_time" property="detectUpdateTime" jdbcType="TIMESTAMP" />
+</resultMap>
+  <sql id="Base_Column_List" >
+    detect_id, customer_id,signclosed_id,detect_desc,
+    detect_create_time, detect_update_time
+  </sql>
+  <select id="getDetectItemById" resultType="ComplaintDetectItem" parameterType="java.lang.Integer" >
+    select 
+      detect_item_id detectItemId,
+      detect_id detectId,
+      product_id productId,
+      detect_product_number detectProductNumber,
+      detect_item_state detectItemState,
+      customer_id customerId,
+      detect_item_phenomenon detectItemPhenomenon,
+      detect_item_classification detectItemClassification,
+      detect_item_failure_cause detectItemFailureCause,
+      detect_item_results detectItemResults,
+      detect_item_point detectItemPoint,
+      detect_item_nalysis detectItemNalysis,
+      detect_item_content detectItemContent,
+      customer_id customerId,
+      is_maintenance isMaintenance,
+      maintenance_results maintenanceResults,
+      detect_item_desc detectItemDesc,
+      detect_item_date detectItemDate,
+      detect_item_create_time detectItemCreateTime,
+      detect_item_update_time detectItemUpdateTime
+    from tb_rst_complaint_detect_item
+    where detect_item_id = #{detectItemId,jdbcType=INTEGER}
+  </select>
+
+  <select id="getDetectByCustomerId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
+    <include refid="Base_Column_List" />
+    from tb_rst_complaint_detect
+    where customer_id = #{customerId,jdbcType=INTEGER}
+  </select>
+  <select id="listComplaintDetectItem" resultType="ComplaintDetectItem" parameterType="ComplaintDetectItem" >
+    select
+    cd.detect_item_id detectItemId,
+    cd.detect_id detectId,
+    cd.product_id productId,
+    cd.detect_product_number detectProductNumber,
+    cd.detect_item_state detectItemState,
+    cd.customer_id customerId,
+    cd.detect_item_phenomenon detectItemPhenomenon,
+    cd.detect_item_classification detectItemClassification,
+    cd.detect_item_failure_cause detectItemFailureCause,
+    cd.detect_item_results detectItemResults,
+    cd.detect_item_point detectItemPoint,
+    cd.detect_item_nalysis detectItemNalysis,
+    cd.detect_item_content detectItemContent,
+    cd.customer_id customerId,
+    cd.is_maintenance isMaintenance,
+    cd.maintenance_results maintenanceResults,
+    cd.detect_item_desc detectItemDesc,
+    cd.detect_item_date detectItemDate,
+    cd.detect_item_create_time detectItemCreateTime,
+    cd.detect_item_update_time detectItemUpdateTime,
+    qd.describe_title questionTitle,
+    pi.product_name productName,
+    pt.type_name productTypeName,
+    ci.color_name colorName
+    from tb_rst_complaint_detect_item cd
+    LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
+    LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
+    LEFT JOIN tb_rst_product_type pt on pi.product_type = pt.type_id
+    LEFT JOIN tb_rst_product_color ci on cd.product_color_id = ci.color_id
+    <where>
+      <if test="productTypeId != null" >
+        AND pt.type_id = #{productTypeId,jdbcType=INTEGER}
+      </if>
+      <if test="customerId != null" >
+        AND cd.customer_id = #{customerId}
+      </if>
+      <if test="productId != null" >
+        AND cd.product_id = #{productId}
+      </if>
+      <if test="productColorId != null" >
+        AND cd.product_color_id = #{productColorId}
+      </if>
+      <if test="detectItemPhenomenon != null and detectItemPhenomenon != ''" >
+        AND cd.detect_item_phenomenon = #{detectItemPhenomenon}
+      </if>
+      <if test="detectItemClassification != null and detectItemClassification != ''" >
+        AND cd.detect_item_classification = #{detectItemClassification}
+      </if>
+      <if test="detectItemFailureCause != null and detectItemFailureCause != ''" >
+        AND cd.detect_item_failure_cause = #{detectItemFailureCause}
+      </if>
+      <if test="detectItemResults != null and detectItemResults != ''" >
+        AND cd.detect_item_results = #{detectItemResults}
+      </if>
+      <if test="detectItemPoint != null and detectItemPoint != ''" >
+        AND cd.detect_item_point = #{detectItemPoint}
+      </if>
+      <if test="detectItemNalysis != null and detectItemNalysis != ''" >
+        AND cd.detect_item_nalysis = #{detectItemNalysis}
+      </if>
+      <if test="detectItemContent != null and detectItemContent != ''" >
+        AND cd.detect_item_content = #{detectItemContent}
+      </if>
+      <if test="isMaintenance != null and isMaintenance != ''" >
+        AND cd.is_maintenance = #{isMaintenance}
+      </if>
+      <if test="maintenanceResults != null and maintenanceResults != ''" >
+        AND cd.maintenance_results = #{maintenanceResults}
+      </if>
+    </where>
+      ORDER BY cd.detect_item_create_time DESC
+  </select>
+  <insert id="insert" parameterType="ComplaintDetectInfo"  useGeneratedKeys="true" keyProperty="detectId" >
+    insert into tb_rst_complaint_detect (
+      customer_id,
+      signclosed_id,
+      detect_desc,
+      detect_create_time
+      )
+    values (
+      #{customerId,jdbcType=INTEGER},
+      #{signclosedId,jdbcType=INTEGER},
+      #{detectDesc,jdbcType=VARCHAR},
+      #{detectCreateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+
+  <update id="updateDetectItemById" parameterType="ComplaintDetectItem" >
+    update tb_rst_complaint_detect_item
+    <set >
+      <if test="customerId != null" >
+        customer_id = #{customerId,jdbcType=INTEGER},
+      </if>
+      <if test="detectItemState != null" >
+        detect_item_state = #{detectItemState,jdbcType=INTEGER},
+      </if>
+      <if test="detectItemPhenomenon != null" >
+        detect_item_phenomenon = #{detectItemPhenomenon,jdbcType=VARCHAR},
+      </if>
+      <if test="detectItemClassification != null" >
+        detect_item_classification = #{detectItemClassification,jdbcType=VARCHAR},
+      </if>
+      <if test="detectItemFailureCause != null" >
+        detect_item_failure_cause = #{detectItemFailureCause,jdbcType=VARCHAR},
+      </if>
+      <if test="detectItemResults != null" >
+        detect_item_results = #{detectItemResults,jdbcType=VARCHAR},
+      </if>
+      <if test="detectItemPoint != null" >
+        detect_item_point = #{detectItemPoint,jdbcType=VARCHAR},
+      </if>
+      <if test="detectItemNalysis != null" >
+        detect_item_nalysis = #{detectItemNalysis,jdbcType=VARCHAR},
+      </if>
+      <if test="detectItemContent != null" >
+        detect_item_content = #{detectItemContent,jdbcType=VARCHAR},
+      </if>
+      <if test="isMaintenance != null" >
+        is_maintenance = #{isMaintenance,jdbcType=INTEGER},
+      </if>
+      <if test="maintenanceResults != null" >
+        maintenance_results = #{maintenanceResults,jdbcType=INTEGER},
+      </if>
+      <if test="detectItemDesc != null" >
+        detect_item_desc = #{detectItemDesc,jdbcType=INTEGER},
+      </if>
+      <if test="detectItemDate != null" >
+        detect_item_date = #{detectItemDate,jdbcType=INTEGER},
+      </if>
+      <if test="detectItemUpdateTime != null" >
+        detect_item_update_time = #{detectItemUpdateTime,jdbcType=TIMESTAMP}
+      </if>
+    </set>
+    <where>
+      <if test="detectItemId != null and detectItemId != ''" >
+        AND detect_item_id = #{detectItemId,jdbcType=INTEGER}
+      </if>
+    </where>
+  </update>
+
+  <insert id="insertItemList" parameterType="java.util.List" >
+    insert into tb_rst_complaint_detect_item
+    (
+    detect_id,
+    product_id,
+    machine_no,
+    detect_product_number,
+    detect_item_state,
+    detect_item_phenomenon,
+    detect_item_classification,
+    detect_item_failure_cause,
+    detect_item_results,
+    detect_item_point,
+    detect_item_nalysis,
+    detect_item_content,
+    is_maintenance,
+    maintenance_results,
+    detect_item_desc,
+    detect_item_date,
+    detect_item_create_time,
+    product_color_id
+    )
+    values
+    <foreach collection="list" item="node" index="index" separator="," open="" close="">
+      (
+      #{node.detectId},
+      #{node.productId},
+      #{node.machineNo},
+      #{node.detectProductNumber},
+      #{node.detectItemState},
+      #{node.detectItemPhenomenon},
+      #{node.detectItemClassification},
+      #{node.detectItemFailureCause},
+      #{node.detectItemResults},
+      #{node.detectItemPoint},
+      #{node.detectItemNalysis},
+      #{node.detectItemContent},
+      #{node.isMaintenance},
+      #{node.maintenanceResults},
+      #{node.detectItemDesc},
+      #{node.detectItemDate},
+      #{node.detectItemCreateTime},
+      #{node.productColorId}
+      )
+    </foreach>
+  </insert>
+
+  <insert id="insertItem" parameterType="ComplaintDetectItem"   useGeneratedKeys="true" keyProperty="detectItemId">
+    insert into tb_rst_complaint_detect_item
+    (
+    detect_id,
+    product_id,
+    machine_no,
+    detect_product_number,
+    detect_item_state,
+    detect_item_phenomenon,
+    detect_item_classification,
+    detect_item_failure_cause,
+    detect_item_results,
+    detect_item_point,
+    detect_item_nalysis,
+    detect_item_content,
+    is_maintenance,
+    maintenance_results,
+    detect_item_desc,
+    detect_item_date,
+    detect_item_create_time,
+    product_color_id,
+    customer_id
+    )
+    values
+      (
+      #{detectId},
+      #{productId},
+      #{machineNo},
+      #{detectProductNumber},
+      #{detectItemState},
+      #{detectItemPhenomenon},
+      #{detectItemClassification},
+      #{detectItemFailureCause},
+      #{detectItemResults},
+      #{detectItemPoint},
+      #{detectItemNalysis},
+      #{detectItemContent},
+      #{isMaintenance},
+      #{maintenanceResults},
+      #{detectItemDesc},
+      #{detectItemDate},
+      #{detectItemCreateTime},
+      #{productColorId},
+      #{customerId}
+      )
+  </insert>
+
+  <delete id="deleteDetectItem" parameterType="Integer">
+    DELETE FROM tb_rst_complaint_detect_item WHERE detect_item_id = #{detectItemId}
+  </delete>
+
+  <select id="listDetectionBasis" parameterType="DetectionBasis" resultType="DetectionBasis">
+      select * from tb_rst_complaint_detection_basis
+    <where>
+      <if test="basisState != null" >
+        AND basis_state = #{basisState,jdbcType=INTEGER}
+      </if>
+      <if test="basisPhenomenon != null" >
+        AND basis_phenomenon like CONCAT('%',#{basisPhenomenon},'%')
+      </if>
+      <if test="basisId != null" >
+        AND basis_id = #{basisId}
+      </if>
+    </where>
+  </select>
 </mapper>

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

@@ -1,200 +1,200 @@
-<?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.fm.mapper.ComplaintMaintenanceInfoMapper" >
-  <resultMap id="BaseResultMap" type="ComplaintMaintenanceInfo" >
-    <id column="maintenance_id" property="maintenanceId" jdbcType="INTEGER" />
-    <result column="detect_id" property="detectId" jdbcType="INTEGER" />
-    <result column="maintenance_equipment_number" property="maintenanceEquipmentNumber" jdbcType="INTEGER" />
-    <result column="product_id" property="productId" jdbcType="INTEGER" />
-    <result column="maintenance_product_number" property="maintenanceProductNumber" jdbcType="VARCHAR" />
-    <result column="maintenance_state" property="maintenanceState" jdbcType="INTEGER" />
-    <result column="maintenance_analysis" property="maintenanceAnalysis" jdbcType="VARCHAR" />
-    <result column="maintenance_customer_id" property="maintenanceCustomerId" jdbcType="INTEGER" />
-    <result column="maintenance_is_repair" property="maintenanceIsRepair" jdbcType="INTEGER" />
-    <result column="maintenance_content_date" property="maintenanceContentDate" jdbcType="TIMESTAMP" />
-    <result column="maintenance_create_time" property="maintenanceCreateTime" jdbcType="TIMESTAMP" />
-    <result column="maintenance_update_time" property="maintenanceUpdateTime" jdbcType="TIMESTAMP" />
-    <result column="maintenance_is_warehousing" property="maintenanceIsWarehousing" jdbcType="INTEGER" />
-    <result column="maintenance_desc" property="maintenanceDesc" jdbcType="VARCHAR" />
-    <result column="product_color_id" property="productColorId" jdbcType="INTEGER" />
-
-
-  </resultMap>
-  <sql id="Base_Column_List" >
-    maintenance_id, detect_id, maintenance_equipment_number, product_id,
-    maintenance_product_number, maintenance_state, maintenance_analysis,
-    maintenance_customer_id, maintenance_is_repair,maintenance_content_date,
-    maintenance_create_time, maintenance_update_time,maintenance_is_warehousing,maintenance_desc,
-    product_color_id
-  </sql>
-  <select id="getMaintenanceByid" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from tb_rst_complaint_maintenance
-    where maintenance_id = #{maintenanceId,jdbcType=INTEGER}
-  </select>
-
-  <resultMap id="listMaintenanceMap" type="ComplaintMaintenanceInfo" >
-    <id column="maintenance_id" property="maintenanceId" jdbcType="INTEGER" />
-    <result column="detect_id" property="detectId" jdbcType="INTEGER" />
-    <result column="maintenance_equipment_number" property="maintenanceEquipmentNumber" jdbcType="VARCHAR" />
-    <result column="product_id" property="productId" jdbcType="INTEGER" />
-    <result column="maintenance_product_number" property="maintenanceProductNumber" jdbcType="VARCHAR" />
-    <result column="maintenance_state" property="maintenanceState" jdbcType="INTEGER" />
-    <result column="maintenance_analysis" property="maintenanceAnalysis" jdbcType="VARCHAR" />
-    <result column="maintenance_customer_id" property="maintenanceCustomerId" jdbcType="INTEGER" />
-    <result column="maintenance_is_repair" property="maintenanceIsRepair" jdbcType="INTEGER" />
-    <result column="maintenance_content_date" property="maintenanceContentDate" jdbcType="TIMESTAMP" />
-    <result column="maintenance_create_time" property="maintenanceCreateTime" jdbcType="TIMESTAMP" />
-    <result column="maintenance_update_time" property="maintenanceUpdateTime" jdbcType="TIMESTAMP" />
-    <result column="maintenance_is_warehousing" property="maintenanceIsWarehousing" jdbcType="INTEGER" />
-    <result column="maintenance_desc" property="maintenanceDesc" jdbcType="VARCHAR" />
-    <result column="product_color_id" property="productColorId" jdbcType="VARCHAR" />
-    <collection property="equipmentNumber" column="maintenance_equipment_number" ofType="String" select="selectEquipmentNumber"/>
-  </resultMap>
-  <select id="selectEquipmentNumber" resultType="Integer" parameterType="String" >
-    select
-    COUNT(*)
-    from tb_rst_complaint_maintenance
-    where maintenance_equipment_number = #{maintenanceEquipmentNumber}
-  </select>
-
-  <select id="listMaintenance" resultMap="listMaintenanceMap" parameterType="ComplaintMaintenanceInfo" >
-    select
-    cm.maintenance_id,
-    cm.detect_id,
-    cm.maintenance_equipment_number,
-    cm.product_id,
-    cm.maintenance_product_number,
-    cm.maintenance_state,
-    cm.maintenance_analysis,
-    cm.maintenance_customer_id,
-    cm.maintenance_is_repair,
-    cm.maintenance_content_date,
-    cm.maintenance_create_time,
-    cm.maintenance_update_time,
-    cm.maintenance_is_warehousing,
-    cm.maintenance_desc,
-    cm.product_color_id,
-    pi.product_type productType,
-    cd.maintenance_results maintenanceResults,
-    cd.detect_desc detectDesc,
-    qd.describe_title customerIdDescribe
-    from tb_rst_complaint_maintenance cm
-    LEFT JOIN tb_rst_product_info pi on cm.product_id = pi.product_id
-    LEFT JOIN	tb_rst_complaint_detect cd on cm.detect_id = cd.detect_id
-    LEFT JOIN tb_rst_cm_question_describe qd on cm.maintenance_customer_id = qd.customer_id
-    <where>
-      <if test="maintenanceId != null and maintenanceId != ''" >
-        AND maintenance_id = #{maintenanceId}
-      </if>
-      <if test="detectId != null and detectId != ''" >
-        AND cm.detect_id = #{detectId}
-      </if>
-      <if test="maintenanceEquipmentNumber != null and maintenanceEquipmentNumber != ''" >
-        AND maintenance_equipment_number = #{maintenanceEquipmentNumber}
-      </if>
-      <if test="maintenanceState != null and maintenanceState != ''" >
-        AND maintenance_state = #{maintenanceState}
-      </if>
-      <if test="maintenanceAnalysis != null and maintenanceAnalysis != ''" >
-        AND maintenance_analysis = #{maintenanceAnalysis}
-      </if>
-      <if test="maintenanceCustomerId != null and maintenanceCustomerId != ''" >
-        AND maintenance_customer_id = #{maintenanceCustomerId}
-      </if>
-      <if test="maintenanceIsRepair != null and maintenanceIsRepair != ''" >
-        AND maintenance_is_repair = #{maintenanceIsRepair}
-      </if>
-      <if test="maintenanceContentDate != null and maintenanceContentDate != ''" >
-        AND maintenance_content_date = #{maintenanceContentDate}
-      </if>
-      <if test="maintenanceCreateTime != null and maintenanceCreateTime != ''" >
-        AND maintenance_create_time = #{maintenanceCreateTime}
-      </if>
-      <if test="maintenanceUpdateTime != null and maintenanceUpdateTime != ''" >
-        AND maintenanceUpdateTime = #{maintenanceUpdateTime}
-      </if>
-      <if test="customerIdDescribe != null and customerIdDescribe != ''" >
-        AND qd.describe_title like CONCAT('%',#{customerIdDescribe},'%')
-      </if>
-      <if test="maintenanceResults != null and maintenanceResults != ''" >
-        AND cd.maintenance_results = #{maintenanceResults}
-      </if>
-      <if test="productColorId != null and productColorId != ''" >
-        AND product_color_id = #{productColorId}
-      </if>
-    </where>
-    ORDER BY cm.maintenance_create_time DESC
-  </select>
-  <insert id="insert" parameterType="ComplaintMaintenanceInfo" >
-    insert into tb_rst_complaint_maintenance (maintenance_id, detect_id, maintenance_equipment_number, 
-      product_id, maintenance_product_number,
-      maintenance_state, maintenance_analysis,
-      maintenance_customer_id, maintenance_is_repair,
-      maintenance_content_date,
-      maintenance_create_time, maintenance_update_time,
-      maintenance_is_warehousing,
-      maintenance_desc,product_color_id
-      )
-    values (#{maintenanceId,jdbcType=INTEGER}, #{detectId,jdbcType=INTEGER}, #{maintenanceEquipmentNumber,jdbcType=INTEGER}, 
-      #{productId,jdbcType=BIT}, #{maintenanceProductNumber,jdbcType=VARCHAR},
-      #{maintenanceState,jdbcType=INTEGER}, #{maintenanceAnalysis,jdbcType=VARCHAR},
-      #{maintenanceCustomerId,jdbcType=INTEGER}, #{maintenanceIsRepair,jdbcType=INTEGER},
-      #{maintenanceContentDate,jdbcType=TIMESTAMP},
-      #{maintenanceCreateTime,jdbcType=TIMESTAMP}, #{maintenanceUpdateTime,jdbcType=TIMESTAMP}
-      , #{maintenanceIsWarehousing,jdbcType=INTEGER}, #{maintenanceDesc,jdbcType=VARCHAR}
-      , #{productColorId,jdbcType=INTEGER}
-      )
-  </insert>
-
-  <update id="updateMaintenanceById" parameterType="ComplaintMaintenanceInfo" >
-    update tb_rst_complaint_maintenance
-    <set >
-      <if test="detectId != null" >
-        detect_id = #{detectId,jdbcType=INTEGER},
-      </if>
-      <if test="maintenanceEquipmentNumber != null" >
-        maintenance_equipment_number = #{maintenanceEquipmentNumber,jdbcType=INTEGER},
-      </if>
-      <if test="productId != null" >
-        product_id = #{productId,jdbcType=BIT},
-      </if>
-      <if test="maintenanceProductNumber != null" >
-        maintenance_product_number = #{maintenanceProductNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="maintenanceState != null" >
-        maintenance_state = #{maintenanceState,jdbcType=INTEGER},
-      </if>
-      <if test="maintenanceAnalysis != null" >
-        maintenance_analysis = #{maintenanceAnalysis,jdbcType=VARCHAR},
-      </if>
-      <if test="maintenanceCustomerId != null" >
-        maintenance_customer_id = #{maintenanceCustomerId,jdbcType=INTEGER},
-      </if>
-      <if test="maintenanceIsRepair != null" >
-        maintenance_is_repair = #{maintenanceIsRepair,jdbcType=INTEGER},
-      </if>
-      <if test="maintenanceContentDate != null" >
-        maintenance_content_date = #{maintenanceContentDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="maintenanceCreateTime != null" >
-        maintenance_create_time = #{maintenanceCreateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="maintenanceUpdateTime != null" >
-        maintenance_update_time = #{maintenanceUpdateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="maintenanceIsWarehousing != null" >
-        maintenance_is_warehousing = #{maintenanceIsWarehousing,jdbcType=TIMESTAMP},
-      </if>
-      <if test="maintenanceDesc != null" >
-        maintenance_desc = #{maintenanceDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="productColorId != null" >
-        product_color_id = #{productColorId,jdbcType=INTEGER}
-      </if>
-    </set>
-    where maintenance_id = #{maintenanceId,jdbcType=INTEGER}
-  </update>
-
+<?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.fm.mapper.ComplaintMaintenanceInfoMapper" >
+  <resultMap id="BaseResultMap" type="ComplaintMaintenanceInfo" >
+    <id column="maintenance_id" property="maintenanceId" jdbcType="INTEGER" />
+    <result column="detect_id" property="detectId" jdbcType="INTEGER" />
+    <result column="maintenance_equipment_number" property="maintenanceEquipmentNumber" jdbcType="INTEGER" />
+    <result column="product_id" property="productId" jdbcType="INTEGER" />
+    <result column="maintenance_product_number" property="maintenanceProductNumber" jdbcType="VARCHAR" />
+    <result column="maintenance_state" property="maintenanceState" jdbcType="INTEGER" />
+    <result column="maintenance_analysis" property="maintenanceAnalysis" jdbcType="VARCHAR" />
+    <result column="maintenance_customer_id" property="maintenanceCustomerId" jdbcType="INTEGER" />
+    <result column="maintenance_is_repair" property="maintenanceIsRepair" jdbcType="INTEGER" />
+    <result column="maintenance_content_date" property="maintenanceContentDate" jdbcType="TIMESTAMP" />
+    <result column="maintenance_create_time" property="maintenanceCreateTime" jdbcType="TIMESTAMP" />
+    <result column="maintenance_update_time" property="maintenanceUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="maintenance_is_warehousing" property="maintenanceIsWarehousing" jdbcType="INTEGER" />
+    <result column="maintenance_desc" property="maintenanceDesc" jdbcType="VARCHAR" />
+    <result column="product_color_id" property="productColorId" jdbcType="INTEGER" />
+
+
+  </resultMap>
+  <sql id="Base_Column_List" >
+    maintenance_id, detect_id, maintenance_equipment_number, product_id,
+    maintenance_product_number, maintenance_state, maintenance_analysis,
+    maintenance_customer_id, maintenance_is_repair,maintenance_content_date,
+    maintenance_create_time, maintenance_update_time,maintenance_is_warehousing,maintenance_desc,
+    product_color_id
+  </sql>
+  <select id="getMaintenanceByid" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tb_rst_complaint_maintenance
+    where maintenance_id = #{maintenanceId,jdbcType=INTEGER}
+  </select>
+
+  <resultMap id="listMaintenanceMap" type="ComplaintMaintenanceInfo" >
+    <id column="maintenance_id" property="maintenanceId" jdbcType="INTEGER" />
+    <result column="detect_id" property="detectId" jdbcType="INTEGER" />
+    <result column="maintenance_equipment_number" property="maintenanceEquipmentNumber" jdbcType="VARCHAR" />
+    <result column="product_id" property="productId" jdbcType="INTEGER" />
+    <result column="maintenance_product_number" property="maintenanceProductNumber" jdbcType="VARCHAR" />
+    <result column="maintenance_state" property="maintenanceState" jdbcType="INTEGER" />
+    <result column="maintenance_analysis" property="maintenanceAnalysis" jdbcType="VARCHAR" />
+    <result column="maintenance_customer_id" property="maintenanceCustomerId" jdbcType="INTEGER" />
+    <result column="maintenance_is_repair" property="maintenanceIsRepair" jdbcType="INTEGER" />
+    <result column="maintenance_content_date" property="maintenanceContentDate" jdbcType="TIMESTAMP" />
+    <result column="maintenance_create_time" property="maintenanceCreateTime" jdbcType="TIMESTAMP" />
+    <result column="maintenance_update_time" property="maintenanceUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="maintenance_is_warehousing" property="maintenanceIsWarehousing" jdbcType="INTEGER" />
+    <result column="maintenance_desc" property="maintenanceDesc" jdbcType="VARCHAR" />
+    <result column="product_color_id" property="productColorId" jdbcType="VARCHAR" />
+    <collection property="equipmentNumber" column="maintenance_equipment_number" ofType="String" select="selectEquipmentNumber"/>
+  </resultMap>
+  <select id="selectEquipmentNumber" resultType="Integer" parameterType="String" >
+    select
+    COUNT(*)
+    from tb_rst_complaint_maintenance
+    where maintenance_equipment_number = #{maintenanceEquipmentNumber}
+  </select>
+
+  <select id="listMaintenance" resultMap="listMaintenanceMap" parameterType="ComplaintMaintenanceInfo" >
+    select
+    cm.maintenance_id,
+    cm.detect_id,
+    cm.maintenance_equipment_number,
+    cm.product_id,
+    cm.maintenance_product_number,
+    cm.maintenance_state,
+    cm.maintenance_analysis,
+    cm.maintenance_customer_id,
+    cm.maintenance_is_repair,
+    cm.maintenance_content_date,
+    cm.maintenance_create_time,
+    cm.maintenance_update_time,
+    cm.maintenance_is_warehousing,
+    cm.maintenance_desc,
+    cm.product_color_id,
+    pi.product_type productType,
+    cd.maintenance_results maintenanceResults,
+    cd.detect_desc detectDesc,
+    qd.describe_title customerIdDescribe
+    from tb_rst_complaint_maintenance cm
+    LEFT JOIN tb_rst_product_info pi on cm.product_id = pi.product_id
+    LEFT JOIN	tb_rst_complaint_detect cd on cm.detect_id = cd.detect_id
+    LEFT JOIN tb_rst_cm_question_describe qd on cm.maintenance_customer_id = qd.customer_id
+    <where>
+      <if test="maintenanceId != null and maintenanceId != ''" >
+        AND maintenance_id = #{maintenanceId}
+      </if>
+      <if test="detectId != null and detectId != ''" >
+        AND cm.detect_id = #{detectId}
+      </if>
+      <if test="maintenanceEquipmentNumber != null and maintenanceEquipmentNumber != ''" >
+        AND maintenance_equipment_number = #{maintenanceEquipmentNumber}
+      </if>
+      <if test="maintenanceState != null and maintenanceState != ''" >
+        AND maintenance_state = #{maintenanceState}
+      </if>
+      <if test="maintenanceAnalysis != null and maintenanceAnalysis != ''" >
+        AND maintenance_analysis = #{maintenanceAnalysis}
+      </if>
+      <if test="maintenanceCustomerId != null and maintenanceCustomerId != ''" >
+        AND maintenance_customer_id = #{maintenanceCustomerId}
+      </if>
+      <if test="maintenanceIsRepair != null and maintenanceIsRepair != ''" >
+        AND maintenance_is_repair = #{maintenanceIsRepair}
+      </if>
+      <if test="maintenanceContentDate != null and maintenanceContentDate != ''" >
+        AND maintenance_content_date = #{maintenanceContentDate}
+      </if>
+      <if test="maintenanceCreateTime != null and maintenanceCreateTime != ''" >
+        AND maintenance_create_time = #{maintenanceCreateTime}
+      </if>
+      <if test="maintenanceUpdateTime != null and maintenanceUpdateTime != ''" >
+        AND maintenanceUpdateTime = #{maintenanceUpdateTime}
+      </if>
+      <if test="customerIdDescribe != null and customerIdDescribe != ''" >
+        AND qd.describe_title like CONCAT('%',#{customerIdDescribe},'%')
+      </if>
+      <if test="maintenanceResults != null and maintenanceResults != ''" >
+        AND cd.maintenance_results = #{maintenanceResults}
+      </if>
+      <if test="productColorId != null and productColorId != ''" >
+        AND product_color_id = #{productColorId}
+      </if>
+    </where>
+    ORDER BY cm.maintenance_create_time DESC
+  </select>
+  <insert id="insert" parameterType="ComplaintMaintenanceInfo" >
+    insert into tb_rst_complaint_maintenance (maintenance_id, detect_id, maintenance_equipment_number, 
+      product_id, maintenance_product_number,
+      maintenance_state, maintenance_analysis,
+      maintenance_customer_id, maintenance_is_repair,
+      maintenance_content_date,
+      maintenance_create_time, maintenance_update_time,
+      maintenance_is_warehousing,
+      maintenance_desc,product_color_id
+      )
+    values (#{maintenanceId,jdbcType=INTEGER}, #{detectId,jdbcType=INTEGER}, #{maintenanceEquipmentNumber,jdbcType=INTEGER}, 
+      #{productId,jdbcType=BIT}, #{maintenanceProductNumber,jdbcType=VARCHAR},
+      #{maintenanceState,jdbcType=INTEGER}, #{maintenanceAnalysis,jdbcType=VARCHAR},
+      #{maintenanceCustomerId,jdbcType=INTEGER}, #{maintenanceIsRepair,jdbcType=INTEGER},
+      #{maintenanceContentDate,jdbcType=TIMESTAMP},
+      #{maintenanceCreateTime,jdbcType=TIMESTAMP}, #{maintenanceUpdateTime,jdbcType=TIMESTAMP}
+      , #{maintenanceIsWarehousing,jdbcType=INTEGER}, #{maintenanceDesc,jdbcType=VARCHAR}
+      , #{productColorId,jdbcType=INTEGER}
+      )
+  </insert>
+
+  <update id="updateMaintenanceById" parameterType="ComplaintMaintenanceInfo" >
+    update tb_rst_complaint_maintenance
+    <set >
+      <if test="detectId != null" >
+        detect_id = #{detectId,jdbcType=INTEGER},
+      </if>
+      <if test="maintenanceEquipmentNumber != null" >
+        maintenance_equipment_number = #{maintenanceEquipmentNumber,jdbcType=INTEGER},
+      </if>
+      <if test="productId != null" >
+        product_id = #{productId,jdbcType=BIT},
+      </if>
+      <if test="maintenanceProductNumber != null" >
+        maintenance_product_number = #{maintenanceProductNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="maintenanceState != null" >
+        maintenance_state = #{maintenanceState,jdbcType=INTEGER},
+      </if>
+      <if test="maintenanceAnalysis != null" >
+        maintenance_analysis = #{maintenanceAnalysis,jdbcType=VARCHAR},
+      </if>
+      <if test="maintenanceCustomerId != null" >
+        maintenance_customer_id = #{maintenanceCustomerId,jdbcType=INTEGER},
+      </if>
+      <if test="maintenanceIsRepair != null" >
+        maintenance_is_repair = #{maintenanceIsRepair,jdbcType=INTEGER},
+      </if>
+      <if test="maintenanceContentDate != null" >
+        maintenance_content_date = #{maintenanceContentDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="maintenanceCreateTime != null" >
+        maintenance_create_time = #{maintenanceCreateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="maintenanceUpdateTime != null" >
+        maintenance_update_time = #{maintenanceUpdateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="maintenanceIsWarehousing != null" >
+        maintenance_is_warehousing = #{maintenanceIsWarehousing,jdbcType=TIMESTAMP},
+      </if>
+      <if test="maintenanceDesc != null" >
+        maintenance_desc = #{maintenanceDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="productColorId != null" >
+        product_color_id = #{productColorId,jdbcType=INTEGER}
+      </if>
+    </set>
+    where maintenance_id = #{maintenanceId,jdbcType=INTEGER}
+  </update>
+
 </mapper>

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

@@ -1,271 +1,271 @@
-<?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.fm.mapper.ComplaintSignclosedInfoMapper" >
-  <resultMap id="BaseResultMap" type="ComplaintSignclosedInfo" >
-    <id column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
-    <result column="signclosed_type" property="signclosedType" jdbcType="BIT" />
-    <result column="signclosed_type_name" property="signclosedTypeName" jdbcType="VARCHAR" />
-    <result column="signclosed_logistics" property="signclosedLogistics" jdbcType="VARCHAR" />
-    <result column="signclosed_logistics_number" property="signclosedLogisticsNumber" jdbcType="VARCHAR" />
-    <result column="signclosed_send_name" property="signclosedSendName" jdbcType="VARCHAR" />
-    <result column="signclosed_send_tel" property="signclosedSendTel" jdbcType="VARCHAR" />
-    <result column="signclosed_addr_provinces" property="signclosedAddrProvinces" jdbcType="VARCHAR" />
-    <result column="signclosed_addr_city" property="signclosedAddrCity" jdbcType="VARCHAR" />
-    <result column="signclosed_addr_area" property="signclosedAddrCity" jdbcType="VARCHAR" />
-    <result column="signclosed_date" property="signclosedDate" jdbcType="DATE" />
-    <result column="signclosed_customer_id" property="signclosedCustomerId" jdbcType="INTEGER" />
-    <result column="signclosed_desc" property="signclosedDesc" jdbcType="VARCHAR" />
-    <result column="signclosed_create_time" property="signclosedCreateTime" jdbcType="TIMESTAMP" />
-    <result column="signclosed_update_time" property="signclosedUpdateTime" jdbcType="TIMESTAMP" />
-    <result column="signclosed_state" property="signclosedState" jdbcType="INTEGER" />
-    <result column="signclosed_customer_desc" property="signclosedCustomerDesc" jdbcType="VARCHAR" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    signclosed_id, signclosed_type, signclosed_type_name, signclosed_logistics,
-    signclosed_logistics_number, signclosed_send_name, signclosed_send_tel, signclosed_addr_provinces, 
-    signclosed_addr_city,signclosed_addr_area, signclosed_date,signclosed_customer_id,signclosed_desc,
-    signclosed_create_time, signclosed_update_time,signclosed_state,signclosed_customer_desc
-  </sql>
-  <select id="getSignclosedById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select
-    <include refid="Base_Column_List" />,
-    tb_rst_cm_question_describe.describe_handle_desc describeHandleDesc
-    from tb_rst_complaint_signclosed
-    LEFT JOIN tb_rst_cm_question_describe on tb_rst_cm_question_describe.customer_id = tb_rst_complaint_signclosed.signclosed_customer_id
-    where signclosed_id = #{signclosedId,jdbcType=INTEGER}
-  </select>
-
-  <resultMap id="complaintSignclosedInfoMap" type="ComplaintSignclosedInfo">
-    <id column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
-    <result column="signclosed_type" property="signclosedType" jdbcType="BIT" />
-    <result column="signclosed_type_name" property="signclosedTypeName" jdbcType="VARCHAR" />
-    <result column="signclosed_logistics" property="signclosedLogistics" jdbcType="VARCHAR" />
-    <result column="signclosed_logistics_number" property="signclosedLogisticsNumber" jdbcType="VARCHAR" />
-    <result column="signclosed_send_name" property="signclosedSendName" jdbcType="VARCHAR" />
-    <result column="signclosed_send_tel" property="signclosedSendTel" jdbcType="VARCHAR" />
-    <result column="signclosed_addr_provinces" property="signclosedAddrProvinces" jdbcType="VARCHAR" />
-    <result column="signclosed_addr_city" property="signclosedAddrCity" jdbcType="VARCHAR" />
-    <result column="signclosed_addr_area" property="signclosedAddrArea" jdbcType="VARCHAR" />
-    <result column="signclosed_date" property="signclosedDate" jdbcType="DATE" />
-    <result column="signclosed_customer_id" property="signclosedCustomerId" jdbcType="INTEGER" />
-    <result column="signclosed_desc" property="signclosedDesc" jdbcType="VARCHAR" />
-    <result column="signclosed_create_time" property="signclosedCreateTime" jdbcType="TIMESTAMP" />
-    <result column="signclosed_update_time" property="signclosedUpdateTime" jdbcType="TIMESTAMP" />
-    <result column="signclosed_state" property="signclosedState" jdbcType="INTEGER" />
-    <result column="signclosed_customer_desc" property="signclosedCustomerDesc" jdbcType="VARCHAR" />
-    <result column="signclosed_customer_desc" property="signclosedCustomerDesc" jdbcType="VARCHAR" />
-    <result column="signclosed_customer_desc" property="signclosedCustomerDesc" jdbcType="VARCHAR" />
-    <collection property="signclosedProductInfoList" column="signclosed_id" ofType="SignclosedProductInfo" select="listSignclosedById"/>
-  </resultMap>
-  <select id="listAwaitingSignclosedById" resultType="AwaitingSignclosedProductInfo" parameterType="Integer" >
-    select
-    sp.product_id productId,
-    sp.signclosed_id signclosedId,
-    sp.product_name productName,
-    sp.signclosed_create_time signclosedCreateTime,
-    sp.signclosed_update_time signclosedUpdateTime,
-    sp.signclosed_product_type signclosedProductType,
-    sp.signclosed_product_id signclosedProductId,
-    sp.signclosed_product_color signclosedProductColor,
-    pc.color_name colorName,
-    pi.product_number productNumber,
-    count(1) productNum
-    from
-    tb_rst_complaint_awaiting_signclosed_product sp
-    LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
-    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
-    where sp.signclosed_id = #{signclosedId}
-    GROUP BY sp.product_name,pc.color_name
-  </select>
-
-  <select id="listSignclosedById" resultType="SignclosedProductInfo" parameterType="Integer" >
-    select
-    sp.product_id productId,
-    sp.signclosed_id signclosedId,
-    sp.product_name productName,
-    sp.signclosed_create_time signclosedCreateTime,
-    sp.signclosed_update_time signclosedUpdateTime,
-    sp.signclosed_product_type signclosedProductType,
-    sp.signclosed_product_id signclosedProductId,
-    sp.signclosed_product_color signclosedProductColor,
-    pc.color_name colorName,
-    count(1) productNum
-    from
-    tb_rst_complaint_signclosed_product sp
-    LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
-    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
-    where sp.signclosed_id = #{signclosedId}
-    GROUP BY sp.product_name,pc.color_name
-  </select>
-  <select id="listSignclosed" resultMap="complaintSignclosedInfoMap" parameterType="ComplaintSignclosedInfo" >
-    SELECT
-    cs.signclosed_id,
-    cs.signclosed_type,
-    cs.signclosed_type_name,
-    cs.signclosed_logistics,
-    cs.signclosed_logistics_number,
-    cs.signclosed_send_name,
-    cs.signclosed_send_tel,
-    cs.signclosed_addr_provinces,
-    cs.signclosed_addr_city,
-    cs.signclosed_addr_area,
-    cs.signclosed_date,
-    cs.signclosed_customer_id,
-    cs.signclosed_desc,
-    cs.signclosed_create_time,
-    cs.signclosed_update_time,
-    cs.signclosed_state,
-    cs.signclosed_customer_desc,
-    ap.province provincesName,
-    ac.city cityName,
-    qd.describe_title customerIdDescribe
-    FROM
-    tb_rst_complaint_signclosed cs
-    LEFT JOIN tb_rst_address_province ap ON cs.signclosed_addr_provinces = ap.province_id
-    LEFT JOIN tb_rst_address_city ac ON cs.signclosed_addr_city = ac.city_id
-    LEFT JOIN tb_rst_cm_question_describe qd on cs.signclosed_customer_id = qd.customer_id
-    <where>
-      <if test="signclosedSendName != null and signclosedSendName != ''" >
-        cs.signclosed_send_name = #{signclosedSendName}
-      </if>
-      <if test="signclosedSendTel != null and signclosedSendTel != ''" >
-        AND cs.signclosed_send_tel like CONCAT('%',#{signclosedSendTel},'%')
-      </if>
-      <if test="signclosedLogisticsNumber != null and signclosedLogisticsNumber != ''" >
-        AND cs.signclosed_logistics_number = #{signclosedLogisticsNumber}
-      </if>
-      <if test="signclosedType != null and signclosedType != ''" >
-        AND cs.signclosed_type = #{signclosedType}
-      </if>
-      <if test="signclosedCustomerId != null " >
-        AND cs.signclosed_customer_id = #{signclosedCustomerId}
-      </if>
-      <if test="isBinding != null and isBinding == 1" >
-        AND cs.signclosed_customer_id is NULL
-      </if>
-    </where>
-    order by cs.signclosed_create_time DESC
-  </select>
-
-  <insert id="insert" parameterType="ComplaintSignclosedInfo" useGeneratedKeys="true" keyProperty="signclosedId" >
-    insert into tb_rst_complaint_signclosed (signclosed_type, signclosed_type_name,
-      signclosed_logistics, signclosed_logistics_number,
-      signclosed_send_name, signclosed_send_tel, 
-      signclosed_addr_provinces, signclosed_addr_city, signclosed_addr_area, signclosed_date,
-      signclosed_customer_id,
-      signclosed_desc,signclosed_state,signclosed_customer_desc
-      )
-    values (#{signclosedType,jdbcType=BIT}, #{signclosedTypeName,jdbcType=VARCHAR},
-      #{signclosedLogistics,jdbcType=VARCHAR}, #{signclosedLogisticsNumber,jdbcType=VARCHAR},
-      #{signclosedSendName,jdbcType=VARCHAR}, #{signclosedSendTel,jdbcType=VARCHAR}, 
-      #{signclosedAddrProvinces,jdbcType=VARCHAR}, #{signclosedAddrCity,jdbcType=VARCHAR},#{signclosedAddrArea,jdbcType=VARCHAR},
-      #{signclosedDate,jdbcType=DATE},
-      #{signclosedCustomerId,jdbcType=INTEGER},
-      #{signclosedDesc,jdbcType=VARCHAR},
-      #{signclosedState,jdbcType=INTEGER},
-      #{signclosedCustomerDesc,jdbcType=VARCHAR}
-      )
-  </insert>
-  <update id="updateSignclosedById" parameterType="ComplaintSignclosedInfo" >
-    update tb_rst_complaint_signclosed
-    <set >
-      <if test="signclosedType != null" >
-        signclosed_type = #{signclosedType,jdbcType=BIT},
-      </if>
-      <if test="signclosedTypeName != null" >
-        signclosed_type_name = #{signclosedTypeName,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedLogistics != null" >
-        signclosed_logistics = #{signclosedLogistics,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedLogisticsNumber != null" >
-        signclosed_logistics_number = #{signclosedLogisticsNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedSendName != null" >
-        signclosed_send_name = #{signclosedSendName,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedSendTel != null" >
-        signclosed_send_tel = #{signclosedSendTel,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedAddrProvinces != null" >
-        signclosed_addr_provinces = #{signclosedAddrProvinces,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedAddrCity != null" >
-        signclosed_addr_city = #{signclosedAddrCity,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedAddrArea != null" >
-        signclosed_addr_area = #{signclosedAddrArea,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedDate != null" >
-        signclosed_date = #{signclosedDate,jdbcType=DATE},
-      </if>
-      <if test="signclosedCustomerId != null" >
-        signclosed_customer_id = #{signclosedCustomerId,jdbcType=INTEGER},
-      </if>
-      <if test="signclosedDesc != null" >
-        signclosed_desc = #{signclosedDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedCreateTime != null" >
-        signclosed_create_time = #{signclosedCreateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="signclosedUpdateTime != null" >
-        signclosed_update_time = #{signclosedUpdateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="signclosedState != null" >
-        signclosed_state = #{signclosedState,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedCustomerDesc != null" >
-        signclosed_customer_desc = #{signclosedCustomerDesc,jdbcType=VARCHAR}
-      </if>
-    </set>
-      where
-          signclosed_id = #{signclosedId,jdbcType=INTEGER}
-  </update>
-
-  <update id="updateSignclosedByCustomerId" parameterType="ComplaintSignclosedInfo" >
-    update tb_rst_complaint_signclosed
-    <set >
-      <if test="signclosedType != null" >
-        signclosed_type = #{signclosedType,jdbcType=BIT},
-      </if>
-      <if test="signclosedTypeName != null" >
-        signclosed_type_name = #{signclosedTypeName,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedLogistics != null" >
-        signclosed_logistics = #{signclosedLogistics,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedLogisticsNumber != null" >
-        signclosed_logistics_number = #{signclosedLogisticsNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedSendName != null" >
-        signclosed_send_name = #{signclosedSendName,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedSendTel != null" >
-        signclosed_send_tel = #{signclosedSendTel,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedAddrProvinces != null" >
-        signclosed_addr_provinces = #{signclosedAddrProvinces,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedAddrCity != null" >
-        signclosed_addr_city = #{signclosedAddrCity,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedAddrArea!= null" >
-        signclosed_addr_area = #{signclosedAddrArea,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedDate != null" >
-        signclosed_date = #{signclosedDate,jdbcType=DATE},
-      </if>
-      <if test="signclosedDesc != null" >
-        signclosed_desc = #{signclosedDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedState != null" >
-        signclosed_state = #{signclosedState,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedCustomerDesc != null" >
-        signclosed_customer_desc = #{signclosedCustomerDesc,jdbcType=VARCHAR}
-      </if>
-    </set>
-    where
-        signclosed_customer_id = #{signclosedCustomerId}
-  </update>
+<?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.fm.mapper.ComplaintSignclosedInfoMapper" >
+  <resultMap id="BaseResultMap" type="ComplaintSignclosedInfo" >
+    <id column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
+    <result column="signclosed_type" property="signclosedType" jdbcType="BIT" />
+    <result column="signclosed_type_name" property="signclosedTypeName" jdbcType="VARCHAR" />
+    <result column="signclosed_logistics" property="signclosedLogistics" jdbcType="VARCHAR" />
+    <result column="signclosed_logistics_number" property="signclosedLogisticsNumber" jdbcType="VARCHAR" />
+    <result column="signclosed_send_name" property="signclosedSendName" jdbcType="VARCHAR" />
+    <result column="signclosed_send_tel" property="signclosedSendTel" jdbcType="VARCHAR" />
+    <result column="signclosed_addr_provinces" property="signclosedAddrProvinces" jdbcType="VARCHAR" />
+    <result column="signclosed_addr_city" property="signclosedAddrCity" jdbcType="VARCHAR" />
+    <result column="signclosed_addr_area" property="signclosedAddrCity" jdbcType="VARCHAR" />
+    <result column="signclosed_date" property="signclosedDate" jdbcType="DATE" />
+    <result column="signclosed_customer_id" property="signclosedCustomerId" jdbcType="INTEGER" />
+    <result column="signclosed_desc" property="signclosedDesc" jdbcType="VARCHAR" />
+    <result column="signclosed_create_time" property="signclosedCreateTime" jdbcType="TIMESTAMP" />
+    <result column="signclosed_update_time" property="signclosedUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="signclosed_state" property="signclosedState" jdbcType="INTEGER" />
+    <result column="signclosed_customer_desc" property="signclosedCustomerDesc" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    signclosed_id, signclosed_type, signclosed_type_name, signclosed_logistics,
+    signclosed_logistics_number, signclosed_send_name, signclosed_send_tel, signclosed_addr_provinces, 
+    signclosed_addr_city,signclosed_addr_area, signclosed_date,signclosed_customer_id,signclosed_desc,
+    signclosed_create_time, signclosed_update_time,signclosed_state,signclosed_customer_desc
+  </sql>
+  <select id="getSignclosedById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
+    <include refid="Base_Column_List" />,
+    tb_rst_cm_question_describe.describe_handle_desc describeHandleDesc
+    from tb_rst_complaint_signclosed
+    LEFT JOIN tb_rst_cm_question_describe on tb_rst_cm_question_describe.customer_id = tb_rst_complaint_signclosed.signclosed_customer_id
+    where signclosed_id = #{signclosedId,jdbcType=INTEGER}
+  </select>
+
+  <resultMap id="complaintSignclosedInfoMap" type="ComplaintSignclosedInfo">
+    <id column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
+    <result column="signclosed_type" property="signclosedType" jdbcType="BIT" />
+    <result column="signclosed_type_name" property="signclosedTypeName" jdbcType="VARCHAR" />
+    <result column="signclosed_logistics" property="signclosedLogistics" jdbcType="VARCHAR" />
+    <result column="signclosed_logistics_number" property="signclosedLogisticsNumber" jdbcType="VARCHAR" />
+    <result column="signclosed_send_name" property="signclosedSendName" jdbcType="VARCHAR" />
+    <result column="signclosed_send_tel" property="signclosedSendTel" jdbcType="VARCHAR" />
+    <result column="signclosed_addr_provinces" property="signclosedAddrProvinces" jdbcType="VARCHAR" />
+    <result column="signclosed_addr_city" property="signclosedAddrCity" jdbcType="VARCHAR" />
+    <result column="signclosed_addr_area" property="signclosedAddrArea" jdbcType="VARCHAR" />
+    <result column="signclosed_date" property="signclosedDate" jdbcType="DATE" />
+    <result column="signclosed_customer_id" property="signclosedCustomerId" jdbcType="INTEGER" />
+    <result column="signclosed_desc" property="signclosedDesc" jdbcType="VARCHAR" />
+    <result column="signclosed_create_time" property="signclosedCreateTime" jdbcType="TIMESTAMP" />
+    <result column="signclosed_update_time" property="signclosedUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="signclosed_state" property="signclosedState" jdbcType="INTEGER" />
+    <result column="signclosed_customer_desc" property="signclosedCustomerDesc" jdbcType="VARCHAR" />
+    <result column="signclosed_customer_desc" property="signclosedCustomerDesc" jdbcType="VARCHAR" />
+    <result column="signclosed_customer_desc" property="signclosedCustomerDesc" jdbcType="VARCHAR" />
+    <collection property="signclosedProductInfoList" column="signclosed_id" ofType="SignclosedProductInfo" select="listSignclosedById"/>
+  </resultMap>
+  <select id="listAwaitingSignclosedById" resultType="AwaitingSignclosedProductInfo" parameterType="Integer" >
+    select
+    sp.product_id productId,
+    sp.signclosed_id signclosedId,
+    sp.product_name productName,
+    sp.signclosed_create_time signclosedCreateTime,
+    sp.signclosed_update_time signclosedUpdateTime,
+    sp.signclosed_product_type signclosedProductType,
+    sp.signclosed_product_id signclosedProductId,
+    sp.signclosed_product_color signclosedProductColor,
+    pc.color_name colorName,
+    pi.product_number productNumber,
+    count(1) productNum
+    from
+    tb_rst_complaint_awaiting_signclosed_product sp
+    LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
+    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
+    where sp.signclosed_id = #{signclosedId}
+    GROUP BY sp.product_name,pc.color_name
+  </select>
+
+  <select id="listSignclosedById" resultType="SignclosedProductInfo" parameterType="Integer" >
+    select
+    sp.product_id productId,
+    sp.signclosed_id signclosedId,
+    sp.product_name productName,
+    sp.signclosed_create_time signclosedCreateTime,
+    sp.signclosed_update_time signclosedUpdateTime,
+    sp.signclosed_product_type signclosedProductType,
+    sp.signclosed_product_id signclosedProductId,
+    sp.signclosed_product_color signclosedProductColor,
+    pc.color_name colorName,
+    count(1) productNum
+    from
+    tb_rst_complaint_signclosed_product sp
+    LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
+    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
+    where sp.signclosed_id = #{signclosedId}
+    GROUP BY sp.product_name,pc.color_name
+  </select>
+  <select id="listSignclosed" resultMap="complaintSignclosedInfoMap" parameterType="ComplaintSignclosedInfo" >
+    SELECT
+    cs.signclosed_id,
+    cs.signclosed_type,
+    cs.signclosed_type_name,
+    cs.signclosed_logistics,
+    cs.signclosed_logistics_number,
+    cs.signclosed_send_name,
+    cs.signclosed_send_tel,
+    cs.signclosed_addr_provinces,
+    cs.signclosed_addr_city,
+    cs.signclosed_addr_area,
+    cs.signclosed_date,
+    cs.signclosed_customer_id,
+    cs.signclosed_desc,
+    cs.signclosed_create_time,
+    cs.signclosed_update_time,
+    cs.signclosed_state,
+    cs.signclosed_customer_desc,
+    ap.province provincesName,
+    ac.city cityName,
+    qd.describe_title customerIdDescribe
+    FROM
+    tb_rst_complaint_signclosed cs
+    LEFT JOIN tb_rst_address_province ap ON cs.signclosed_addr_provinces = ap.province_id
+    LEFT JOIN tb_rst_address_city ac ON cs.signclosed_addr_city = ac.city_id
+    LEFT JOIN tb_rst_cm_question_describe qd on cs.signclosed_customer_id = qd.customer_id
+    <where>
+      <if test="signclosedSendName != null and signclosedSendName != ''" >
+        cs.signclosed_send_name = #{signclosedSendName}
+      </if>
+      <if test="signclosedSendTel != null and signclosedSendTel != ''" >
+        AND cs.signclosed_send_tel like CONCAT('%',#{signclosedSendTel},'%')
+      </if>
+      <if test="signclosedLogisticsNumber != null and signclosedLogisticsNumber != ''" >
+        AND cs.signclosed_logistics_number = #{signclosedLogisticsNumber}
+      </if>
+      <if test="signclosedType != null and signclosedType != ''" >
+        AND cs.signclosed_type = #{signclosedType}
+      </if>
+      <if test="signclosedCustomerId != null " >
+        AND cs.signclosed_customer_id = #{signclosedCustomerId}
+      </if>
+      <if test="isBinding != null and isBinding == 1" >
+        AND cs.signclosed_customer_id is NULL
+      </if>
+    </where>
+    order by cs.signclosed_create_time DESC
+  </select>
+
+  <insert id="insert" parameterType="ComplaintSignclosedInfo" useGeneratedKeys="true" keyProperty="signclosedId" >
+    insert into tb_rst_complaint_signclosed (signclosed_type, signclosed_type_name,
+      signclosed_logistics, signclosed_logistics_number,
+      signclosed_send_name, signclosed_send_tel, 
+      signclosed_addr_provinces, signclosed_addr_city, signclosed_addr_area, signclosed_date,
+      signclosed_customer_id,
+      signclosed_desc,signclosed_state,signclosed_customer_desc
+      )
+    values (#{signclosedType,jdbcType=BIT}, #{signclosedTypeName,jdbcType=VARCHAR},
+      #{signclosedLogistics,jdbcType=VARCHAR}, #{signclosedLogisticsNumber,jdbcType=VARCHAR},
+      #{signclosedSendName,jdbcType=VARCHAR}, #{signclosedSendTel,jdbcType=VARCHAR}, 
+      #{signclosedAddrProvinces,jdbcType=VARCHAR}, #{signclosedAddrCity,jdbcType=VARCHAR},#{signclosedAddrArea,jdbcType=VARCHAR},
+      #{signclosedDate,jdbcType=DATE},
+      #{signclosedCustomerId,jdbcType=INTEGER},
+      #{signclosedDesc,jdbcType=VARCHAR},
+      #{signclosedState,jdbcType=INTEGER},
+      #{signclosedCustomerDesc,jdbcType=VARCHAR}
+      )
+  </insert>
+  <update id="updateSignclosedById" parameterType="ComplaintSignclosedInfo" >
+    update tb_rst_complaint_signclosed
+    <set >
+      <if test="signclosedType != null" >
+        signclosed_type = #{signclosedType,jdbcType=BIT},
+      </if>
+      <if test="signclosedTypeName != null" >
+        signclosed_type_name = #{signclosedTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedLogistics != null" >
+        signclosed_logistics = #{signclosedLogistics,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedLogisticsNumber != null" >
+        signclosed_logistics_number = #{signclosedLogisticsNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedSendName != null" >
+        signclosed_send_name = #{signclosedSendName,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedSendTel != null" >
+        signclosed_send_tel = #{signclosedSendTel,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedAddrProvinces != null" >
+        signclosed_addr_provinces = #{signclosedAddrProvinces,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedAddrCity != null" >
+        signclosed_addr_city = #{signclosedAddrCity,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedAddrArea != null" >
+        signclosed_addr_area = #{signclosedAddrArea,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedDate != null" >
+        signclosed_date = #{signclosedDate,jdbcType=DATE},
+      </if>
+      <if test="signclosedCustomerId != null" >
+        signclosed_customer_id = #{signclosedCustomerId,jdbcType=INTEGER},
+      </if>
+      <if test="signclosedDesc != null" >
+        signclosed_desc = #{signclosedDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedCreateTime != null" >
+        signclosed_create_time = #{signclosedCreateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="signclosedUpdateTime != null" >
+        signclosed_update_time = #{signclosedUpdateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="signclosedState != null" >
+        signclosed_state = #{signclosedState,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedCustomerDesc != null" >
+        signclosed_customer_desc = #{signclosedCustomerDesc,jdbcType=VARCHAR}
+      </if>
+    </set>
+      where
+          signclosed_id = #{signclosedId,jdbcType=INTEGER}
+  </update>
+
+  <update id="updateSignclosedByCustomerId" parameterType="ComplaintSignclosedInfo" >
+    update tb_rst_complaint_signclosed
+    <set >
+      <if test="signclosedType != null" >
+        signclosed_type = #{signclosedType,jdbcType=BIT},
+      </if>
+      <if test="signclosedTypeName != null" >
+        signclosed_type_name = #{signclosedTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedLogistics != null" >
+        signclosed_logistics = #{signclosedLogistics,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedLogisticsNumber != null" >
+        signclosed_logistics_number = #{signclosedLogisticsNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedSendName != null" >
+        signclosed_send_name = #{signclosedSendName,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedSendTel != null" >
+        signclosed_send_tel = #{signclosedSendTel,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedAddrProvinces != null" >
+        signclosed_addr_provinces = #{signclosedAddrProvinces,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedAddrCity != null" >
+        signclosed_addr_city = #{signclosedAddrCity,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedAddrArea!= null" >
+        signclosed_addr_area = #{signclosedAddrArea,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedDate != null" >
+        signclosed_date = #{signclosedDate,jdbcType=DATE},
+      </if>
+      <if test="signclosedDesc != null" >
+        signclosed_desc = #{signclosedDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedState != null" >
+        signclosed_state = #{signclosedState,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedCustomerDesc != null" >
+        signclosed_customer_desc = #{signclosedCustomerDesc,jdbcType=VARCHAR}
+      </if>
+    </set>
+    where
+        signclosed_customer_id = #{signclosedCustomerId}
+  </update>
 </mapper>

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

@@ -1,119 +1,119 @@
-<?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.fm.mapper.ComplaintSignclosedProductInfoMapper" >
-  <resultMap id="BaseResultMap" type="SignclosedProductInfo" >
-    <id column="product_id" property="productId" jdbcType="INTEGER" />
-    <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
-    <result column="product_name" property="productName" jdbcType="VARCHAR" />
-    <result column="product_num" property="productNum" jdbcType="INTEGER" />
-    <result column="signclosed_create_time" property="signclosedCreateTime" jdbcType="TIMESTAMP" />
-    <result column="signclosed_update_time" property="signclosedUpdateTime" jdbcType="TIMESTAMP" />
-    <result column="signclosed_product_type" property="signclosedProductType" jdbcType="INTEGER" />
-    <result column="signclosed_product_id" property="signclosedProductId" jdbcType="INTEGER" />
-    <result column="signclosed_product_color" property="signclosedProductColor" jdbcType="INTEGER" />
-    <result column="machine_no" property="machineNo" jdbcType="VARCHAR" />
-
-  </resultMap>
-  <sql id="Base_Column_List" >
-    product_id, signclosed_id, product_name, product_num, signclosed_create_time,
-    signclosed_update_time,signclosed_product_type,signclosed_product_id,signclosed_product_color,machine_no
-  </sql>
-  <select id="getSignclosedById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from tb_rst_complaint_signclosed_product
-    where product_id = #{productId,jdbcType=INTEGER}
-  </select>
-  <select id="listSignclosedById" resultMap="BaseResultMap" parameterType="SignclosedProductInfo" >
-    select
-    sp.product_id productId,
-	sp.signclosed_id signclosedId,
-	sp.product_name productName,
-	sp.product_num productNum,
-	sp.signclosed_create_time signclosedCreateTime,
-	sp.signclosed_update_time signclosedUpdateTime,
-	sp.signclosed_product_type signclosedProductType,
-	sp.signclosed_product_id signclosedProductId,
-	sp.signclosed_product_color signclosedProductColor,
-	sp.machine_no machineNo,
-    pc.color_name colorName,
-    pi.product_number productNumber
-    from
-    tb_rst_complaint_signclosed_product sp
-    LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
-    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
-    where signclosed_id = #{signclosedId,jdbcType=INTEGER}
-  </select>
-
-  <insert id="insert" parameterType="SignclosedProductInfo" >
-    insert into tb_rst_complaint_signclosed_product (product_id, signclosed_id, product_name, 
-      product_num, signclosed_create_time, signclosed_update_time,signclosed_product_type,signclosed_product_id,
-      signclosed_product_color,machine_no
-      )
-    values (#{productId,jdbcType=INTEGER}, #{signclosedId,jdbcType=INTEGER}, #{productName,jdbcType=VARCHAR}, 
-      #{productNum,jdbcType=INTEGER}, #{signclosedCreateTime,jdbcType=TIMESTAMP}, #{signclosedUpdateTime,jdbcType=TIMESTAMP}
-      ,#{signclosedProductType,jdbcType=INTEGER}, #{signclosedProductId,jdbcType=INTEGER},
-       #{signclosedProductColor,jdbcType=INTEGER},#{machineNo,jdbcType=VARCHAR}
-      )
-  </insert>
-
-  <insert id="insertList" parameterType="SignclosedProductInfo" >
-    insert into tb_rst_complaint_awaiting_signclosed_product
-      (
-          signclosed_id, product_name,product_num,signclosed_product_type,signclosed_product_id,signclosed_product_color
-      )
-    values
-    <foreach collection="list" item="node" index="index" separator="," open="" close="">
-      (
-        #{node.signclosedId}, #{node.productName},#{node.productNum},#{node.signclosedProductType}, #{node.signclosedProductId}, #{node.signclosedProductColor}
-      )
-    </foreach>
-  </insert>
-
-  <update id="updateSignclosedById" parameterType="SignclosedProductInfo" >
-    update tb_rst_complaint_signclosed_product
-    <set >
-      <if test="signclosedId != null" >
-        signclosed_id = #{signclosedId,jdbcType=INTEGER},
-      </if>
-      <if test="productName != null" >
-        product_name = #{productName,jdbcType=VARCHAR},
-      </if>
-      <if test="productNum != null" >
-        product_num = #{productNum,jdbcType=INTEGER},
-      </if>
-      <if test="machineNo != null" >
-        machine_no = #{machineNo,jdbcType=VARCHAR},
-      </if>
-      <if test="signclosedCreateTime != null" >
-        signclosed_create_time = #{signclosedCreateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="signclosedUpdateTime != null" >
-        signclosed_update_time = #{signclosedUpdateTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where product_id = #{productId,jdbcType=INTEGER}
-  </update>
-
-  <select id="listSignclosedProductInfoById" resultType="SignclosedProductInfo" parameterType="Integer" >
-    select
-    sp.product_id productId,
-    sp.signclosed_id signclosedId,
-    sp.product_name productName,
-    sp.product_num productNum,
-    sp.signclosed_create_time signclosedCreateTime,
-    sp.signclosed_update_time signclosedUpdateTime,
-    sp.signclosed_product_type signclosedProductType,
-    sp.signclosed_product_id signclosedProductId,
-    sp.signclosed_product_color signclosedProductColor,
-    sp.machine_no machineNo,
-    pc.color_name colorName,
-    pi.product_number productNumber
-    from
-    tb_rst_complaint_signclosed_product sp
-    LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
-    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
-    where product_id = #{productId,jdbcType=INTEGER}
-  </select>
-
+<?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.fm.mapper.ComplaintSignclosedProductInfoMapper" >
+  <resultMap id="BaseResultMap" type="SignclosedProductInfo" >
+    <id column="product_id" property="productId" jdbcType="INTEGER" />
+    <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
+    <result column="product_name" property="productName" jdbcType="VARCHAR" />
+    <result column="product_num" property="productNum" jdbcType="INTEGER" />
+    <result column="signclosed_create_time" property="signclosedCreateTime" jdbcType="TIMESTAMP" />
+    <result column="signclosed_update_time" property="signclosedUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="signclosed_product_type" property="signclosedProductType" jdbcType="INTEGER" />
+    <result column="signclosed_product_id" property="signclosedProductId" jdbcType="INTEGER" />
+    <result column="signclosed_product_color" property="signclosedProductColor" jdbcType="INTEGER" />
+    <result column="machine_no" property="machineNo" jdbcType="VARCHAR" />
+
+  </resultMap>
+  <sql id="Base_Column_List" >
+    product_id, signclosed_id, product_name, product_num, signclosed_create_time,
+    signclosed_update_time,signclosed_product_type,signclosed_product_id,signclosed_product_color,machine_no
+  </sql>
+  <select id="getSignclosedById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tb_rst_complaint_signclosed_product
+    where product_id = #{productId,jdbcType=INTEGER}
+  </select>
+  <select id="listSignclosedById" resultMap="BaseResultMap" parameterType="SignclosedProductInfo" >
+    select
+    sp.product_id productId,
+	sp.signclosed_id signclosedId,
+	sp.product_name productName,
+	sp.product_num productNum,
+	sp.signclosed_create_time signclosedCreateTime,
+	sp.signclosed_update_time signclosedUpdateTime,
+	sp.signclosed_product_type signclosedProductType,
+	sp.signclosed_product_id signclosedProductId,
+	sp.signclosed_product_color signclosedProductColor,
+	sp.machine_no machineNo,
+    pc.color_name colorName,
+    pi.product_number productNumber
+    from
+    tb_rst_complaint_signclosed_product sp
+    LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
+    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
+    where signclosed_id = #{signclosedId,jdbcType=INTEGER}
+  </select>
+
+  <insert id="insert" parameterType="SignclosedProductInfo" >
+    insert into tb_rst_complaint_signclosed_product (product_id, signclosed_id, product_name, 
+      product_num, signclosed_create_time, signclosed_update_time,signclosed_product_type,signclosed_product_id,
+      signclosed_product_color,machine_no
+      )
+    values (#{productId,jdbcType=INTEGER}, #{signclosedId,jdbcType=INTEGER}, #{productName,jdbcType=VARCHAR}, 
+      #{productNum,jdbcType=INTEGER}, #{signclosedCreateTime,jdbcType=TIMESTAMP}, #{signclosedUpdateTime,jdbcType=TIMESTAMP}
+      ,#{signclosedProductType,jdbcType=INTEGER}, #{signclosedProductId,jdbcType=INTEGER},
+       #{signclosedProductColor,jdbcType=INTEGER},#{machineNo,jdbcType=VARCHAR}
+      )
+  </insert>
+
+  <insert id="insertList" parameterType="SignclosedProductInfo" >
+    insert into tb_rst_complaint_awaiting_signclosed_product
+      (
+          signclosed_id, product_name,product_num,signclosed_product_type,signclosed_product_id,signclosed_product_color
+      )
+    values
+    <foreach collection="list" item="node" index="index" separator="," open="" close="">
+      (
+        #{node.signclosedId}, #{node.productName},#{node.productNum},#{node.signclosedProductType}, #{node.signclosedProductId}, #{node.signclosedProductColor}
+      )
+    </foreach>
+  </insert>
+
+  <update id="updateSignclosedById" parameterType="SignclosedProductInfo" >
+    update tb_rst_complaint_signclosed_product
+    <set >
+      <if test="signclosedId != null" >
+        signclosed_id = #{signclosedId,jdbcType=INTEGER},
+      </if>
+      <if test="productName != null" >
+        product_name = #{productName,jdbcType=VARCHAR},
+      </if>
+      <if test="productNum != null" >
+        product_num = #{productNum,jdbcType=INTEGER},
+      </if>
+      <if test="machineNo != null" >
+        machine_no = #{machineNo,jdbcType=VARCHAR},
+      </if>
+      <if test="signclosedCreateTime != null" >
+        signclosed_create_time = #{signclosedCreateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="signclosedUpdateTime != null" >
+        signclosed_update_time = #{signclosedUpdateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where product_id = #{productId,jdbcType=INTEGER}
+  </update>
+
+  <select id="listSignclosedProductInfoById" resultType="SignclosedProductInfo" parameterType="Integer" >
+    select
+    sp.product_id productId,
+    sp.signclosed_id signclosedId,
+    sp.product_name productName,
+    sp.product_num productNum,
+    sp.signclosed_create_time signclosedCreateTime,
+    sp.signclosed_update_time signclosedUpdateTime,
+    sp.signclosed_product_type signclosedProductType,
+    sp.signclosed_product_id signclosedProductId,
+    sp.signclosed_product_color signclosedProductColor,
+    sp.machine_no machineNo,
+    pc.color_name colorName,
+    pi.product_number productNumber
+    from
+    tb_rst_complaint_signclosed_product sp
+    LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
+    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
+    where product_id = #{productId,jdbcType=INTEGER}
+  </select>
+
 </mapper>

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

@@ -1,75 +1,75 @@
-<?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.fm.mapper.ComplaintSmallClassInfoMapper" >
-  <resultMap id="BaseResultMap" type="ComplaintSmallClassInfo" >
-    <id column="small_class_id" property="smallClassId" jdbcType="INTEGER" />
-    <result column="complaint_id" property="complaintId" jdbcType="INTEGER" />
-    <result column="small_class_name" property="smallClassName" jdbcType="VARCHAR" />
-    <result column="small_class_profile" property="smallClassProfile" jdbcType="VARCHAR" />
-    <result column="small_class_state" property="smallClassState" jdbcType="BIT" />
-    <result column="small_question_num" property="smallQuestionNum" jdbcType="SMALLINT" />
-    <result column="small_class_create_time" property="smallClassCreateTime" jdbcType="TIMESTAMP" />
-    <result column="small_class_update_time" property="smallClassUpdateTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    small_class_id, complaint_id, small_class_name, small_class_profile, small_class_state, 
-    small_question_num, small_class_create_time, small_class_update_time
-  </sql>
-  <select id="getSmallClassById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from tb_rst_cm_complaint_small_class
-    where small_class_id = #{smallClassId,jdbcType=INTEGER}
-  </select>
-
-  <select id="listComplaintSmallClassInfo" resultMap="BaseResultMap" parameterType="ComplaintSmallClassInfo" >
-    select
-    <include refid="Base_Column_List" />
-    from tb_rst_cm_complaint_small_class
-    <where>
-      <if test="complaintId !=null">
-        AND complaint_id = #{complaintId}
-      </if>
-      AND small_class_state = 1
-    </where>
-  </select>
-
-  <insert id="insert" parameterType="ComplaintSmallClassInfo" >
-    insert into tb_rst_cm_complaint_small_class (small_class_id, complaint_id, small_class_name,
-      small_class_profile, small_class_state, small_question_num, 
-      small_class_create_time, small_class_update_time
-      )
-    values (#{smallClassId,jdbcType=INTEGER}, #{complaintId,jdbcType=INTEGER}, #{smallClassName,jdbcType=VARCHAR}, 
-      #{smallClassProfile,jdbcType=VARCHAR}, #{smallClassState,jdbcType=BIT}, #{smallQuestionNum,jdbcType=SMALLINT}, 
-      #{smallClassCreateTime,jdbcType=TIMESTAMP}, #{smallClassUpdateTime,jdbcType=TIMESTAMP}
-      )
-  </insert>
-
-  <update id="updateSmallClassById" parameterType="ComplaintSmallClassInfo" >
-    update tb_rst_cm_complaint_small_class
-    <set >
-      <if test="complaintId != null" >
-        complaint_id = #{complaintId,jdbcType=INTEGER},
-      </if>
-      <if test="smallClassName != null" >
-        small_class_name = #{smallClassName,jdbcType=VARCHAR},
-      </if>
-      <if test="smallClassProfile != null" >
-        small_class_profile = #{smallClassProfile,jdbcType=VARCHAR},
-      </if>
-      <if test="smallClassState != null" >
-        small_class_state = #{smallClassState,jdbcType=BIT},
-      </if>
-      <if test="smallQuestionNum != null" >
-        small_question_num = #{smallQuestionNum,jdbcType=SMALLINT},
-      </if>
-      <if test="smallClassCreateTime != null" >
-        small_class_create_time = #{smallClassCreateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="smallClassUpdateTime != null" >
-        small_class_update_time = #{smallClassUpdateTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where small_class_id = #{smallClassId,jdbcType=INTEGER}
-  </update>
+<?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.fm.mapper.ComplaintSmallClassInfoMapper" >
+  <resultMap id="BaseResultMap" type="ComplaintSmallClassInfo" >
+    <id column="small_class_id" property="smallClassId" jdbcType="INTEGER" />
+    <result column="complaint_id" property="complaintId" jdbcType="INTEGER" />
+    <result column="small_class_name" property="smallClassName" jdbcType="VARCHAR" />
+    <result column="small_class_profile" property="smallClassProfile" jdbcType="VARCHAR" />
+    <result column="small_class_state" property="smallClassState" jdbcType="BIT" />
+    <result column="small_question_num" property="smallQuestionNum" jdbcType="SMALLINT" />
+    <result column="small_class_create_time" property="smallClassCreateTime" jdbcType="TIMESTAMP" />
+    <result column="small_class_update_time" property="smallClassUpdateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    small_class_id, complaint_id, small_class_name, small_class_profile, small_class_state, 
+    small_question_num, small_class_create_time, small_class_update_time
+  </sql>
+  <select id="getSmallClassById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tb_rst_cm_complaint_small_class
+    where small_class_id = #{smallClassId,jdbcType=INTEGER}
+  </select>
+
+  <select id="listComplaintSmallClassInfo" resultMap="BaseResultMap" parameterType="ComplaintSmallClassInfo" >
+    select
+    <include refid="Base_Column_List" />
+    from tb_rst_cm_complaint_small_class
+    <where>
+      <if test="complaintId !=null">
+        AND complaint_id = #{complaintId}
+      </if>
+      AND small_class_state = 1
+    </where>
+  </select>
+
+  <insert id="insert" parameterType="ComplaintSmallClassInfo" >
+    insert into tb_rst_cm_complaint_small_class (small_class_id, complaint_id, small_class_name,
+      small_class_profile, small_class_state, small_question_num, 
+      small_class_create_time, small_class_update_time
+      )
+    values (#{smallClassId,jdbcType=INTEGER}, #{complaintId,jdbcType=INTEGER}, #{smallClassName,jdbcType=VARCHAR}, 
+      #{smallClassProfile,jdbcType=VARCHAR}, #{smallClassState,jdbcType=BIT}, #{smallQuestionNum,jdbcType=SMALLINT}, 
+      #{smallClassCreateTime,jdbcType=TIMESTAMP}, #{smallClassUpdateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+
+  <update id="updateSmallClassById" parameterType="ComplaintSmallClassInfo" >
+    update tb_rst_cm_complaint_small_class
+    <set >
+      <if test="complaintId != null" >
+        complaint_id = #{complaintId,jdbcType=INTEGER},
+      </if>
+      <if test="smallClassName != null" >
+        small_class_name = #{smallClassName,jdbcType=VARCHAR},
+      </if>
+      <if test="smallClassProfile != null" >
+        small_class_profile = #{smallClassProfile,jdbcType=VARCHAR},
+      </if>
+      <if test="smallClassState != null" >
+        small_class_state = #{smallClassState,jdbcType=BIT},
+      </if>
+      <if test="smallQuestionNum != null" >
+        small_question_num = #{smallQuestionNum,jdbcType=SMALLINT},
+      </if>
+      <if test="smallClassCreateTime != null" >
+        small_class_create_time = #{smallClassCreateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="smallClassUpdateTime != null" >
+        small_class_update_time = #{smallClassUpdateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where small_class_id = #{smallClassId,jdbcType=INTEGER}
+  </update>
 </mapper>

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

@@ -1,138 +1,138 @@
-<?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.fm.mapper.InventoryLogMapper" >
-  <resultMap id="BaseResultMap" type="InventoryLog" >
-    <id column="log_id" property="logId" jdbcType="INTEGER" />
-    <result column="log_product_name" property="logProductName" jdbcType="VARCHAR" />
-    <result column="log_product_bar" property="logProductBar" jdbcType="VARCHAR" />
-    <result column="log_warehouse_id" property="logWarehouseId" jdbcType="INTEGER" />
-    <result column="log_remaining_num" property="logRemainingNum" jdbcType="INTEGER" />
-    <result column="log_type" property="logType" jdbcType="INTEGER" />
-    <result column="log_operation_type" property="logOperationType" jdbcType="INTEGER" />
-    <result column="log_desc" property="logDesc" jdbcType="VARCHAR" />
-    <result column="log_create_time" property="logCreateTime" jdbcType="TIMESTAMP" />
-    <result column="log_update_time" property="logUpdateTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    logId,
-    logProductName,
-    logProductBar,
-    logSarehouseId,
-    logRemainingNum,
-    logType,
-    logOperationType,
-    logDesc,
-    logCreateTime,
-    logUpdateTime
-  </sql>
-  <select id="getByInventoryLogId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from tb_rst_fm_inventory_log
-    where log_id = #{logId,jdbcType=INTEGER}
-  </select>
-  <select id="listByInventoryLogId" resultMap="BaseResultMap" parameterType="InventoryLog" >
-    select
-    log_id as logId,
-    log_product_name as logProductName,
-    log_product_bar as logProductBar,
-    log_warehouse_id as logWarehouseId,
-    log_remaining_num as logRemainingNum,
-    log_type as logType,
-    log_operation_type as logOperationType,
-    log_desc as logDesc,
-    log_create_time as logCreateTime,
-    log_update_time as logUpdateTime,
-    warehouse_name as logWarehouseName
-    from
-    tb_rst_fm_inventory_log il
-    LEFT JOIN tb_rst_warehouse_info wi
-    on il.log_warehouse_id = wi.warehouse_id
-    <where>
-      <if test="logId != null and logId != ''">
-        il.log_id = #{logId}
-      </if>
-      <if test="logProductName != null and logProductName != ''">
-        and il.log_product_name like CONCAT('%',#{logProductName},'%')
-      </if>
-      <if test="logProductBar != null and logProductBar != ''">
-        and il.log_product_bar = #{logProductBar}
-      </if>
-      <if test="logWarehouseId != null and logWarehouseId != ''">
-        and il.log_warehouse_id = #{logWarehouseId}
-      </if>
-      <if test="logType != null and logType != ''">
-        and il.log_type = #{logType}
-      </if>
-      <if test="logOperationType != null and logOperationType != ''">
-        and il.log_operation_type = #{logOperationType}
-      </if>
-      <if test="logWarehouseId != null and logWarehouseId != ''">
-        and il.log_warehouse_id = #{logWarehouseId}
-      </if>
-    </where>
-  </select>
-
-  <update id="updateById" parameterType="InventoryLog" >
-    update tb_rst_fm_inventory_log
-    <set >
-      <if test="logProductName != null and logProductName != ''" >
-        log_product_name = #{logProductName,jdbcType=VARCHAR},
-      </if>
-      <if test="logProductBar != null and logProductBar != ''" >
-        log_product_bar = #{logProductBar,jdbcType=VARCHAR},
-      </if>
-      <if test="logWarehouseId != null and logWarehouseId != ''" >
-        log_warehouse_id = #{logWarehouseId},
-      </if>
-      <if test="logRemainingNum != null and logRemainingNum != ''" >
-        log_remaining_num = #{logRemainingNum,jdbcType=INTEGER},
-      </if>
-      <if test="logType != null and logType != ''" >
-        log_type = #{logType,jdbcType=INTEGER},
-      </if>
-      <if test="logOperationType != null and logOperationType != ''" >
-        log_operation_type = #{logOperationType,jdbcType=INTEGER},
-      </if>
-      <if test="logDesc != null and logDesc != ''" >
-        log_desc = #{logDesc,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where logId = #{logId,jdbcType=INTEGER}
-  </update>
-
-  <insert id="insert" parameterType="ComplaintDetectInfo"  useGeneratedKeys="true" keyProperty="detectId" >
-    insert into tb_rst_fm_inventory_log (
-    log_product_name,
-    log_product_bar,
-    log_warehouse_id,
-    log_remaining_num,
-    log_type,
-    log_operation_type,
-    log_desc,
-    log_create_time,
-    log_update_time
-    )
-    values (
-    #{logProductName,jdbcType=VARCHAR},
-    #{logProductBar,jdbcType=VARCHAR},
-    #{logWarehouseId,jdbcType=INTEGER},
-    #{logRemainingNum,jdbcType=INTEGER},
-    #{logType,jdbcType=INTEGER},
-    #{logOperationType,jdbcType=INTEGER},
-    #{logDesc,jdbcType=VARCHAR},
-    #{logCreateTime,jdbcType=TIMESTAMP},
-    #{logUpdateTime,jdbcType=TIMESTAMP}
-    )
-  </insert>
-
-  <select id="listWarehouseInfo" resultType="WarehouseInfo" >
-    select
-      warehouse_id as warehouseId,
-      factory_id as factoryId,
-      warehouse_name as warehouseName,
-      warehouse_desc as warehouseDesc,
-      warehouse_create_date as warehouseCreateDate
-    from tb_rst_warehouse_info
-  </select>
+<?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.fm.mapper.InventoryLogMapper" >
+  <resultMap id="BaseResultMap" type="InventoryLog" >
+    <id column="log_id" property="logId" jdbcType="INTEGER" />
+    <result column="log_product_name" property="logProductName" jdbcType="VARCHAR" />
+    <result column="log_product_bar" property="logProductBar" jdbcType="VARCHAR" />
+    <result column="log_warehouse_id" property="logWarehouseId" jdbcType="INTEGER" />
+    <result column="log_remaining_num" property="logRemainingNum" jdbcType="INTEGER" />
+    <result column="log_type" property="logType" jdbcType="INTEGER" />
+    <result column="log_operation_type" property="logOperationType" jdbcType="INTEGER" />
+    <result column="log_desc" property="logDesc" jdbcType="VARCHAR" />
+    <result column="log_create_time" property="logCreateTime" jdbcType="TIMESTAMP" />
+    <result column="log_update_time" property="logUpdateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    logId,
+    logProductName,
+    logProductBar,
+    logSarehouseId,
+    logRemainingNum,
+    logType,
+    logOperationType,
+    logDesc,
+    logCreateTime,
+    logUpdateTime
+  </sql>
+  <select id="getByInventoryLogId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tb_rst_fm_inventory_log
+    where log_id = #{logId,jdbcType=INTEGER}
+  </select>
+  <select id="listByInventoryLogId" resultMap="BaseResultMap" parameterType="InventoryLog" >
+    select
+    log_id as logId,
+    log_product_name as logProductName,
+    log_product_bar as logProductBar,
+    log_warehouse_id as logWarehouseId,
+    log_remaining_num as logRemainingNum,
+    log_type as logType,
+    log_operation_type as logOperationType,
+    log_desc as logDesc,
+    log_create_time as logCreateTime,
+    log_update_time as logUpdateTime,
+    warehouse_name as logWarehouseName
+    from
+    tb_rst_fm_inventory_log il
+    LEFT JOIN tb_rst_warehouse_info wi
+    on il.log_warehouse_id = wi.warehouse_id
+    <where>
+      <if test="logId != null and logId != ''">
+        il.log_id = #{logId}
+      </if>
+      <if test="logProductName != null and logProductName != ''">
+        and il.log_product_name like CONCAT('%',#{logProductName},'%')
+      </if>
+      <if test="logProductBar != null and logProductBar != ''">
+        and il.log_product_bar = #{logProductBar}
+      </if>
+      <if test="logWarehouseId != null and logWarehouseId != ''">
+        and il.log_warehouse_id = #{logWarehouseId}
+      </if>
+      <if test="logType != null and logType != ''">
+        and il.log_type = #{logType}
+      </if>
+      <if test="logOperationType != null and logOperationType != ''">
+        and il.log_operation_type = #{logOperationType}
+      </if>
+      <if test="logWarehouseId != null and logWarehouseId != ''">
+        and il.log_warehouse_id = #{logWarehouseId}
+      </if>
+    </where>
+  </select>
+
+  <update id="updateById" parameterType="InventoryLog" >
+    update tb_rst_fm_inventory_log
+    <set >
+      <if test="logProductName != null and logProductName != ''" >
+        log_product_name = #{logProductName,jdbcType=VARCHAR},
+      </if>
+      <if test="logProductBar != null and logProductBar != ''" >
+        log_product_bar = #{logProductBar,jdbcType=VARCHAR},
+      </if>
+      <if test="logWarehouseId != null and logWarehouseId != ''" >
+        log_warehouse_id = #{logWarehouseId},
+      </if>
+      <if test="logRemainingNum != null and logRemainingNum != ''" >
+        log_remaining_num = #{logRemainingNum,jdbcType=INTEGER},
+      </if>
+      <if test="logType != null and logType != ''" >
+        log_type = #{logType,jdbcType=INTEGER},
+      </if>
+      <if test="logOperationType != null and logOperationType != ''" >
+        log_operation_type = #{logOperationType,jdbcType=INTEGER},
+      </if>
+      <if test="logDesc != null and logDesc != ''" >
+        log_desc = #{logDesc,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where logId = #{logId,jdbcType=INTEGER}
+  </update>
+
+  <insert id="insert" parameterType="ComplaintDetectInfo"  useGeneratedKeys="true" keyProperty="detectId" >
+    insert into tb_rst_fm_inventory_log (
+    log_product_name,
+    log_product_bar,
+    log_warehouse_id,
+    log_remaining_num,
+    log_type,
+    log_operation_type,
+    log_desc,
+    log_create_time,
+    log_update_time
+    )
+    values (
+    #{logProductName,jdbcType=VARCHAR},
+    #{logProductBar,jdbcType=VARCHAR},
+    #{logWarehouseId,jdbcType=INTEGER},
+    #{logRemainingNum,jdbcType=INTEGER},
+    #{logType,jdbcType=INTEGER},
+    #{logOperationType,jdbcType=INTEGER},
+    #{logDesc,jdbcType=VARCHAR},
+    #{logCreateTime,jdbcType=TIMESTAMP},
+    #{logUpdateTime,jdbcType=TIMESTAMP}
+    )
+  </insert>
+
+  <select id="listWarehouseInfo" resultType="WarehouseInfo" >
+    select
+      warehouse_id as warehouseId,
+      factory_id as factoryId,
+      warehouse_name as warehouseName,
+      warehouse_desc as warehouseDesc,
+      warehouse_create_date as warehouseCreateDate
+    from tb_rst_warehouse_info
+  </select>
 </mapper>

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

@@ -1,79 +1,79 @@
-<?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.fm.mapper.InventoryMapper" >
-  <resultMap id="BaseResultMap" type="InventoryInfo" >
-    <id column="inventory_id" property="inventoryId" jdbcType="INTEGER" />
-    <result column="inventory_product_name" property="inventoryProductName" jdbcType="VARCHAR" />
-    <result column="inventory_product_bar" property="inventoryProductBar" jdbcType="VARCHAR" />
-    <result column="inventory_remaining_num" property="inventoryRemainingNum" jdbcType="INTEGER" />
-    <result column="inventory_state" property="inventoryState" jdbcType="INTEGER" />
-    <result column="inventory_desc" property="inventoryDesc" jdbcType="VARCHAR" />
-    <result column="inventory_create_time" property="inventoryCreateTime" jdbcType="TIMESTAMP" />
-    <result column="inventory_update_time" property="inventoryUpdateTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    inventory_id,
-    inventory_product_name,
-    inventory_product_bar,
-    inventory_remaining_num,
-    inventory_state,
-    inventory_desc,
-    inventory_create_time,
-    inventory_update_time
-  </sql>
-  <select id="getByInventoryId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from tb_rst_fm_inventory
-    where inventory_id = #{inventoryId,jdbcType=INTEGER}
-  </select>
-  <select id="listByInventoryId" resultMap="BaseResultMap" parameterType="InventoryInfo" >
-    select
-    inventory_id,
-    inventory_product_name,
-    inventory_product_bar,
-    inventory_remaining_num,
-    inventory_state,
-    inventory_desc,
-    inventory_create_time,
-    inventory_update_time
-    from
-    tb_rst_fm_inventory
-    <where>
-      <if test="inventoryId != null and inventoryId != ''">
-        inventory_id = #{inventoryId}
-      </if>
-      <if test="inventoryProductName != null and inventoryProductName != ''">
-        and inventory_product_name like CONCAT('%',#{inventoryProductName},'%')
-      </if>
-      <if test="inventoryProductBar != null and inventoryProductBar != ''">
-        and inventory_product_bar = #{inventoryProductBar}
-      </if>
-      <if test="inventoryState != null and inventoryState != ''">
-        and inventory_state = #{inventoryState}
-      </if>
-    </where>
-  </select>
-
-  <update id="updateById" parameterType="InventoryInfo" >
-    update tb_rst_fm_inventory
-    <set >
-      <if test="inventoryProductName != null and inventoryProductName != ''" >
-        inventory_product_name = #{inventoryProductName,jdbcType=VARCHAR},
-      </if>
-      <if test="inventoryProductBar != null and inventoryProductBar != ''" >
-        inventory_product_bar = #{inventoryProductBar,jdbcType=VARCHAR},
-      </if>
-      <if test="inventoryRemainingNum != null and inventoryRemainingNum != ''" >
-        inventory_remaining_num = #{inventoryRemainingNum},
-      </if>
-      <if test="inventoryState != null and inventoryState != ''" >
-        inventory_state = #{inventoryState,jdbcType=INTEGER},
-      </if>
-      <if test="inventoryDesc != null and inventoryDesc != ''" >
-        inventory_desc = #{inventoryDesc,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where inventory_id = #{inventoryId,jdbcType=INTEGER}
-  </update>
+<?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.fm.mapper.InventoryMapper" >
+  <resultMap id="BaseResultMap" type="InventoryInfo" >
+    <id column="inventory_id" property="inventoryId" jdbcType="INTEGER" />
+    <result column="inventory_product_name" property="inventoryProductName" jdbcType="VARCHAR" />
+    <result column="inventory_product_bar" property="inventoryProductBar" jdbcType="VARCHAR" />
+    <result column="inventory_remaining_num" property="inventoryRemainingNum" jdbcType="INTEGER" />
+    <result column="inventory_state" property="inventoryState" jdbcType="INTEGER" />
+    <result column="inventory_desc" property="inventoryDesc" jdbcType="VARCHAR" />
+    <result column="inventory_create_time" property="inventoryCreateTime" jdbcType="TIMESTAMP" />
+    <result column="inventory_update_time" property="inventoryUpdateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    inventory_id,
+    inventory_product_name,
+    inventory_product_bar,
+    inventory_remaining_num,
+    inventory_state,
+    inventory_desc,
+    inventory_create_time,
+    inventory_update_time
+  </sql>
+  <select id="getByInventoryId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tb_rst_fm_inventory
+    where inventory_id = #{inventoryId,jdbcType=INTEGER}
+  </select>
+  <select id="listByInventoryId" resultMap="BaseResultMap" parameterType="InventoryInfo" >
+    select
+    inventory_id,
+    inventory_product_name,
+    inventory_product_bar,
+    inventory_remaining_num,
+    inventory_state,
+    inventory_desc,
+    inventory_create_time,
+    inventory_update_time
+    from
+    tb_rst_fm_inventory
+    <where>
+      <if test="inventoryId != null and inventoryId != ''">
+        inventory_id = #{inventoryId}
+      </if>
+      <if test="inventoryProductName != null and inventoryProductName != ''">
+        and inventory_product_name like CONCAT('%',#{inventoryProductName},'%')
+      </if>
+      <if test="inventoryProductBar != null and inventoryProductBar != ''">
+        and inventory_product_bar = #{inventoryProductBar}
+      </if>
+      <if test="inventoryState != null and inventoryState != ''">
+        and inventory_state = #{inventoryState}
+      </if>
+    </where>
+  </select>
+
+  <update id="updateById" parameterType="InventoryInfo" >
+    update tb_rst_fm_inventory
+    <set >
+      <if test="inventoryProductName != null and inventoryProductName != ''" >
+        inventory_product_name = #{inventoryProductName,jdbcType=VARCHAR},
+      </if>
+      <if test="inventoryProductBar != null and inventoryProductBar != ''" >
+        inventory_product_bar = #{inventoryProductBar,jdbcType=VARCHAR},
+      </if>
+      <if test="inventoryRemainingNum != null and inventoryRemainingNum != ''" >
+        inventory_remaining_num = #{inventoryRemainingNum},
+      </if>
+      <if test="inventoryState != null and inventoryState != ''" >
+        inventory_state = #{inventoryState,jdbcType=INTEGER},
+      </if>
+      <if test="inventoryDesc != null and inventoryDesc != ''" >
+        inventory_desc = #{inventoryDesc,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where inventory_id = #{inventoryId,jdbcType=INTEGER}
+  </update>
 </mapper>