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-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -253,7 +253,7 @@ public class ResultInfo {
 	/** 	仓库列表url 	*/
 	public static String LISTWAREHOUSE = "https://s.iamberry.com/rst/approval/pro_order_list_index.html?type=3";
 	/** 	售后流程-业务员确认处理方式地址url 	*/
-	public static String DETECT_MSG = "https://s.iamberry.com/rst/detect/detect_msg.html?detectId=";
+	public static String DETECT_MSG = "https://rst.iamberry.com/detect/to_detect_msg?detectId=";
 
 
 	/** 	RST模板消息 end 	*/

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

@@ -65,10 +65,10 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
         int num = 0;
         Integer signclosedId = null;
         Integer flag = 0;
+        List<ComplaintSignclosedInfo> sinfoList = new ArrayList<>();
         //查询是否已存在相同单号
         if(record.getSignclosedLogisticsNumber() != null){
             ComplaintSignclosedInfo info = new ComplaintSignclosedInfo();
-            List<ComplaintSignclosedInfo> sinfoList = new ArrayList<>();
             //判断是否是京东
             if (record.getSignclosedLogisticsNumber().contains("-")){
                 //截取-前的内容搜索一次
@@ -86,11 +86,6 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                 num = complaintSignclosedInfoMapper.insert(record);
                 msg = 1;//添加成功
                 signclosedId = record.getSignclosedId();
-
-                //没有匹配上并且销售公司为‘优尼雅’，‘上朵’时不展示到待联系列表，并且生成维修信息，状态为‘待完善客户信息’
-                if(record.getSignclosedCompanyId() == 3 || record.getSignclosedCompanyId() == 4){
-                    addDet(signclosedId,40);
-                }
             }else{
                 //将签收记录改为已签收
                 ComplaintSignclosedInfo complaintSignclosedInfo = sinfoList.get(0);
@@ -144,6 +139,12 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                     }
                 }
             }
+            //没有匹配上并且销售公司为‘优尼雅’，‘上朵’时不展示到待联系列表，并且生成维修信息，状态为‘待完善客户信息’
+            if(sinfoList.size() <= 0){
+                if(record.getSignclosedCompanyId() == 3 || record.getSignclosedCompanyId() == 4){
+                    addDet(signclosedId,40);
+                }
+            }
             //关联客诉/判断是否关联客诉信息
             try {
                 addDetect(record,2);
@@ -343,25 +344,28 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                             detectInfo.setDetectRenovation(0);
                             detectInfo.setDetectProcessingResults(0);
                             detectInfo.setSignclosedId(sigInfo.getSignclosedId());
-                            detectInfo.setDetectSource(1);
-                            Calendar date = Calendar.getInstance();
-                            date.setTime(new Date());
-                            boolean fl = false;
-                            for (int i = 1 ; i <= 3; i++){
-                                date.set(Calendar.DATE, date.get(Calendar.DATE) + i);
-                                int week = date.get(Calendar.DAY_OF_WEEK);//1--7的值,对应：星期日，星期一，星期二，星期三....星期六
-                                if(week == 1){
-                                    fl = true;
-                                }
-                                date.set(Calendar.DATE, date.get(Calendar.DATE) - i);
-                            }
-                            if(fl){
-                                date.set(Calendar.DATE, date.get(Calendar.DATE) + 4);
-                            }else{
-                                date.set(Calendar.DATE, date.get(Calendar.DATE) + 3);
-                            }
                             if(detectState != 40){
+                                detectInfo.setDetectSource(1);
+                                Calendar date = Calendar.getInstance();
+                                date.setTime(new Date());
+                                boolean fl = false;
+                                for (int i = 1 ; i <= 3; i++){
+                                    date.set(Calendar.DATE, date.get(Calendar.DATE) + i);
+                                    int week = date.get(Calendar.DAY_OF_WEEK);//1--7的值,对应：星期日，星期一，星期二，星期三....星期六
+                                    if(week == 1){
+                                        fl = true;
+                                    }
+                                    date.set(Calendar.DATE, date.get(Calendar.DATE) - i);
+                                }
+                                if(fl){
+                                    date.set(Calendar.DATE, date.get(Calendar.DATE) + 4);
+                                }else{
+                                    date.set(Calendar.DATE, date.get(Calendar.DATE) + 3);
+                                }
+
                                 detectInfo.setMaintenanceCutTime(date.getTime());
+                            }else{
+                                detectInfo.setDetectSource(2);
                             }
                             try {
                                 complaintDetectInfoMapper.insert(detectInfo);

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

@@ -321,7 +321,7 @@
         and cd.detect_state != 40
       </if>
       <if test="detectSource != null and detectSource == 2">
-        and cd.detect_source = #{detectSource}
+        and cd.detect_source = 2 OR cd.detect_state = 40
       </if>
       <if test="salesmanAdminId != null and salesmanAdminId != ''">
         and ssa.admin_id = #{salesmanAdminId}

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

@@ -1272,6 +1272,13 @@ public class AdminDetectController {
             return mv;
         }
 
+        Product product = new Product();
+        List<Product> productList = productService.listProductAndColorAndfittings(product);
+        ProductColor color = new ProductColor();
+        color.setColorProductId(product.getProductId());
+        List<ProductColor> productColorList = productService.listProduceColor(color);
+        mv.addObject("productColorList",productColorList);
+        mv.addObject("productList",productList);
         //查询客诉问题
         ComplaintQuestionInfo complaintQuestionInfo = new ComplaintQuestionInfo();
         complaintQuestionInfo.setDetectComplaintType(1);
@@ -1281,6 +1288,8 @@ public class AdminDetectController {
         admin.setAdminDept(15);
         List<Admin> listAdmin = sysMapper.listAdmin(admin);
         ComplaintDetectInfo detectinfo = complaintDetectInfoService.getDetectById(Integer.valueOf(detectId));
+        List<CompanyInfo> companyInfoList =  companyInfoService.listCompanyInfo(new CompanyInfo());
+        mv.addObject("companyInfoList",companyInfoList);
         mv.addObject("listComplaintQuestionInfo",listComplaintQuestionInfo);
         mv.addObject("listAdmin",listAdmin);
         mv.addObject("detectId",detectId);

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

@@ -182,6 +182,9 @@
                         <#if detect.detectState == 23>
                             <span class="c-success">已报废回收</span>
                         </#if>
+                        <#if detect.detectState == 40>
+                            <span class="c-red">待完善信息<#if detect.maintenanceCutTime??></#if></span>
+                        </#if>
                     </td>
                     <td class="text-c" width="100">${(detect.detectDate?string("yyyy-MM-dd"))!'-'}</td>
                     <!-- 遍历操作 -->
@@ -194,7 +197,7 @@
                             </#if>
                             <#if detect.detectState == 40>
                                 <a style="text-decoration:none" href="javascript:;" title="完善客户信息"
-                                   onclick="add_remark('完善客户信息','${path}/admin/detect/to_perfect_detect?detectId=${detect.detectId!''}','570','450');">
+                                   onclick="add_remark('完善客户信息','${path}/admin/detect/to_perfect_detect?detectId=${detect.detectId!''}','700','750');">
                                     <i class="Hui-iconfont">完善客户信息</i>
                                 </a><br>
                             </#if>

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

@@ -53,9 +53,9 @@
             <div class="formControls col-9">
             </div>
         </div>
-        <div class="row cl">
-            <label class="form-label col-3 col-sm-3" style="padding-right: 10px;"><span class="c-red">*</span>所属公司：</label>
-            <div class="formControls col-9 col-sm-9" style="padding-left: 5px;">
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 11px;"><span class="c-red">*</span>所属公司：</label>
+            <div class="formControls col-xs-9 col-sm-9 skin-minimal" style="margin: 10px 0px;padding-left: 0;">
             <#if companyInfoList?? &&  (companyInfoList?size > 0) >
                 <#list companyInfoList as companyInfo>
                     <div class="radio-box">
@@ -66,13 +66,6 @@
             </#if>
             </div>
         </div>
-
-        <#--<div class="input-box">
-            <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;">
-                <input class="my-input" type="text" style="width:510px;"  name="customerId" id="customerId" placeholder="请输入客诉编号，如没有请留空"/>
-            </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>
         <div class="formControls col-xs-9 col-sm-9 skin-minimal" style="margin: 10px 0px;padding-left: 0;">
@@ -321,8 +314,9 @@
             success: function(data){
                 if (data.returnCode == 200) {
                     layer.msg('操作成功',{icon: 1,time:1000},function () {
-                        location.replace(location.href);
-                        window.location.href= "${path}/admin/detect/detect_repair_list";
+                        window.parent.location.reload();
+                        var index = parent.layer.getFrameIndex(window.name);
+                        parent.layer.close(index);
 
                     });
                 } else {