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

# Conflicts:
#	watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java

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

@@ -99,4 +99,9 @@ public interface ComplaintSignclosedInfoService {
      * @return
      */
     Integer getSignclosedDay(ComplaintSignclosedInfo complaintSignclosedInfo);
+    /**
+     * 改为优尼雅客户
+     * @return
+     */
+    Integer updateSignclosedByYny(ComplaintSignclosedInfo record);
 }

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

@@ -444,6 +444,38 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
         return complaintSignclosedInfoMapper.getSignclosedDay(complaintSignclosedInfo);
     }
 
+    @Override
+    @Transactional
+    public Integer updateSignclosedByYny(ComplaintSignclosedInfo record) {
+        int num = complaintSignclosedInfoMapper.updateSignclosedById(record);
+        if(num > 0){
+            try {
+                ComplaintSignclosedInfo signclosedInfo = complaintSignclosedInfoMapper.getSignclosedById(record.getSignclosedId());
+                //新增维修记录
+                if(signclosedInfo != null && signclosedInfo.getSignclosedProductInfoList().size() > 0){
+                    for (SignclosedProductInfo productInfo : signclosedInfo.getSignclosedProductInfoList()){
+                        Product product = productMapper.getProduce(productInfo.getSignclosedProductId());
+                        if (product.getProductIsDetection() == 1) {
+                            ComplaintDetectInfo  info = new ComplaintDetectInfo();
+                            info.setDetectState(40);
+                            info.setDetectSource(1);
+                            info.setProductId(productInfo.getSignclosedProductId());
+                            info.setProductColorId(productInfo.getSignclosedProductColor());
+                            info.setSignclosedId(record.getSignclosedId());
+                            complaintDetectInfoMapper.insert(info);
+                        }
+                    }
+                }
+            }catch (Exception e){
+                throw new RuntimeException("------------改为优尼雅客户生成检测信息出错------------");
+            }
+
+        }else{
+            return num;
+        }
+        return 1;
+    }
+
     private Integer addSifnclosed(Map<String,Integer> Map,Integer signclosedId) {
         Integer msg = 0;
         for (Map.Entry<String, Integer> entry : Map.entrySet()) {

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

@@ -738,6 +738,7 @@
       LEFT JOIN tb_rst_cm_proc_method cpm ON cpm.proc_method_id = cr.proc_method_id
       LEFT JOIN tb_rst_cm_proc_type cpt ON cpt.proc_type_id = cpm.proc_type_id
         <where>
+          ci.customer_id is NOT NULL
             <if test="adminId != null and adminId != ''" >
                 AND ci.admin_id = #{adminId}
             </if>

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

@@ -243,6 +243,9 @@
       <if test="signclosedIsWhetherLess != null" >
         signclosed_is_whetherLess = #{signclosedIsWhetherLess,jdbcType=INTEGER}
       </if>
+      <if test="signclosedCompanyId != null" >
+        signclosed_company_id = #{signclosedCompanyId,jdbcType=INTEGER}
+      </if>
     </set>
       where
           signclosed_id = #{signclosedId,jdbcType=INTEGER}

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

@@ -460,5 +460,33 @@ public class AdminSignclosedController {
         }
         return msg;
     }
+    /**
+     * 改为优尼雅客户并增加维修记录
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("signclosed:update:signclosed")
+    @RequestMapping(value = "/update_company")
+    public ResponseJson updateCompany(HttpServletRequest request,ComplaintSignclosedInfo signclosedInfo){
+        ResponseJson msg = new ResponseJson();
+        if(signclosedInfo == null || signclosedInfo.getSignclosedCompanyId() == null){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        int num = complaintSignclosedInfoService.updateSignclosedByYny(signclosedInfo);
+
+        if (num < 1) {
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+        } else {
+            msg.setResultCode(200);
+            msg.setReturnCode(200);
+
+        }
+        return msg;
+    }
+
 }
 

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

@@ -514,9 +514,10 @@
 
             <div class="row cl renewedProduct" id="" style="display: none">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span><span id="relationProduct">寄回产品</span>：</label>
-                <div class="formControls col-1 col-sm-1">
-                    <button type="button" class="btn btn-primary" id="" onclick="addProduct(1)">添加产品</button>
+                <div class="formControls col-9 col-sm-9">
+                    <button type="button" class="btn btn-primary" id="" onclick="addProduct(1)">添加产品</button><span>&nbsp;&nbsp;&nbsp;&nbsp;请完整选择要退回的机器，如有不退回的请删除产品项或者填写数量0 。</span>
                 </div>
+
             </div>
             <div class="row cl renewedProduct" id="" style="display: none">
                 <label class="form-label col-1 col-sm-1"></label>

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

@@ -526,8 +526,8 @@
 
             <div class="row cl renewedProduct" id="" style="display: none;">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span><span id="relationProduct">寄回产品</span>：</label>
-                    <div class="formControls col-1 col-sm-1">
-                            <button type="button" class="btn btn-primary" id="" onclick="addProduct(1)">添加产品</button>
+                    <div class="formControls col-9 col-sm-9">
+                            <button type="button" class="btn btn-primary" id="" onclick="addProduct(1)">添加产品</button><span>&nbsp;&nbsp;&nbsp;&nbsp;请完整选择要退回的机器，如有不退回的请删除产品项或者填写数量0 。</span>
                     </div>
                     <div class="formControls col-9 col-sm-9 text-c" id="produceSelect">
                 </div>

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

@@ -1310,14 +1310,19 @@
             var sendbackTel = $("#sendbackTel").val();
             var sendbackSignTime = $("#sendbackSignTime").val();
             var sendProdcues = new Array();  //寄出产品表
-
+            var num = 0;
             $("#productbodyId").find(".input-prodcueNumber-id").each(function () {
                 var product = new Object();
                 product.sendbackProdcueNumber = $(this).val();
                 product.sendbackProductId = $(this).parents("tr").find(".input-produce-id").eq(0).val();    //产品id
                 product.sendbackColorId = $(this).parents("tr").find(".input-color-id").eq(0).val();    //颜色id
                 sendProdcues.push(product);
+                num = num+ parseInt(product.sendbackProdcueNumber);
             });
+            if(num === 0){
+                layer.msg("产品数量不能为0!",{icon: 5,time:2000});
+                return;
+            }
             $("#sendProdcues").val(JSON.stringify(sendProdcues));
             var SendProdcues = $("#sendProdcues").val();
             if(sendbackStatus == null || sendbackStatus == ""){
@@ -1363,7 +1368,8 @@
                             $("#colspanSendbackId").remove();
                             sendbackInfo = data.returnMsg.sendbackInfo;
                             var sendbackStatus;
-                            var htmls = '<a onclick="deleteSendbackInfo('+sendbackInfo.sendbackId+');">删除</a>&nbsp&nbsp<a onclick="getSendbackInfo('+sendbackInfo.sendbackId+');">修改</a>&nbsp&nbsp<a onclick="updateSendbackStatus('+sendbackInfo.sendbackId+');">签收</a>';
+                            /*var htmls = '<a onclick="deleteSendbackInfo('+sendbackInfo.sendbackId+');">删除</a>&nbsp&nbsp<a onclick="getSendbackInfo('+sendbackInfo.sendbackId+');">修改</a>&nbsp&nbsp<a onclick="updateSendbackStatus('+sendbackInfo.sendbackId+');">签收</a>';*/
+                            var htmls = '<a onclick="deleteSendbackInfo('+sendbackInfo.sendbackId+');">删除</a>&nbsp&nbsp<a onclick="getSendbackInfo('+sendbackInfo.sendbackId+');">修改</a>';
                             if(sendbackInfo.sendbackStatus == 1){
                                 sendbackStatus = "未配送";
                             }
@@ -1394,7 +1400,7 @@
                     }
                 },
                 error: function(XmlHttpRequest, textStatus, errorThrown){
-                    window.parent.admin_result("修改失败!",5);
+                    window.parent.admin_result("添加失败!",5);
                 }
                 })
     }
@@ -1409,7 +1415,7 @@
         var sendbackTel = $("#sendbackTels").val();
         /*var sendbackSignTime = $("#sendbackSignTimes").val();*/
         var sendProdcues = new Array();  //寄出产品表
-
+        var num = 0;
         $("#productbodyIds").find(".input-prodcueNumber-ids").each(function () {
             var product = new Object();
             product.sendbackProdcueNumber = $(this).val();
@@ -1417,7 +1423,12 @@
             product.sendbackColorId = $(this).parents("tr").find(".input-color-ids").eq(0).val();    //颜色id
             product.sendbackItemId = $(this).parents("tr").find(".input-item-ids").eq(0).val();    //寄回项主键
             sendProdcues.push(product);
+            num = num+ parseInt(product.sendbackProdcueNumber);
         });
+        if(num === 0){
+            layer.msg("产品数量不能为0!",{icon: 5,time:2000});
+            return;
+        }
         $("#sendProdcues").val(JSON.stringify(sendProdcues));
         var SendProdcues = $("#sendProdcues").val();
         if(sendbackStatus == null || sendbackStatus == ""){

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_repair_list.ftl

@@ -120,30 +120,29 @@
             <thead>
             <tr class="text-c">
                 <#--<th width="100">客诉编号</th>-->
+                    <th width="100">维修编号</th>
+                    <th width="100">寄回单号</th>
+                    <th width="100">寄件人信息</th>
                 <th width="100">所属业务员</th>
-                <th width="100">维修编号</th>
                 <th width="100">客户信息</th>
                 <th width="100">客户问题</th>
-                <th width="100">寄件人信息</th>
-                <th width="100">寄回单号</th>
                 <th width="100">机器信息</th>
                 <th width="100">维修状态</th>
                 <th width="100">检测日期</th>
                 <th width="120">操作</th>
             </tr>
             </thead>
-            <tbody id="listid">
+            <tbody id="listid">1
             <#if (page.dataList?size > 0)>
                 <#list page.dataList as detect>
                 <tr>
                     <#--<td class="text-c" width="100">${detect.customerId!}</td>-->
-                    <td class="text-c" width="100">${detect.salesmanAdminName!''}</td>
                     <td class="text-c" width="100">${detect.detectNumber!''}</td>
-                    <td class="text-c" width="100">${detect.detectName!''}<br>${detect.detectTel!''}</td>
-                    <td class="text-c" width="100">${detect.questionName!''}</td>
-                    <td class="text-c" width="100">${detect.signclosedName!''}-${detect.signclosedTel!''}</td>
                     <td class="text-c" width="100">${detect.logisticsNumber!''}</td>
-
+                    <td class="text-c" width="100">${detect.signclosedName!''}-${detect.signclosedTel!''}</td>
+                    <td class="text-c" width="100">${detect.salesmanAdminName!''}</td>
+                    <td class="text-c" width="100">${detect.questionName!''}</td>
+                    <td class="text-c" width="100">${detect.detectName!''}<br>${detect.detectTel!''}</td>
                     <td class="text-c" width="100">${detect.productName!'暂无产品'}(${detect.colorName!'暂无颜色'})</td>
                     <td class="text-c" width="100">
                         <#if detect.detectState == 1>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/perfect_detect.ftl

@@ -80,7 +80,7 @@
         </div>
     </div>
     <div class="input-box">
-        <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;"><span class="c-red">*</span>业务员：</label>
+        <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;">业务员：</label>
         <div class="formControls col-xs-9 col-sm-9 skin-minimal" style="margin: 10px 0px;padding-left: 0;">
             <select id="salesmanAdminId" name="salesmanAdminId" class="chosen" style="width: 93%;">
                 <option value="">请选择业务员</option>
@@ -289,11 +289,11 @@
             layer.msg('请选择客户问题',{icon: 5,time:1000});
             return;
         }
-        var salesmanAdminId = $("#salesmanAdminId").val();
+        /*var salesmanAdminId = $("#salesmanAdminId").val();
         if( salesmanAdminId == null || salesmanAdminId == "" ){
             layer.msg('请选择业务员',{icon: 5,time:1000});
             return;
-        }
+        }*/
         var detectName = $("#detectName").val();
         if( detectName == null || detectName == "" ){
             layer.msg('请输入客户名称',{icon: 5,time:1000});

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/customer_signclosed_list.ftl

@@ -137,6 +137,12 @@
                                  <i>关联客诉</i>
                              </a>
                         </#if>
+                        <#if signclosed.signclosedCompanyId == 1 || signclosed.signclosedCompanyId == 2>
+                             <a style="text-decoration:none" href="javascript:;" title="优尼雅客户"
+                              onclick="into_Yny(${signclosed.signclosedId!''});">
+                                 <i>优尼雅客户</i>
+                             </a>
+                        </#if>
                     </td>
                 </tr>
                 </#list>
@@ -237,6 +243,31 @@
         });
     }
 
+    /*优尼雅客户*/
+    function into_Yny(signclosedId){
+        layer.alert('确定改为优尼雅客户吗？', function () {
+            $.ajax({
+                cache: true,
+                type: "POST",
+                url: "${path}/admin/signclosed/update_company",
+                data:{"signclosedId":signclosedId,
+                      "signclosedCompanyId" : 3},
+                async: false,
+                success: function(data){
+                    if (data.returnCode == 200) {
+                        layer.msg('修改成功',{icon: 1,time:1000},function () {
+                            location.replace(location.href);
+                        });
+                    } else {
+                        layer.msg('修改失败',{icon: 5,time:1000});
+                    }
+                },
+                error: function(XmlHttpRequest, textStatus, errorThrown){
+                    layer.msg('操作错误',{icon: 5,time:1000});
+                }
+            });
+        });
+    }
 </script>
 </body>
 </html>