修改了换新，维修等页面

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

@@ -57,6 +57,24 @@ public class Reissue  implements Serializable {
 
     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<SendProdcue> getSendProdcues() {
+        return sendProdcues;
+    }
+
+    public void setSendProdcues(List<SendProdcue> sendProdcues) {
+        this.sendProdcues = sendProdcues;
+    }
+
+    public List<SendFitting> getSendFittings() {
+        return sendFittings;
+    }
+
+    public void setSendFittings(List<SendFitting> sendFittings) {
+        this.sendFittings = sendFittings;
+    }
 
     public Date getSalesPayTime() {
         return salesPayTime;

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

@@ -91,8 +91,25 @@ public class Renewed  implements Serializable {
     private String salesDealCode;               //交易号
 
     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>();//寄送配件集合
 
-    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//机会产品集合
+    public List<SendProdcue> getSendProdcues() {
+        return sendProdcues;
+    }
+
+    public void setSendProdcues(List<SendProdcue> sendProdcues) {
+        this.sendProdcues = sendProdcues;
+    }
+
+    public List<SendFitting> getSendFittings() {
+        return sendFittings;
+    }
+
+    public void setSendFittings(List<SendFitting> sendFittings) {
+        this.sendFittings = sendFittings;
+    }
 
     public Date getSalesPayTime() {
         return salesPayTime;

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

@@ -90,8 +90,25 @@ public class Repair implements Serializable {
     private Date salesPayTime;                  //支付时间
     private String salesDealCode;               //交易号
     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<SendProdcue> getSendProdcues() {
+        return sendProdcues;
+    }
+
+    public void setSendProdcues(List<SendProdcue> sendProdcues) {
+        this.sendProdcues = sendProdcues;
+    }
+
+    public List<SendFitting> getSendFittings() {
+        return sendFittings;
+    }
+
+    public void setSendFittings(List<SendFitting> sendFittings) {
+        this.sendFittings = sendFittings;
+    }
 
     public Date getSalesPayTime() {
         return salesPayTime;

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

@@ -961,21 +961,22 @@ public class CustomerServiceImpl implements CustomerService {
             return null;
         }
         Reissue reissueInfo = reissueList.get(0);
-        ClosedProdcue closedProdcue = new ClosedProdcue();
-        closedProdcue.setRelationId(reissueInfo.getReissueId());
-        closedProdcue.setClosedProdcueType(6);
-        //查询寄回产品集合
-        List<ClosedProdcue> prodcueList = closedProdcueMapper.listclosedProdcue(closedProdcue);
-        ClosedFitting fitting = new ClosedFitting();
-        fitting.setRelationId(reissueInfo.getReissueId());
-        fitting.setClosedFittingType(6);
-        //查询寄回配件集合
-        List<ClosedFitting> fittingList = closedFittingMapper.listClosedFitting(fitting);
-        if (prodcueList != null && prodcueList.size() > 0) {
-            reissueInfo.setClosedProdcues(prodcueList);
+        SendProdcue sendProdcue = new SendProdcue();
+        sendProdcue.setRelationId(reissueInfo.getReissueId());
+        sendProdcue.setSendProduceType(5);
+        //查询寄送产品集合
+        List<SendProdcue> sendProdcueList = sendProdcueMapper.listSendProdcue(sendProdcue);
+        SendFitting sendFitting = new SendFitting();
+        sendFitting.setRelationId(reissueInfo.getReissueId());
+        sendFitting.setSendFittingType(5);
+        //查询寄送配件集合
+        List<SendFitting> sendFittingList = sendFittingMapper.listSendFitting(sendFitting);
+
+        if (sendProdcueList != null && sendProdcueList.size() > 0) {
+            reissueInfo.setSendProdcues(sendProdcueList);
         }
-        if (fittingList != null && fittingList.size() > 0) {
-            reissueInfo.setClosedFittings(fittingList);
+        if (sendFittingList != null && sendFittingList.size() > 0) {
+            reissueInfo.setSendFittings(sendFittingList);
         }
         return reissueInfo;
     }
@@ -996,12 +997,30 @@ public class CustomerServiceImpl implements CustomerService {
         fitting.setClosedFittingType(3);
         //查询寄回配件集合
         List<ClosedFitting> fittingList = closedFittingMapper.listClosedFitting(fitting);
+        SendProdcue sendProdcue = new SendProdcue();
+        sendProdcue.setRelationId(renewed.getRenewedId());
+        sendProdcue.setSendProduceType(3);
+        //查询寄送产品集合
+        List<SendProdcue> sendProdcueList = sendProdcueMapper.listSendProdcue(sendProdcue);
+        SendFitting sendFitting = new SendFitting();
+        sendFitting.setRelationId(renewed.getRenewedId());
+        sendFitting.setSendFittingType(3);
+        //查询寄送配件集合
+        List<SendFitting> sendFittingList = sendFittingMapper.listSendFitting(sendFitting);
+
         if (prodcueList != null && prodcueList.size() > 0) {
             renewed.setClosedProdcues(prodcueList);
         }
         if (fittingList != null && fittingList.size() > 0) {
             renewed.setClosedFittings(fittingList);
         }
+        if (sendProdcueList != null && sendProdcueList.size() > 0) {
+            renewed.setSendProdcues(sendProdcueList);
+        }
+        if (sendFittingList != null && sendFittingList.size() > 0) {
+            renewed.setSendFittings(sendFittingList);
+        }
+
         return renewed;
     }
 
@@ -1021,12 +1040,29 @@ public class CustomerServiceImpl implements CustomerService {
         fitting.setClosedFittingType(4);
         //查询寄回配件集合
         List<ClosedFitting> fittingList = closedFittingMapper.listClosedFitting(fitting);
+        SendProdcue sendProdcue = new SendProdcue();
+        sendProdcue.setRelationId(repair.getRepairId());
+        sendProdcue.setSendProduceType(4);
+        //查询寄送产品集合
+        List<SendProdcue> sendProdcueList = sendProdcueMapper.listSendProdcue(sendProdcue);
+        SendFitting sendFitting = new SendFitting();
+        sendFitting.setRelationId(repair.getRepairId());
+        sendFitting.setSendFittingType(4);
+        //查询寄送配件集合
+        List<SendFitting> sendFittingList = sendFittingMapper.listSendFitting(sendFitting);
+
         if (prodcueList != null && prodcueList.size() > 0) {
             repair.setClosedProdcues(prodcueList);
         }
         if (fittingList != null && fittingList.size() > 0) {
             repair.setClosedFittings(fittingList);
         }
+        if (sendProdcueList != null && sendProdcueList.size() > 0) {
+            repair.setSendProdcues(sendProdcueList);
+        }
+        if (sendFittingList != null && sendFittingList.size() > 0) {
+            repair.setSendFittings(sendFittingList);
+        }
         return repair;
     }
 }

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

@@ -892,7 +892,7 @@ public class AdminCustomerController {
     }
 
     /**
-     * 进入修改换新页面
+     * 进入修改维修页面
      * @param request
      * @return
      * @throws Exception

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

@@ -35,11 +35,11 @@
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerName!}" placeholder="请输入姓名" id="customerName" name="customerName">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerTel!}" placeholder="请输入电话号码" id="customerTel" name="customerTel">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.describeTitle!}" placeholder="请输入问题描述" id="describeTitle" name="describeTitle">
-            <select class="my-select" name="customerSource" id="customerSource" style="height: 36px;width: 100px;margin: 0px;padding: 6px 10px 6px 15px;">
+            <select class="my-select" name="customerSourceType" id="customerSourceType" style="height: 36px;width: 100px;margin: 0px;padding: 6px 10px 6px 15px;">
                 <option value="">来源</option>
-                <option value="1" <#if customerInfo.customerSourceType??><#if customerInfo.customerSourceType == "1" >selected="selected"</#if></#if>>400电话</option>
-                <option value="2" <#if customerInfo.customerSourceType??><#if customerInfo.customerSourceType == "2" >selected="selected"</#if></#if>>微信公众号</option>
-                <option value="3" <#if customerInfo.customerSourceType??><#if customerInfo.customerSourceType == "3" >selected="selected"</#if></#if>>其他</option>
+                <option value="1" <#if customerInfo.customerSourceType??><#if customerInfo.customerSourceType == 1 >selected="selected"</#if></#if>>400电话</option>
+                <option value="2" <#if customerInfo.customerSourceType??><#if customerInfo.customerSourceType == 2 >selected="selected"</#if></#if>>微信公众号</option>
+                <option value="3" <#if customerInfo.customerSourceType??><#if customerInfo.customerSourceType == 3 >selected="selected"</#if></#if>>其他</option>
             </select>
             <select class="my-select" name="typeId" id="typeId" style="height: 36px;width: 120px;margin: 0px;">
                 <option value ="">客诉产品</option>
@@ -121,7 +121,7 @@
                             <td>${customer.complaintClassName!''}</td>
                             <td>${customer.smallClassName!''}</td>
                             <td>
-                                ${customer.describeTitle!'暂无'}
+                                ${customer.describeTitle!'暂无'}<br/>
                                     <#if customer.describeTitle??>
                                         <a style="text-decoration:none;" href="javascript:void(0);" title="查看详情" onclick="getDescribeInfo(${customer.customerId!''})">
                                             <font color=#06c>查看详情</font>

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

@@ -87,7 +87,7 @@
                 <strong>补寄产品</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div id="reissueProduct" class="update-parts"></div>
+                <div id="sendProduct" class="update-parts"></div>
             </div>
         </div>
 
@@ -206,17 +206,19 @@
                             $(this).iCheck('check');
                         }
                     });
-                    var reissueProduct = '';
-                    if (reissue.closedProdcues != null && reissue.closedProdcues.length > 0) {
-                        $.each(reissue.closedProdcues,function(index,element){
-                            reissueProduct += '<span>'+ this.closedProductName + '*' + this.closedProdcueNumber + '台</span>';
+
+                    var sendProduct = '';
+                    if (reissue.sendProdcues != null && reissue.sendProdcues.length > 0) {
+                        $.each(reissue.sendProdcues,function(index,element){
+                            sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendProduceName + '*' + this.sendProdcueNumber + '台</span>';
                         })
                     }
-                    if (reissue.closedFittings != null && reissue.closedFittings.length > 0) {
-                        $.each(reissue.closedFittings,function(index,element){
-                            reissueProduct += '<span>'+ this.fittingName + '*' + this.closedFittingNumber + '件</span>';
+                    if (reissue.sendFittings != null && reissue.sendFittings.length > 0) {
+                        $.each(reissue.sendFittings,function(index,element){
+                            sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendProductName + '*' + this.sendFittingNumber + '件</span>';
                         })
                     }
+                    $('#sendProduct').html(sendProduct);
 
                     getProvince('reissueProvinceNumber');
                     getCity('reissueCityNumber',reissue.provinceNumber);

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

@@ -246,7 +246,7 @@
                 <strong>寄出产品</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div class="update-parts"></div>
+                <div class="update-parts" id="sendProduct"></div>
             </div>
         </div>
         <div class="row cl">
@@ -516,6 +516,20 @@
                             renewedProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.fittingName + '*' + this.closedFittingNumber + '件</span>';
                         })
                     }
+                    $('#renewedProduct').html(renewedProduct);
+                    var sendProduct = '';
+                    if (renewed.sendProdcues != null && renewed.sendProdcues.length > 0) {
+                        $.each(renewed.sendProdcues,function(index,element){
+                            sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendProduceName + '*' + this.sendProdcueNumber + '台</span>';
+                        })
+                    }
+                    if (renewed.sendFittings != null && renewed.sendFittings.length > 0) {
+                        $.each(renewed.sendFittings,function(index,element){
+                            sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendProductName + '*' + this.sendFittingNumber + '件</span>';
+                        })
+                    }
+                    $('#sendProduct').html(sendProduct);
+
                     $('#renewedId').val(renewed.renewedId);
                     $('input[name="renewedBackStatus"]').each(function(){
                         if (this.value == renewed.renewedBackStatus) {
@@ -528,7 +542,6 @@
                         }
                     });
                     $('#renewedSchedule').html(renewedSchedule);
-                    $('#renewedProduct').html(renewedProduct);
                     $("#renewedBackLogisticsCompany option[value='" + renewed.renewedBackLogisticsCompany + "']").attr("selected","true");
                     $("#renewedSendLogisticsCompany option[value='" + renewed.renewedSendLogisticsCompany + "']").attr("selected","true");
 

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

@@ -247,7 +247,7 @@
                 <strong>寄出产品</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div class="update-parts"></div>
+                <div class="update-parts" id="sendProduct"></div>
             </div>
         </div>
         <div class="row cl">
@@ -516,6 +516,21 @@
                             repairProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.fittingName + '*' + this.closedFittingNumber + '件</span>';
                         })
                     }
+                    $('#repairProduct').html(repairProduct);
+
+                    var sendProduct = '';
+                    if (repair.sendProdcues != null && repair.sendProdcues.length > 0) {
+                        $.each(repair.sendProdcues,function(index,element){
+                            sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendProduceName + '*' + this.sendProdcueNumber + '台</span>';
+                        })
+                    }
+                    if (repair.sendFittings != null && repair.sendFittings.length > 0) {
+                        $.each(repair.sendFittings,function(index,element){
+                            sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendProductName + '*' + this.sendFittingNumber + '件</span>';
+                        })
+                    }
+                    $('#sendProduct').html(sendProduct);
+
                     $('#repairId').val(repair.repairId);
                     $('input[name="repairBackStatus"]').each(function(){
                         if (this.value == repair.repairBackStatus) {
@@ -528,7 +543,6 @@
                         }
                     });
                     $('#repairSchedule').html(repairSchedule);
-                    $('#repairProduct').html(repairProduct);
                     $("#repairBackLogisticsCompany option[value='" + repair.repairBackLogisticsCompany + "']").attr("selected","true");
                     $("#repairSendLogisticsCompany option[value='" + repair.repairSendLogisticsCompany + "']").attr("selected","true");