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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/utils/test.java
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_repair.ftl

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

@@ -50,10 +50,21 @@ public class BackGoods  implements Serializable {
 
     private Integer detectState;                //品质检测状态
 
+    //QC质检集合
+    private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
+
     private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
 
     private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//机会产品集合
 
+    public List<ComplaintDetectInfo> getComplaintDetectList() {
+        return complaintDetectList;
+    }
+
+    public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
+        this.complaintDetectList = complaintDetectList;
+    }
+
     public Integer getDetectState() {
         return detectState;
     }

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

@@ -46,6 +46,35 @@ public class ComplaintDetectInfo implements Serializable {
     private Integer productTypeId;//产品类型id
     private String productTypeName;//产品类型名称
 
+    /*客诉-生产维修表*/
+    private Integer maintenanceIsRepair;        //是否可返修
+    private String maintenanceContent;          //返修内容
+    private Date maintenanceContentDate;        //返修日期
+
+    public Integer getMaintenanceIsRepair() {
+        return maintenanceIsRepair;
+    }
+
+    public void setMaintenanceIsRepair(Integer maintenanceIsRepair) {
+        this.maintenanceIsRepair = maintenanceIsRepair;
+    }
+
+    public String getMaintenanceContent() {
+        return maintenanceContent;
+    }
+
+    public void setMaintenanceContent(String maintenanceContent) {
+        this.maintenanceContent = maintenanceContent;
+    }
+
+    public Date getMaintenanceContentDate() {
+        return maintenanceContentDate;
+    }
+
+    public void setMaintenanceContentDate(Date maintenanceContentDate) {
+        this.maintenanceContentDate = maintenanceContentDate;
+    }
+
     public Integer getDetectId() {
         return detectId;
     }

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

@@ -4,7 +4,9 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 客诉基本实体类
@@ -97,6 +99,16 @@ public class CustomerInfo  implements Serializable {
 
     private String transactionNumber;     //外部交易号，订单id
     private Integer isAddOrder;      //1:原来就有订单  2：需要新添加订单
+    //QC质检集合
+    private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
+
+    public List<ComplaintDetectInfo> getComplaintDetectList() {
+        return complaintDetectList;
+    }
+
+    public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
+        this.complaintDetectList = complaintDetectList;
+    }
 
     public Date getVisitDate() {
         return visitDate;

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

@@ -50,10 +50,21 @@ public class NoreasonBack  implements Serializable {
 
     private Integer detectState;                //品质检测状态
 
+    //QC质检集合
+    private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
+
     private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
 
     private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//机会产品集合
 
+    public List<ComplaintDetectInfo> getComplaintDetectList() {
+        return complaintDetectList;
+    }
+
+    public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
+        this.complaintDetectList = complaintDetectList;
+    }
+
     public Integer getDetectState() {
         return detectState;
     }

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

@@ -90,11 +90,22 @@ public class Renewed  implements Serializable {
     private Date salesPayTime;                  //支付时间
     private String salesDealCode;               //交易号
 
+    //QC质检集合
+    private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
+
     private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
     private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//寄回产品集合
     private List<SendProdcue> sendProdcues = new ArrayList<SendProdcue>();//寄送产品集合
     private List<SendFitting> sendFittings = new ArrayList<SendFitting>();//寄送配件集合
 
+    public List<ComplaintDetectInfo> getComplaintDetectList() {
+        return complaintDetectList;
+    }
+
+    public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
+        this.complaintDetectList = complaintDetectList;
+    }
+
     public List<SendProdcue> getSendProdcues() {
         return sendProdcues;
     }

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

@@ -89,11 +89,23 @@ public class Repair implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date salesPayTime;                  //支付时间
     private String salesDealCode;               //交易号
+
+    //QC质检集合
+    private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
+
     private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
     private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//机会产品集合
     private List<SendProdcue> sendProdcues = new ArrayList<SendProdcue>();//寄送产品集合
     private List<SendFitting> sendFittings = new ArrayList<SendFitting>();//寄送配件集合
 
+    public List<ComplaintDetectInfo> getComplaintDetectList() {
+        return complaintDetectList;
+    }
+
+    public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
+        this.complaintDetectList = complaintDetectList;
+    }
+
     public List<SendProdcue> getSendProdcues() {
         return sendProdcues;
     }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/ProduceService.java

@@ -75,4 +75,10 @@ public interface ProduceService {
      * @return
      */
     WechatMp getWechatMpById(Integer wechatMpId);
+
+    /**
+     * 获取公众号信息
+     * @return
+     */
+    List<WechatMp> listWechatMp();
 }

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

@@ -779,6 +779,9 @@ public class CustomerServiceImpl implements CustomerService {
                 repairInfo.setCustomerId(customerInfo.getCustomerId());
                 //查询售后维修集合
                 repairInfo = repairMapper.getRepairInfo(repairInfo);
+                if (repairInfo.getComplaintDetectList() != null && repairInfo.getComplaintDetectList().size() > 0) {
+                    repairInfo.setDetectState(repairInfo.getComplaintDetectList().get(0).getDetectState());
+                }
                 orderId = repairInfo.getOrderId();
                 customerCommon = CustomerCommon.getCustomerCommon(4,repairInfo);
                 customerCommon = customerService.selectProdcueAndFitting(customerCommon,4);
@@ -807,6 +810,9 @@ public class CustomerServiceImpl implements CustomerService {
                     return null;
                 }
                 backGoodsInfo = backGoodsList.get(0);
+                if (backGoodsInfo.getComplaintDetectList() != null && backGoodsInfo.getComplaintDetectList().size() > 0) {
+                    backGoodsInfo.setDetectState(backGoodsInfo.getComplaintDetectList().get(0).getDetectState());
+                }
                 orderId = backGoodsInfo.getOrderId();
                 customerCommon = CustomerCommon.getCustomerCommon(6,backGoodsInfo);
                 customerCommon = customerService.selectProdcueAndFitting(customerCommon,6);
@@ -821,6 +827,9 @@ public class CustomerServiceImpl implements CustomerService {
                     return null;
                 }
                 noreasonBackInfo = noreasonBackList.get(0);
+                if (noreasonBackInfo.getComplaintDetectList() != null && noreasonBackInfo.getComplaintDetectList().size() > 0) {
+                    noreasonBackInfo.setDetectState(noreasonBackInfo.getComplaintDetectList().get(0).getDetectState());
+                }
                 orderId = noreasonBackInfo.getOrderId();
                 customerCommon = CustomerCommon.getCustomerCommon(7,noreasonBackInfo);
                 customerCommon = customerService.selectProdcueAndFitting(customerCommon,7);

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

@@ -34,15 +34,29 @@
   </select>
 
   <!-- 查询售后退货集合 -->
-  <select id="listBackGoods" resultType="BackGoods" parameterType="BackGoods">
+  <select id="listBackGoods" resultMap="goodsMap" parameterType="BackGoods">
     select
-      g.*,
-      o.sales_pay_time salesPayTime,
-      d.detect_state detectState
+      g.back_goods_id,
+      g.customer_id,
+      g.order_id,
+      g.signclosed_id,
+      g.back_goods_back_status,
+      g.back_goods_back_name,
+      g.back_goods_back_tel,
+      g.back_goods_back_logistics_company,
+      g.back_goods_back_logistics_no,
+      g.back_goods_back_postage,
+      g.back_goods_back_machine_no,
+      g.back_goods_desc,
+      g.back_goods_state,
+      g.back_goods_alipay,
+      g.back_goods_is_transfer,
+      g.back_goods_create_time,
+      g.back_goods_update_time,
+      o.sales_pay_time salesPayTime
     from
       tb_rst_back_goods g
     LEFT JOIN tb_rst_sales_order_info o ON g.order_id = o.sales_id
-    LEFT JOIN tb_rst_complaint_detect d ON g.customer_id = d.customer_id
     <where>
       <if test="customerId != null and customerId != ''">
         g.customer_id = #{customerId}
@@ -53,6 +67,48 @@
     </where>
   </select>
 
+  <resultMap id="goodsMap" type="BackGoods">
+    <id column="back_goods_id" property="backGoodsId"/>
+    <result column="customer_id" property="customerId"/>
+    <result column="order_id" property="orderId"/>
+    <result column="signclosed_id" property="signclosedId"/>
+    <result column="back_goods_back_status" property="backGoodsBackStatus"/>
+    <result column="back_goods_back_name" property="backGoodsBackName"/>
+    <result column="back_goods_back_tel" property="backGoodsBackTel"/>
+    <result column="back_goods_back_logistics_company" property="backGoodsBackLogisticsCompany"/>
+    <result column="back_goods_back_logistics_no" property="backGoodsBackLogisticsNo"/>
+    <result column="back_goods_back_postage" property="backGoodsBackPostage"/>
+    <result column="back_goods_back_machine_no" property="backGoodsBackMachineNo"/>
+    <result column="back_goods_desc" property="backGoodsDesc"/>
+    <result column="back_goods_state" property="backGoodsState"/>
+    <result column="back_goods_alipay" property="backGoodsAlipay"/>
+    <result column="back_goods_is_transfer" property="backGoodsIsTransfer"/>
+    <result column="back_goods_create_time" property="backGoodsCreateTime"/>
+    <result column="back_goods_update_time" property="backGoodsUpdateTime"/>
+    <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
+  </resultMap>
+
+  <select id="listComplaintDetect" parameterType="Integer" resultType="ComplaintDetectInfo">
+    SELECT
+      d.detect_state detectState,
+      d.detect_phenomenon detectPhenomenon,
+      d.detect_failure_classification detectFailureClassification,
+      d.detect_failure_cause detectFailureCause,
+      d.detect_results detectResults,
+      d.detect_point detectPoint,
+      d.detect_analysis detectAnalysis,
+      d.detect_revolution_produced detectRevolutionProduced,
+      m.maintenance_is_repair maintenanceIsRepair,
+      m.maintenance_content maintenanceContent,
+      m.maintenance_content_date maintenanceContentDate
+    FROM
+      tb_rst_complaint_detect d
+    LEFT JOIN tb_rst_complaint_maintenance m ON d.detect_id = m.detect_id
+    WHERE
+      d.customer_id = #{customerId}
+    ORDER BY d.detect_id ASC
+  </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from tb_rst_back_goods
     where back_goods_id = #{backGoodsId,jdbcType=INTEGER}

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

@@ -39,37 +39,36 @@
   </delete>
 
   <!-- 查询客诉基本信息列表 -->
-  <select id="listCustomer" parameterType="CustomerInfo" resultType="CustomerInfo">
+  <select id="listCustomer" parameterType="CustomerInfo" resultMap="customerMap">
     select
-      c.customer_id customerId,
-      c.customer_counsel_type customerCounselType,
-      a.admin_name adminName,
-      c.customer_name customerName,
-      c.customer_tel customerTel,
-      c.customer_source_type customerSourceType,
-      c.customer_source customerSource,
-      t.type_name typeName,
-      ct.complaint_class_name complaintClassName,
-      s.small_class_name smallClassName,
-      d.describe_title describeTitle,
-      sc.company_name companyName,
-      si.store_name storeName,
-      c.customer_area customerArea,
-      c.customer_in_TDS customerInTDS,
-      c.customer_out_TDS customerOutTDS,
-      c.customer_is_solve customerIsSolve,
-      c.customer_is_visit customerIsVisit,
-      c.customer_create_time customerCreateTime,
-      v.visit_status visitStatus,
-      v.visit_complete_date visitCompleteDate,
-      v.visit_name visitName,
-      v.visit_date visitDate,
-      v.visit_time_select visitTimeSelect,
-      v.visit_complete_name visitCompleteName,
-      v.visit_complete_tel visitCompleteTel,
-      cd.detect_state detectState,
-      q.question_profile questionProfile,
-      d.describe_handle_desc describeHandleDesc
+      c.customer_id,
+      c.customer_counsel_type,
+      a.admin_name,
+      c.customer_name,
+      c.customer_tel,
+      c.customer_source_type,
+      c.customer_source,
+      t.type_name,
+      ct.complaint_class_name,
+      s.small_class_name,
+      d.describe_title,
+      sc.company_name,
+      si.store_name,
+      c.customer_area,
+      c.customer_in_TDS,
+      c.customer_out_TDS,
+      c.customer_is_solve,
+      c.customer_is_visit,
+      c.customer_create_time,
+      v.visit_status,
+      v.visit_complete_date,
+      v.visit_name,
+      v.visit_date,
+      v.visit_time_select,
+      v.visit_complete_name,
+      v.visit_complete_tel,
+      q.question_profile,
+      d.describe_handle_desc
     from
       tb_rst_customer_info c
     LEFT JOIN tb_rst_question_describe d ON c.customer_id = d.customer_id
@@ -81,7 +80,6 @@
     LEFT JOIN tb_rst_store_info si ON c.store_id = si.store_id
     LEFT JOIN tb_rst_sys_admin a ON c.admin_id = a.admin_id
     LEFT JOIN tb_rst_visit v ON v.customer_id = c.customer_id
-    LEFT JOIN tb_rst_complaint_detect cd ON cd.customer_id = c.customer_id
     <where>
       <if test="customerName != null and customerName != ''">
         c.customer_name like CONCAT('%',#{customerName},'%')
@@ -111,6 +109,49 @@
     ORDER BY FIELD(c.customer_is_solve, 5, 3, 4, 6, 7, 2, 1),c.customer_id desc
   </select>
 
+  <resultMap id="customerMap" type="CustomerInfo">
+    <id column="customer_id" property="customerId"/>
+    <result column="customer_counsel_type" property="customerCounselType"/>
+    <result column="signclosed_type_name" property="signclosedTypeName"/>
+    <result column="admin_name" property="adminName"/>
+    <result column="customer_name" property="customerName"/>
+    <result column="customer_tel" property="customerTel"/>
+    <result column="customer_source_type" property="customerSourceType"/>
+    <result column="customer_source" property="customerSource"/>
+    <result column="type_name" property="typeName"/>
+    <result column="complaint_class_name" property="complaintClassName"/>
+    <result column="small_class_name" property="smallClassName"/>
+    <result column="describe_title" property="describeTitle"/>
+    <result column="company_name" property="companyName"/>
+    <result column="store_name" property="storeName"/>
+    <result column="customer_area" property="customerArea"/>
+    <result column="customer_in_TDS" property="customerInTDS"/>
+    <result column="customer_out_TDS" property="customerOutTDS"/>
+    <result column="customer_is_solve" property="customerIsSolve"/>
+    <result column="customer_is_visit" property="customerIsVisit"/>
+    <result column="customer_create_time" property="customerCreateTime"/>
+    <result column="visit_status" property="visitStatus"/>
+    <result column="visit_complete_date" property="visitCompleteDate"/>
+    <result column="visit_name" property="visitName"/>
+    <result column="visit_date" property="visitDate"/>
+    <result column="visit_time_select" property="visitTimeSelect"/>
+    <result column="visit_complete_name" property="visitCompleteName"/>
+    <result column="visit_complete_tel" property="visitCompleteTel"/>
+    <result column="question_profile" property="questionProfile"/>
+    <result column="describe_handle_desc" property="describeHandleDesc"/>
+    <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
+  </resultMap>
+
+  <select id="listComplaintDetect" parameterType="Integer" resultType="ComplaintDetectInfo">
+    SELECT
+      *
+    FROM
+      tb_rst_complaint_detect
+    WHERE
+      customer_id = #{customerId}
+    ORDER BY detect_id ASC
+  </select>
+
   <insert id="insert" parameterType="CustomerInfo"  useGeneratedKeys="true"  keyProperty="customerId">
     insert into tb_rst_customer_info (customer_id, admin_id, question_id, 
       company_id, store_id, customer_source_type, 

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

@@ -35,15 +35,29 @@
   </select>
 
   <!-- 查询售后无理由退货集合 -->
-  <select id="listNoreasonBack" resultType="NoreasonBack" parameterType="NoreasonBack">
+  <select id="listNoreasonBack" resultMap="noreasonBackMap" parameterType="NoreasonBack">
     select
-      b.*,
-      o.sales_pay_time salesPayTime,
-      d.detect_state detectState
+      b.noreason_back_id,
+      b.customer_id,
+      b.order_id,
+      b.signclosed_id,
+      b.noreason_back_back_status,
+      b.noreason_back_back_name,
+      b.noreason_back_back_tel,
+      b.noreason_back_back_logistics_company,
+      b.noreason_back_back_logistics_no,
+      b.noreason_back_back_postage,
+      b.noreason_back_back_machine_no,
+      b.noreason_back_desc,
+      b.noreason_back_state,
+      b.noreason_back_alipay,
+      b.noreason_back_is_transfer,
+      b.noreason_back_create_time,
+      b.noreason_back_update_time,
+      o.sales_pay_time salesPayTime
     from
       tb_rst_noreason_back b
     LEFT JOIN tb_rst_sales_order_info o ON b.order_id = o.sales_id
-    LEFT JOIN tb_rst_complaint_detect d ON b.customer_id = d.customer_id
     <where>
       <if test="customerId != null and customerId != ''">
         b.customer_id = #{customerId}
@@ -54,6 +68,48 @@
     </where>
   </select>
 
+  <resultMap id="noreasonBackMap" type="NoreasonBack" >
+    <id column="noreason_back_id" property="noreasonBackId" jdbcType="INTEGER" />
+    <result column="customer_id" property="customerId" jdbcType="INTEGER" />
+    <result column="order_id" property="orderId" jdbcType="INTEGER" />
+    <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
+    <result column="noreason_back_back_status" property="noreasonBackBackStatus" jdbcType="BIT" />
+    <result column="noreason_back_back_name" property="noreasonBackBackName" jdbcType="VARCHAR" />
+    <result column="noreason_back_back_tel" property="noreasonBackBackTel" jdbcType="CHAR" />
+    <result column="noreason_back_back_logistics_company" property="noreasonBackBackLogisticsCompany" jdbcType="VARCHAR" />
+    <result column="noreason_back_back_logistics_no" property="noreasonBackBackLogisticsNo" jdbcType="VARCHAR" />
+    <result column="noreason_back_back_postage" property="noreasonBackBackPostage" jdbcType="INTEGER" />
+    <result column="noreason_back_back_machine_no" property="noreasonBackBackMachineNo" jdbcType="VARCHAR" />
+    <result column="noreason_back_desc" property="noreasonBackDesc" jdbcType="VARCHAR" />
+    <result column="noreason_back_state" property="noreasonBackState" jdbcType="BIT" />
+    <result column="noreason_back_alipay" property="noreasonBackAlipay" jdbcType="VARCHAR" />
+    <result column="noreason_back_is_transfer" property="noreasonBackIsTransfer" jdbcType="BIT" />
+    <result column="noreason_back_create_time" property="noreasonBackCreateTime" jdbcType="TIMESTAMP" />
+    <result column="noreason_back_update_time" property="noreasonBackUpdateTime" jdbcType="TIMESTAMP" />
+    <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
+  </resultMap>
+
+  <select id="listComplaintDetect" parameterType="Integer" resultType="ComplaintDetectInfo">
+    SELECT
+      d.detect_state detectState,
+      d.detect_phenomenon detectPhenomenon,
+      d.detect_failure_classification detectFailureClassification,
+      d.detect_failure_cause detectFailureCause,
+      d.detect_results detectResults,
+      d.detect_point detectPoint,
+      d.detect_analysis detectAnalysis,
+      d.detect_revolution_produced detectRevolutionProduced,
+      m.maintenance_is_repair maintenanceIsRepair,
+      m.maintenance_content maintenanceContent,
+      m.maintenance_content_date maintenanceContentDate
+    FROM
+      tb_rst_complaint_detect d
+    LEFT JOIN tb_rst_complaint_maintenance m ON d.detect_id = m.detect_id
+    WHERE
+      d.customer_id = #{customerId}
+    ORDER BY d.detect_id ASC
+  </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from tb_rst_noreason_back
     where noreason_back_id = #{noreasonBackId,jdbcType=INTEGER}

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

@@ -42,9 +42,85 @@
   </sql>
 
   <!-- 获取换新详情和品质检测信息 -->
-  <select id="getRenewedInfo" parameterType="Renewed" resultType="Renewed">
+  <select id="getRenewedInfo" parameterType="Renewed" resultMap="renewedMap">
     select
-      r.*,
+      renewed_id,
+      customer_id,
+      order_id,
+      signclosed_id,
+      renewed_back_efast_order_id,
+      renewed_back_status,
+      renewed_back_name,
+      renewed_back_tel,
+      renewed_back_logistics_company,
+      renewed_back_logistics_no,
+      renewed_back_postage,
+      renewed_back_machine_no,
+      renewed_send_status,
+      renewed_send_name,
+      renewed_send_tel,
+      province_number,
+      city_number,
+      area_number,
+      renewed_send_merge_address,
+      renewed_send_address,
+      renewed_send_logistics_company,
+      renewed_send_logistics_no,
+      renewed_desc,
+      renewed_state,
+      renewed_alipay,
+      renewed_is_transfer,
+      renewed_create_time,
+      renewed_update_time
+    from
+      tb_rst_renewed
+    <where>
+      <if test="renewedId != null and renewedId != ''">
+        renewed_id = #{renewedId}
+      </if>
+      <if test="customerId != null and customerId != ''">
+        and customer_id = #{customerId}
+      </if>
+      <if test="renewedState != null and renewedState != ''">
+        and renewed_state = #{renewedState}
+      </if>
+    </where>
+  </select>
+
+  <resultMap id="renewedMap" type="Renewed">
+    <id column="renewed_id" property="renewedId"/>
+    <result column="customer_id" property="customerId"/>
+    <result column="order_id" property="orderId"/>
+    <result column="signclosed_id" property="signclosedId"/>
+    <result column="renewed_back_efast_order_id" property="renewedBackEfastOrderId"/>
+    <result column="renewed_back_status" property="renewedBackStatus"/>
+    <result column="renewed_back_name" property="renewedBackName"/>
+    <result column="renewed_back_tel" property="renewedBackTel"/>
+    <result column="renewed_back_logistics_company" property="renewedBackLogisticsCompany"/>
+    <result column="renewed_back_logistics_no" property="renewedBackLogisticsNo"/>
+    <result column="renewed_back_postage" property="renewedBackPostage"/>
+    <result column="renewed_back_machine_no" property="renewedBackMachineNo"/>
+    <result column="renewed_send_status" property="renewedSendStatus"/>
+    <result column="renewed_send_name" property="renewedSendName"/>
+    <result column="renewed_send_tel" property="renewedSendTel"/>
+    <result column="province_number" property="provinceNumber"/>
+    <result column="city_number" property="cityNumber"/>
+    <result column="area_number" property="areaNumber"/>
+    <result column="renewed_send_merge_address" property="renewedSendMergeAddress"/>
+    <result column="renewed_send_address" property="renewedSendAddress"/>
+    <result column="renewed_send_logistics_company" property="renewedSendLogisticsCompany"/>
+    <result column="renewed_send_logistics_no" property="renewedSendLogisticsNo"/>
+    <result column="renewed_desc" property="renewedDesc"/>
+    <result column="renewed_state" property="renewedState"/>
+    <result column="renewed_alipay" property="renewedAlipay"/>
+    <result column="renewed_is_transfer" property="renewedIsTransfer"/>
+    <result column="renewed_create_time" property="renewedCreateTime"/>
+    <result column="renewed_update_time" property="renewedUpdateTime"/>
+    <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
+  </resultMap>
+
+  <select id="listComplaintDetect" parameterType="Integer" resultType="ComplaintDetectInfo">
+    SELECT
       d.detect_state detectState,
       d.detect_phenomenon detectPhenomenon,
       d.detect_failure_classification detectFailureClassification,
@@ -56,21 +132,12 @@
       m.maintenance_is_repair maintenanceIsRepair,
       m.maintenance_content maintenanceContent,
       m.maintenance_content_date maintenanceContentDate
-    from
-      tb_rst_renewed r
-    LEFT JOIN tb_rst_complaint_detect d ON r.customer_id = d.customer_id
+    FROM
+      tb_rst_complaint_detect d
     LEFT JOIN tb_rst_complaint_maintenance m ON d.detect_id = m.detect_id
-    <where>
-      <if test="renewedId != null and renewedId != ''">
-        r.renewed_id = #{renewedId}
-      </if>
-      <if test="customerId != null and customerId != ''">
-        and r.customer_id = #{customerId}
-      </if>
-      <if test="renewedState != null and renewedState != ''">
-        and r.renewed_state = #{renewedState}
-      </if>
-    </where>
+    WHERE
+      d.customer_id = #{customerId}
+    ORDER BY d.detect_id ASC
   </select>
 
   <!-- 获取寄回配件集合 -->

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

@@ -68,9 +68,85 @@
   </select>
 
   <!-- 获取维修详情和品质检测信息 -->
-  <select id="getRepairInfo" parameterType="Repair" resultType="Repair">
+  <select id="getRepairInfo" parameterType="Repair" resultMap="repairMap">
     select
-      r.*,
+      repair_id,
+      customer_id,
+      order_id,
+      signclosed_id,
+      repair_back_efast_order_id,
+      repair_back_status,
+      repair_back_name,
+      repair_back_tel,
+      repair_back_logistics_company,
+      repair_back_logistics_no,
+      repair_back_postage,
+      repair_back_machine_no,
+      repair_send_status,
+      repair_send_name,
+      repair_send_tel,
+      province_number,
+      city_number,
+      area_number,
+      repair_send_merge_address,
+      repair_send_address,
+      repair_send_logistics_company,
+      repair_send_logistics_no,
+      repair_desc,
+      repair_state,
+      repair_alipay,
+      repair_is_transfer,
+      repair_create_time,
+      repair_update_time
+    from
+      tb_rst_repair
+    <where>
+      <if test="repairId != null and repairId != ''">
+        repair_id = #{repairId}
+      </if>
+      <if test="customerId != null and customerId != ''">
+        and customer_id = #{customerId}
+      </if>
+      <if test="repairState != null and repairState != ''">
+        and repair_state = #{repairState}
+      </if>
+    </where>
+  </select>
+
+  <resultMap id="repairMap" type="Repair" >
+    <id column="repair_id" property="repairId"/>
+    <result column="customer_id" property="customerId"/>
+    <result column="order_id" property="orderId"/>
+    <result column="signclosed_id" property="signclosedId"/>
+    <result column="repair_back_efast_order_id" property="repairBackEfastOrderId"/>
+    <result column="repair_back_status" property="repairBackStatus"/>
+    <result column="repair_back_name" property="repairBackName"/>
+    <result column="repair_back_tel" property="repairBackTel"/>
+    <result column="repair_back_logistics_company" property="repairBackLogisticsCompany"/>
+    <result column="repair_back_logistics_no" property="repairBackLogisticsNo"/>
+    <result column="repair_back_postage" property="repairBackPostage"/>
+    <result column="repair_back_machine_no" property="repairBackMachineNo"/>
+    <result column="repair_send_status" property="repairSendStatus"/>
+    <result column="repair_send_name" property="repairSendName"/>
+    <result column="repair_send_tel" property="repairSendTel"/>
+    <result column="province_number" property="provinceNumber"/>
+    <result column="city_number" property="cityNumber"/>
+    <result column="area_number" property="areaNumber"/>
+    <result column="repair_send_merge_address" property="repairSendMergeAddress"/>
+    <result column="repair_send_address" property="repairSendAddress"/>
+    <result column="repair_send_logistics_company" property="repairSendLogisticsCompany"/>
+    <result column="repair_send_logistics_no" property="repairSendLogisticsNo"/>
+    <result column="repair_desc" property="repairDesc"/>
+    <result column="repair_state" property="repairState"/>
+    <result column="repair_alipay" property="repairAlipay"/>
+    <result column="repair_is_transfer" property="repairIsTransfer"/>
+    <result column="repair_create_time" property="repairCreateTime"/>
+    <result column="repair_update_time" property="repairUpdateTime"/>
+    <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
+  </resultMap>
+
+  <select id="listComplaintDetect" parameterType="Integer" resultType="ComplaintDetectInfo">
+    SELECT
       d.detect_state detectState,
       d.detect_phenomenon detectPhenomenon,
       d.detect_failure_classification detectFailureClassification,
@@ -82,21 +158,12 @@
       m.maintenance_is_repair maintenanceIsRepair,
       m.maintenance_content maintenanceContent,
       m.maintenance_content_date maintenanceContentDate
-    from
-      tb_rst_repair r
-    LEFT JOIN tb_rst_complaint_detect d ON r.customer_id = d.customer_id
+    FROM
+      tb_rst_complaint_detect d
     LEFT JOIN tb_rst_complaint_maintenance m ON d.detect_id = m.detect_id
-    <where>
-      <if test="repairId != null and repairId != ''">
-        r.repair_id = #{repairId}
-      </if>
-      <if test="customerId != null and customerId != ''">
-        and r.customer_id = #{customerId}
-      </if>
-      <if test="repairState != null and repairState != ''">
-        and r.repair_state = #{repairState}
-      </if>
-    </where>
+    WHERE
+      d.customer_id = #{customerId}
+    ORDER BY d.detect_id ASC
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/ProduceServiceImpl.java

@@ -286,4 +286,9 @@ public class ProduceServiceImpl implements ProduceService {
     public WechatMp getWechatMpById(Integer wechatMpId) {
         return produceMapper.getWechatMpById(wechatMpId);
     }
+
+    @Override
+    public List<WechatMp> listWechatMp() {
+        return produceMapper.listWechatMp();
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ProduceMapper.java

@@ -94,4 +94,12 @@ public interface ProduceMapper {
      * @return
      */
     WechatMp getWechatMpById(Integer wechatMpId);
+
+    /**
+     * 获取公众号信息
+     * @return
+     */
+    List<WechatMp> listWechatMp();
+
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml

@@ -197,8 +197,8 @@
 
 
     <insert id="saveProduce" parameterType="Produce" useGeneratedKeys="true"  keyProperty="produceId">
-        insert into tb_rst_pts_produce (produce_id,produce_no,produce_name,produce_status,produce_remake,produce_type,produce_pattern,produce_model,produce_feature)
-        values (#{produceId},#{produceNo},#{produceName},#{produceStatus},#{produceRemake},#{produceType},#{producePattern},#{produceModel},#{produceFeature})
+        insert into tb_rst_pts_produce (produce_id,produce_no,produce_name,produce_status,produce_remake,produce_type,produce_pattern,produce_model,produce_feature,wechat_mp_id)
+        values (#{produceId},#{produceNo},#{produceName},#{produceStatus},#{produceRemake},#{produceType},#{producePattern},#{produceModel},#{produceFeature},#{wechatMpId})
     </insert>
 
     <update id="updateProduce" parameterType="Produce" >
@@ -226,7 +226,10 @@
                 produce_feature = #{produceFeature},
             </if>
             <if test="produceRemake !=null and produceRemake !=''">
-                produce_remake = #{produceRemake}
+                produce_remake = #{produceRemake},
+            </if>
+            <if test="wechatMpId !=null and wechatMpId !=''">
+                wechat_mp_id = #{wechatMpId}
             </if>
         </set>
         WHERE
@@ -492,4 +495,14 @@
         wechat_mp_pubno AS wechatMpPubno
          from tb_rst_pts_wechat_mp where wechat_mp_id = #{0}
     </select>
+
+    <select id="listWechatMp" resultType="WechatMp">
+        SELECT
+        wechat_mp_id AS wechatMpId,
+        wechat_mp_appid AS wechatMpAppid,
+        wechat_mp_appsecret AS wechatMpAppsecret,
+        wechat_mp_name AS wechatMpName,
+        wechat_mp_pubno AS wechatMpPubno
+        from tb_rst_pts_wechat_mp
+    </select>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -342,6 +342,7 @@ public class AdminCustomerController {
         mv.addObject("adminList", adminList);
         customerInfo.setVisit(null);
         customerInfo.setCustomerCommon(null);
+        customerInfo.setComplaintDetectList(null);
         StitchAttrUtil.setModelAndView(customerInfo, mv, "/admin/customer/select_customer_list", pagedResult);
         return mv;
     }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminProduceController.java

@@ -3,6 +3,7 @@ package com.iamberry.rst.controllers.pts;
 import com.iamberry.rst.core.pts.ProcessNode;
 import com.iamberry.rst.core.pts.Produce;
 import com.iamberry.rst.core.pts.ProduceProcess;
+import com.iamberry.rst.core.pts.WechatMp;
 import com.iamberry.rst.faces.pts.ProduceService;
 import com.iamberry.wechat.tools.ResponseJson;
 import net.sf.json.JSONArray;
@@ -62,6 +63,8 @@ public class AdminProduceController {
     @RequestMapping("/to_save_produce")
     public ModelAndView goSaveProduce(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView("pts/produce/save_produce");
+        List<WechatMp> listWechatMp = produceService.listWechatMp();
+        mv.addObject("listWechatMp",listWechatMp);
         return mv;
     }
 
@@ -118,6 +121,10 @@ public class AdminProduceController {
             producePro.setNodes(processNodeList);
         }
         produce.setProcess(produceProcessList);
+
+        List<WechatMp> listWechatMp = produceService.listWechatMp();
+        mv.addObject("listWechatMp",listWechatMp);
+
         mv.addObject("produce", produce);
         return mv;
     }

watero-rst-web/src/main/java/com/iamberry/rst/utils/test.java

@@ -32,8 +32,8 @@ public class test {
         return decryptedValue;
     }
 
-/*
-    public static void main(String[] args) throws Exception {
+
+    /*public static void main(String[] args) throws Exception {
         ConsumerRecord<String, String> record = new ConsumerRecord<String, String>("4", 1, 1, "data", "{\"data\":\"7uiBfrOFcdy/EDWxcT6SlQgcMKSMSMuoqvsehLBoghAHxfaWrU9wkHCARR3wuaMwHOKWzrv5DHEfJNt9/QrlfTk6VcHGwiPGycwiPvDkoTe4eJOW8Qqwm/1H4nNX+1Ed/CTueaJe3E/BNsFxe7rF+n32z8r2qDMY9IAHCARuYJRgWKSV9GygcuObQZ+gpq6uCTCNBf4XIxuHSB/BGVZpATEykU1vILnX89GzoJlV+10=\"}");
         String appKey = "5kkyurvvtt58bbuxueee";//填APP KEY
         String secretKey = "rhj6na6u3y6uhy6qrbb3944mg5uqqpbb";//APP SECRET

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_list.ftl

@@ -155,15 +155,22 @@
                                         <#elseif customer.sendStatus == 3>
                                             已收货
                                         </#if>,
-                                        <#if customer.detectState == 1>
-                                            待仓库转入
-                                        <#elseif customer.detectState == 2>
-                                            正在检查
-                                        <#elseif customer.detectState == 3>
-                                            检查通过
-                                        <#elseif customer.detectState == 4>
-                                            检查未通过
-                                        </#if></font>
+                                        <#if customer.complaintDetectList?? &&  (customer.complaintDetectList?size > 0)>
+                                            <#list customer.complaintDetectList as complaintDetect>
+                                                <#if (complaintDetect_index = 0)>
+                                                    <#if complaintDetect.detectState == 1>
+                                                        待仓库转入
+                                                    <#elseif complaintDetect.detectState == 2>
+                                                        正在检查
+                                                    <#elseif complaintDetect.detectState == 3>
+                                                        检查通过
+                                                    <#elseif complaintDetect.detectState == 4>
+                                                        检查未通过
+                                                    </#if>
+                                                </#if>
+                                            </#list>
+                                        </#if>
+                                        </font>
                                     </a>
                                     )
                                 <#elseif customer.customerIsSolve == 4>
@@ -183,15 +190,21 @@
                                         <#elseif customer.sendStatus == 3>
                                             已收货
                                         </#if>,
-                                        <#if customer.detectState == 1>
-                                            待仓库转入
-                                        <#elseif customer.detectState == 2>
-                                            正在检查
-                                        <#elseif customer.detectState == 3>
-                                            检查通过
-                                        <#elseif customer.detectState == 4>
-                                            检查未通过
-                                        </#if></font>
+                                            <#if customer.complaintDetectList?? &&  (customer.complaintDetectList?size > 0)>
+                                                <#list customer.complaintDetectList as complaintDetect>
+                                                    <#if (complaintDetect_index = 0)>
+                                                        <#if complaintDetect.detectState == 1>
+                                                            待仓库转入
+                                                        <#elseif complaintDetect.detectState == 2>
+                                                            正在检查
+                                                        <#elseif complaintDetect.detectState == 3>
+                                                            检查通过
+                                                        <#elseif complaintDetect.detectState == 4>
+                                                            检查未通过
+                                                        </#if>
+                                                    </#if>
+                                                </#list>
+                                            </#if></font>
                                     </a>
                                     )
                                 <#elseif customer.customerIsSolve == 5>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_back_goods.ftl

@@ -368,7 +368,6 @@
                             $(this).iCheck('check');
                         }
                     });
-                    /*$('#backGoodsBackMachineNo').val(backGoods.backGoodsBackMachineNo);*/
                     $('#backGoodsDesc').val(backGoods.backGoodsDesc);
                     var backGoodsSchedule = '';
                     switch (backGoods.backGoodsBackStatus) {

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_renewed.ftl

@@ -266,18 +266,9 @@
             </div>
             <div class="formControls col-10 col-sm-10">
                 <table class="table table-border table-bg table-bordered">
-                    <tbody class="text-c"><tr>
+                    <tbody class="text-c" id="detect_table"><tr>
                         <th>工厂检测现象</th><th>故障分类</th><th>故障原因</th><th>判定结果</th><th>故障指向</th><th>原因分析</th><th>生产维修</th>
                     </tr>
-                    <tr>
-                        <td id="detectPhenomenon"></td>
-                        <td id="detectFailureClassification"></td>
-                        <td id="detectFailureCause"></td>
-                        <td id="detectResults"></td>
-                        <td id="detectPoint"></td>
-                        <td id="detectAnalysis"></td>
-                        <td id="detectRevolutionProduced"></td>
-                    </tr>
                     </tbody></table>
             </div>
         </div>
@@ -287,14 +278,9 @@
             </div>
             <div class="formControls col-10 col-sm-10">
                 <table class="table table-border table-bg table-bordered">
-                    <tbody class="text-c"><tr>
+                    <tbody class="text-c" id="maintenance_table"><tr>
                         <th>是否可返修</th><th>返修内容</th><th>返修日期</th>
                     </tr>
-                    <tr>
-                        <td id="maintenanceIdRepair"></td>
-                        <td id="maintenanceContent"></td>
-                        <td id="maintenanceContentDate"></td>
-                    </tr>
                     </tbody></table>
             </div>
         </div>
@@ -318,10 +304,6 @@
 
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
-<#--<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>-->
 <script type="text/javascript">
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码
@@ -545,12 +527,7 @@
                         case 2:renewedSchedule += '已寄出,';break;
                         case 3:renewedSchedule += '已收货,';break;
                     }
-                    switch (renewed.detectState) {
-                        case 1:renewedSchedule += '待仓库转入';break;
-                        case 2:renewedSchedule += '正在检查';break;
-                        case 3:renewedSchedule += '检查通过';break;
-                        case 4:renewedSchedule += '检查未通过';break;
-                    }
+
                     var renewedProduct = '';
                     if (renewed.closedProdcues != null && renewed.closedProdcues.length > 0) {
                         $.each(renewed.closedProdcues,function(index,element){
@@ -617,16 +594,34 @@
                     $('#renewedSendAddress').val(renewed.renewedSendAddress);
                     $('#renewedSendLogisticsNo').val(renewed.renewedSendLogisticsNo);
                     $('#renewedDesc').val(renewed.renewedDesc);
-                    $('#detectPhenomenon').html(renewed.detectPhenomenon);
-                    $('#detectFailureClassification').html(renewed.detectFailureClassification);
-                    $('#detectFailureCause').html(renewed.detectFailureCause);
-                    $('#detectResults').html(renewed.detectResults);
-                    $('#detectPoint').html(renewed.detectPoint);
-                    $('#detectAnalysis').html(renewed.detectAnalysis);
-                    $('#detectRevolutionProduced').html(renewed.detectRevolutionProduced);
-                    $('#maintenanceIdRepair').html(renewed.maintenanceIdRepair);
-                    $('#maintenanceContent').html(renewed.maintenanceContent);
-                    $('#maintenanceContentDate').html(renewed.maintenanceContentDate);
+
+                    var detect_table = $('#detect_table');
+                    var maintenance_table = $('#maintenance_table');
+                    if (renewed.complaintDetectList != null) {
+                        $.each(renewed.complaintDetectList,function (i,item) {
+                            if (i == 0) {
+                                switch (this.detectState) {
+                                    case 1:renewedSchedule += '待仓库转入';break;
+                                    case 2:renewedSchedule += '正在检查';break;
+                                    case 3:renewedSchedule += '检查通过';break;
+                                    case 4:renewedSchedule += '检查未通过';break;
+                                }
+                            }
+                            var detect_tr = '<tr><td>'+convertUndefinedToEmpty(this.detectPhenomenon)+'</td>'
+                                            + '<td>'+convertUndefinedToEmpty(this.detectFailureClassification)+'</td>'
+                                            + '<td>'+convertUndefinedToEmpty(this.detectFailureCause)+'</td>'
+                                            + '<td>'+convertUndefinedToEmpty(this.detectResults)+'</td>'
+                                            + '<td>'+convertUndefinedToEmpty(this.detectPoint)+'</td>'
+                                            + '<td>'+convertUndefinedToEmpty(this.detectAnalysis)+'</td>'
+                                            + '<td>'+convertUndefinedToEmpty(this.detectRevolutionProduced)+'</td></tr>';
+                            detect_table.append(detect_tr);
+                            var maintenance_tr = '<tr><td>'+convertUndefinedToEmpty(this.maintenanceIdRepair)+'</td>'
+                                                + '<td>'+convertUndefinedToEmpty(this.maintenanceContent)+'</td>'
+                                                + '<td>'+convertUndefinedToEmpty(this.maintenanceContentDate)+'</td></tr>';
+                            maintenance_table.append(maintenance_tr);
+                        })
+                    }
+                    $('#renewedSchedule').html(renewedSchedule);
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_repair.ftl

@@ -266,18 +266,9 @@
             </div>
             <div class="formControls col-10 col-sm-10">
                 <table class="table table-border table-bg table-bordered">
-                    <tbody class="text-c"><tr>
+                    <tbody class="text-c" id="detect_table"><tr>
                         <th>工厂检测现象</th><th>故障分类</th><th>故障原因</th><th>判定结果</th><th>故障指向</th><th>原因分析</th><th>生产维修</th>
                     </tr>
-                    <tr>
-                        <td id="repairDetectPhenomenon"></td>
-                        <td id="repairDetectFailureClassification"></td>
-                        <td id="repairDetectFailureCause"></td>
-                        <td id="repairDetectResults"></td>
-                        <td id="repairDetectPoint"></td>
-                        <td id="repairDetectAnalysis"></td>
-                        <td id="repairDetectRevolutionProduced"></td>
-                    </tr>
                     </tbody></table>
             </div>
         </div>
@@ -287,14 +278,9 @@
             </div>
             <div class="formControls col-10 col-sm-10">
                 <table class="table table-border table-bg table-bordered">
-                    <tbody class="text-c"><tr>
+                    <tbody class="text-c" id="maintenance_table"><tr>
                         <th>是否可返修</th><th>返修内容</th><th>返修日期</th>
                     </tr>
-                    <tr>
-                        <td id="repairMaintenanceIdRepair"></td>
-                        <td id="repairMaintenanceContent"></td>
-                        <td id="repairMaintenanceContentDate"></td>
-                    </tr>
                     </tbody></table>
             </div>
         </div>
@@ -317,10 +303,6 @@
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
-<#--<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>-->
 <script type="text/javascript">
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码
@@ -528,6 +510,7 @@
             success: function(data){
                 if (data.returnCode == 200) {
                     var repair = data.returnMsg.repair;
+                    console.log(repair);
                     getProvince('repairProvinceNumber');
                     getCity('repairCityNumber',repair.provinceNumber);
                     getDistrict('repairAreaNumber',repair.cityNumber);
@@ -542,12 +525,6 @@
                         case 2:repairSchedule += '已寄出,';break;
                         case 3:repairSchedule += '已收货,';break;
                     }
-                    switch (repair.detectState) {
-                        case 1:repairSchedule += '待仓库转入';break;
-                        case 2:repairSchedule += '正在检查';break;
-                        case 3:repairSchedule += '检查通过';break;
-                        case 4:repairSchedule += '检查未通过';break;
-                    }
                     var repairProduct = '';
                     if (repair.closedProdcues != null && repair.closedProdcues.length > 0) {
                         $.each(repair.closedProdcues,function(index,element){
@@ -585,13 +562,11 @@
                             $(this).iCheck('check');
                         }
                     });
-
                     /*初始化寄回信息*/
                     initBackInfo(repair.repairBackStatus);
                     /*初始化寄出信息*/
                     initSendInfo(repair.repairSendStatus);
 
-                    $('#repairSchedule').html(repairSchedule);
                     $("#repairBackLogisticsCompany option[value='" + repair.repairBackLogisticsCompany + "']").attr("selected","true");
                     $("#repairSendLogisticsCompany option[value='" + repair.repairSendLogisticsCompany + "']").attr("selected","true");
 
@@ -615,16 +590,34 @@
                     $('#repairSendAddress').val(repair.repairSendAddress);
                     $('#repairSendLogisticsNo').val(repair.repairSendLogisticsNo);
                     $('#repairDesc').val(repair.repairDesc);
-                    $('#detectPhenomenon').html(repair.detectPhenomenon);
-                    $('#detectFailureClassification').html(repair.detectFailureClassification);
-                    $('#detectFailureCause').html(repair.detectFailureCause);
-                    $('#detectResults').html(repair.detectResults);
-                    $('#detectPoint').html(repair.detectPoint);
-                    $('#detectAnalysis').html(repair.detectAnalysis);
-                    $('#detectRevolutionProduced').html(repair.detectRevolutionProduced);
-                    $('#maintenanceIdRepair').html(repair.maintenanceIdRepair);
-                    $('#maintenanceContent').html(repair.maintenanceContent);
-                    $('#maintenanceContentDate').html(repair.maintenanceContentDate);
+
+                    var detect_table = $('#detect_table');
+                    var maintenance_table = $('#maintenance_table');
+                    if (repair.complaintDetectList != null) {
+                        $.each(repair.complaintDetectList,function (i,item) {
+                            if (i == 0) {
+                                switch (this.detectState) {
+                                    case 1:repairSchedule += '待仓库转入';break;
+                                    case 2:repairSchedule += '正在检查';break;
+                                    case 3:repairSchedule += '检查通过';break;
+                                    case 4:repairSchedule += '检查未通过';break;
+                                }
+                            }
+                            var detect_tr = '<tr><td>'+convertUndefinedToEmpty(this.detectPhenomenon)+'</td>'
+                                    + '<td>'+convertUndefinedToEmpty(this.detectFailureClassification)+'</td>'
+                                    + '<td>'+convertUndefinedToEmpty(this.detectFailureCause)+'</td>'
+                                    + '<td>'+convertUndefinedToEmpty(this.detectResults)+'</td>'
+                                    + '<td>'+convertUndefinedToEmpty(this.detectPoint)+'</td>'
+                                    + '<td>'+convertUndefinedToEmpty(this.detectAnalysis)+'</td>'
+                                    + '<td>'+convertUndefinedToEmpty(this.detectRevolutionProduced)+'</td></tr>';
+                            detect_table.append(detect_tr);
+                            var maintenance_tr = '<tr><td>'+convertUndefinedToEmpty(this.maintenanceIdRepair)+'</td>'
+                                    + '<td>'+convertUndefinedToEmpty(this.maintenanceContent)+'</td>'
+                                    + '<td>'+convertUndefinedToEmpty(this.maintenanceContentDate)+'</td></tr>';
+                            maintenance_table.append(maintenance_tr);
+                        })
+                    }
+                    $('#repairSchedule').html(repairSchedule);
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/save_produce.ftl

@@ -50,6 +50,15 @@
                         <option value="D">其他(D)</option>
                     </select>
                 </div>
+                <div class="input-box "><span class="input-dic">所属公众号</span>
+                    <select class="" style="width: 290px;" id="wechatMpId" name="wechatMpId">
+                    <#if (listWechatMp?size > 0)>
+                        <#list listWechatMp as list>
+                        <option value="${list.wechatMpId!''}">${list.wechatMpName!''}</option>
+                        </#list>
+                    </#if>
+                    </select>
+                </div>
                 <div class="input-box"><span class="input-dic">产品型号</span><input class="my-input" style="width: 120px;" type="text" name="producePattern" id="producePattern" value="" placeholder="1-3位英文、数字组合" required  maxlength="3" minlength="1"/>-<input class="my-input" style="width: 120px;" type="text" name="produceModel" id="produceModel" value="" placeholder="1-3位英文、数字组合" required  maxlength="3" minlength="1"/>  </div>
 
                 <div class="input-box"><span class="input-dic">产品类型</span>
@@ -214,6 +223,7 @@
         produce.produceFeature = $("[name='produceFeature']").val();//获取产品特性
         produce.producePattern = $("[name='producePattern']").val();//产品型号
         produce.produceModel = $("[name='produceModel']").val();//产品型号
+        produce.wechatMpId = $("[name='wechatMpId']").val();//公众号id
         return produce;
     }
 

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/update_produce.ftl

@@ -50,6 +50,17 @@
                     <option value ="D" <#if produce.produceFeature??><#if produce.produceFeature == 'D'>selected="selected"</#if></#if>>其他(D)</option>
                 </select>
             </div>
+
+            <div class="input-box "><span class="input-dic">所属公众号</span>
+                <select class="" style="width: 290px;" id="wechatMpId" name="wechatMpId">
+                <#if (listWechatMp?size > 0)>
+                    <#list listWechatMp as list>
+                        <option value="${list.wechatMpId!''}" <#if produce.wechatMpId??><#if produce.wechatMpId == list.wechatMpId>selected="selected"</#if></#if> >${list.wechatMpName!''}</option>
+                    </#list>
+                </#if>
+                </select>
+            </div>
+
             <div class="input-box"><span class="input-dic">产品型号</span><input class="my-input" style="width: 120px;" type="text" name="producePattern" id="producePattern" placeholder="1-3位英文、数字组合" value="${produce.producePattern!}" placeholder="" required  maxlength="3" minlength="1"/>-
                 <input class="my-input" style="width: 120px;" type="text" name="produceModel" id="produceModel" value="${produce.produceModel!}" placeholder="1-3位英文、数字组合" required  maxlength="3" minlength="1"/>  </div>
 
@@ -234,6 +245,7 @@
         produce.produceFeature = $("[name='produceFeature']").val();//获取产品特性
         produce.producePattern = $("[name='producePattern']").val();//产品型号
         produce.produceModel = $("[name='produceModel']").val();//产品型号
+        produce.wechatMpId = $("[name='wechatMpId']").val();//公众号id
 
         produce.delProcessIds = delProcessIds;    //需要删除的工序id
         produce.delNodeIds = delNodeIds;           //需要删除的工序操作id