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

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

@@ -181,6 +181,9 @@ public class CustomerInfo  implements Serializable {
     private Integer beRefurbished;//待翻新条数
     private Integer beScrapped;//待报废条数
     private Integer beContact;//待联系条数
+    private Integer completeMaintenanceNum;//维修完成数量
+    private Integer beenScrappedNum;//已报废的数量
+    private Integer beenRenovatedNum;//已翻新的数量
 
     public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
         this.complaintDetectList = complaintDetectList;
@@ -955,4 +958,28 @@ public class CustomerInfo  implements Serializable {
     public void setBeContact(Integer beContact) {
         this.beContact = beContact;
     }
+
+    public Integer getCompleteMaintenanceNum() {
+        return completeMaintenanceNum;
+    }
+
+    public void setCompleteMaintenanceNum(Integer completeMaintenanceNum) {
+        this.completeMaintenanceNum = completeMaintenanceNum;
+    }
+
+    public Integer getBeenScrappedNum() {
+        return beenScrappedNum;
+    }
+
+    public void setBeenScrappedNum(Integer beenScrappedNum) {
+        this.beenScrappedNum = beenScrappedNum;
+    }
+
+    public Integer getBeenRenovatedNum() {
+        return beenRenovatedNum;
+    }
+
+    public void setBeenRenovatedNum(Integer beenRenovatedNum) {
+        this.beenRenovatedNum = beenRenovatedNum;
+    }
 }

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

@@ -62,6 +62,8 @@ public class ComplaintDetectInfo implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date signclosedDate;//签收时间
 
+    private Date maintenanceCutTime;//待维修截止时间
+
     public Integer getDetectId() {
         return detectId;
     }
@@ -349,4 +351,12 @@ public class ComplaintDetectInfo implements Serializable {
     public void setSignclosedId(Integer signclosedId) {
         this.signclosedId = signclosedId;
     }
+
+    public Date getMaintenanceCutTime() {
+        return maintenanceCutTime;
+    }
+
+    public void setMaintenanceCutTime(Date maintenanceCutTime) {
+        this.maintenanceCutTime = maintenanceCutTime;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/order/ProductColor.java

@@ -49,6 +49,8 @@ public class ProductColor implements Serializable {
 
     private Integer colorIsMachine; //是否是水机 1:水机 2;其它产品
 
+    private String productNumber;        //产品型号
+
     public String getProductName() {
         return productName;
     }
@@ -185,6 +187,14 @@ public class ProductColor implements Serializable {
         this.colorJdProductId = colorJdProductId;
     }
 
+    public String getProductNumber() {
+        return productNumber;
+    }
+
+    public void setProductNumber(String productNumber) {
+        this.productNumber = productNumber;
+    }
+
     @Override
     public String toString() {
         return "ProductColor{" +

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

@@ -400,7 +400,14 @@
     end) as beScrapped,
     COUNT(case detect_state when 30 then 1
     when 34 then 1 WHEN 38 then 1
-    end) as beContact
+    end) as beContact,
+    COUNT(case detect_state when 32 then 1
+    when 36 then 1
+    end) as completeMaintenanceNum,
+    COUNT(case detect_state when 23 then 1
+    end) as beenScrappedNum,
+    COUNT(case detect_state when 21 then 1
+    end) as beenRenovatedNum
     FROM
     tb_rst_complaint_detect
     GROUP BY

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

@@ -175,7 +175,7 @@
     values (
       #{signclosedLogistics,jdbcType=VARCHAR}, #{signclosedLogisticsNumber,jdbcType=VARCHAR},
       #{signclosedSendName,jdbcType=VARCHAR}, #{signclosedSendTel,jdbcType=VARCHAR}, 
-      #{signclosedAddrProvinces,jdbcType=VARCHAR}, #{signclosedAddrCity,jdbcType=VARCHAR},#{signclosedAddrArea,jdbcType=VARCHAR},
+      #{signclosedAddrProvinces,jdbcType=INTEGER}, #{signclosedAddrCity,jdbcType=INTEGER},#{signclosedAddrArea,jdbcType=INTEGER},
       #{signclosedDate,jdbcType=DATE},
       #{signclosedCustomerId,jdbcType=INTEGER},
       #{signclosedDesc,jdbcType=VARCHAR},

watero-rst-service/src/main/java/com/iamberry/rst/service/product/mapper/productMapper.xml

@@ -32,7 +32,8 @@
             c.color_cretae_time colorCretaeTime,
             c.color_update_time colorUpdateTime,
             p.product_name productName,
-            p.Product_type productType,
+            p.product_type productType,
+            p.product_number productNumber,
             pt.type_name productTypeName
         from
           tb_rst_product_color c

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

@@ -30,6 +30,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -103,6 +104,12 @@ public class AdminDetectController {
         if (totalNum != 0) {
             result.setTotal(totalNum);
         }
+        Calendar date = Calendar.getInstance();
+        for (ComplaintDetectInfo info : result.getDataList()){
+            date.setTime(info.getDetectCreateTime());
+            date.set(Calendar.DATE, date.get(Calendar.DATE) + 6);
+            info.setMaintenanceCutTime(date.getTime());
+        }
         //获取所有产品类型
         ProductType productType = new ProductType();
         List<ProductType> productTypeList = productService.listProductType(productType);
@@ -136,6 +143,7 @@ public class AdminDetectController {
             msg.setReturnCode(500);
             return msg;
         }*/
+        detectInfo.setDetectState(1);
         detectInfo.setIsMaintenance(0);
         detectInfo.setDetectRenovation(0);
         detectInfo.setDetectProcessingResults(0);
@@ -482,8 +490,10 @@ public class AdminDetectController {
             msg.setResultCode(500);
             msg.setReturnCode(500);
         } else {
+            ComplaintDetectInfo info = complaintDetectInfoService.getDetectById(detectInfo.getDetectId());
             msg.setResultCode(200);
             msg.setReturnCode(200);
+            msg.addResponseKeyValue("detectInfo",info);
         }
         return msg;
     }

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

@@ -238,6 +238,9 @@
                                 <#if customer.beRefurbished??><#if customer.beRefurbished gt 0 >待翻新：<span class="c-red">${customer.beRefurbished}</span><br></#if></#if>
                                 <#if customer.beScrapped??><#if customer.beScrapped gt 0 >待报废：<span class="c-red">${customer.beScrapped}</span><br></#if></#if>
                                 <#if customer.beContact??><#if customer.beContact gt 0 >待联系：<span class="c-red">${customer.beContact}</span></#if></#if>
+                                <#if customer.completeMaintenanceNum??><#if customer.completeMaintenanceNum gt 0 >维修完成：<span class="c-success">${customer.completeMaintenanceNum}</span></#if></#if>
+                                <#if customer.beenScrappedNum??><#if customer.beenScrappedNum gt 0 >已报废：<span class="c-success">${customer.beenScrappedNum}</span></#if></#if>
+                                <#if customer.beenRenovatedNum??><#if customer.beenRenovatedNum gt 0 >已翻新：<span class="c-success">${customer.beenRenovatedNum}</span></#if></#if>
                             </td>
                             <td>
                                 <#if customer.sendbackInfoList?? &&  (customer.sendbackInfoList?size > 0) >

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

@@ -806,7 +806,7 @@
                                 <tr>
                                 <#--<td class="text-c" width="100">${detect.customerId!}</td>-->
                                     <td class="text-c" width="100">${detect.detectId!''}</td>
-                                    <td class="text-c" width="100">
+                                    <td class="text-c" width="100" id="detectState${(detect.detectId)!}">
                                         <#if detect.detectState == 1>
                                             待检测机器
                                         </#if>
@@ -2934,6 +2934,54 @@
             success: function(data){
                 if (data.returnCode == 200) {
                     layer.msg("操作成功!",{icon: 1,time:1000});
+                    var detectInfo = data.returnMsg.detectInfo;
+                    var detectStateName;
+                    switch (detectInfo.detectState){
+                        case 1:
+                            detectStateName = "待检测机器";
+                            break
+                        case 30:
+                            detectStateName = "待用户确认";
+                            break
+                        case 31:
+                            detectStateName = "用户同意维修（待维修）";
+                            break
+                        case 32:
+                            detectStateName = "维修完成";
+                            break
+                        case 33:
+                            detectStateName = "用户不维修（原机退回）";
+                            break
+                        case 34:
+                            detectStateName = "待客服确认维修";
+                            break
+                        case 35:
+                            detectStateName = "客服确认维修，（待维修）";
+                            break
+                        case 36:
+                            detectStateName = "维修完成";
+                            break
+                        case 37:
+                            detectStateName = "机器无故障，原机退回";
+                            break
+                        case 38:
+                            detectStateName = "机器故障，待用户确认";
+                            break
+                        case 20:
+                            detectStateName = "待翻新入库";
+                            break
+                        case 21:
+                            detectStateName = "已翻新入库";
+                            break
+                        case 22:
+                            detectStateName = "不能翻新，待报废";
+                            break
+                        case 23:
+                            detectStateName = "已报废回收";
+                            break
+                    }
+                    $("#detectState"+detectInfo.detectId).html(detectStateName);
+                    $("#updateDetect").hide();
                 } else {
                     layer.msg("操作失败!",{icon: 5,time:1000});
                 }

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

@@ -68,7 +68,7 @@
         </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;">
                 <input class="my-input" type="text" style="width:510px;"  name="customerId" id="customerId" placeholder="请输入客诉编号，如没有请留空"/>
             </div>

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

@@ -163,13 +163,13 @@
                     <td class="text-c" width="100">${detect.productName!'暂无产品'}(${detect.colorName!'暂无颜色'})</td>
                     <td class="text-c" width="100">
                         <#if detect.detectState == 1>
-                            <span class="c-red">待检测机器</span>
+                            <span class="c-red">待检测机器(${detect.maintenanceCutTime?string("yyyy/MM/dd")}前完成)</span>
                         </#if>
                         <#if detect.detectState == 30>
                             待用户确认
                         </#if>
                         <#if detect.detectState == 31>
-                            用户同意维修（待维修）
+                            <span class="c-red">待维修</span>
                         </#if>
                         <#if detect.detectState == 32>
                             <span class="c-success">维修完成</span>
@@ -181,7 +181,7 @@
                             待客服确认维修
                         </#if>
                         <#if detect.detectState == 35>
-                            客服确认维修，（待维修）
+                            <span class="c-red">待维修</span>
                         </#if>
                         <#if detect.detectState == 36>
                             <span class="c-success">维修完成</span>
@@ -380,6 +380,29 @@
 <script type="text/javascript" src="https://s.iamberry.com/js/LodopFuncs.js"></script>
 <script type="text/javascript" src="${path}/common/lib/jquery.PrintArea/jquery.PrintArea.js"></script>
 <script type="text/javascript">
+    //显示某年某月某日
+    function getForecastTime(date) {
+        date = new Date(date);
+        var nDate = date.getFullYear() + "年";
+        nDate+=date.getMonth() + 1 + "月" + date.getDate() + "日";
+        return nDate;
+    }
+    //日期加减
+    function dateChange(num, date) {
+        debugger;
+        if (!date) {
+            date = new Date();//没有传入值时,默认是当前日期
+            date = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate();
+        }
+        date += " 00:00:00";//设置为当天凌晨12点
+        date = Date.parse(new Date(date))/1000;//转换为时间戳
+        date += (86400) * num;//修改后的时间戳
+        var newDate = new Date(parseInt(date) * 1000);//转换为时间
+        return newDate.getFullYear() + '-' + (newDate.getMonth() + 1) + '-' + newDate.getDate();
+
+    }
+
+
     // 选择打印设备
     var LODOP=getLodop();
     function printPageMaintenance(detectId) {
@@ -397,6 +420,7 @@
                     //清空打印内容
                     $("#detectIdTd").html("");
                     $("#signclosedSendNameTd").html("");
+                    $("#signclosedSendTelTd").html("");
                     $("#signclosedLogisticsNameTd").html("");
                     $("#signclosedLogisticsNumberTd").html("");
                     $("#signclosedDateTd").html("");
@@ -413,6 +437,8 @@
                     if(null != signclosedInfo && "" !=signclosedInfo){
                         if(signclosedInfo.signclosedSendName != null && signclosedInfo.signclosedSendName != ""){
                             $("#signclosedSendNameTd").html(signclosedInfo.signclosedSendName);
+                        }if(signclosedInfo.signclosedSendTel != null && signclosedInfo.signclosedSendTel != ""){
+                            $("#signclosedSendTelTd").html(signclosedInfo.signclosedSendTel);
                         }
                         if(signclosedInfo.signclosedLogisticsName != null && signclosedInfo.signclosedLogisticsName != ""){
                             $("#signclosedLogisticsNameTd").html(signclosedInfo.signclosedLogisticsName);

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

@@ -113,7 +113,9 @@
                             <tr class="text-c" id="table1">
                                 <th style="text-align: center;" width="30" >产品名称</th>
                                 <th style="text-align: center;" width="25" >产品颜色</th>
-                                <th style="text-align: center;" width="10">售价</th>
+                                <#--<th style="text-align: center;" width="10">售价</th>-->
+                                <th style="text-align: center;" width="10">69码</th>
+                                <th style="text-align: center;" width="10">产品型号</th>
                                 <th style="text-align: center;" width="10">数量</th>
                                 <th style="text-align: center;" width="10">操作</th>
                             </tr>
@@ -194,7 +196,7 @@
                 </div>
                 <div class="formControls col-2 col-sm-2">
                     <span class="select-box">
-                        <select name="cityNumber" class="select" id="city"
+                        <select name="cityNumber" class="select" id="citys"
                                 ulcValName="city" ulcValId="cityId"  ulcURL="/address/list_city?provinceId=" ulcMsg="" ulcList="cityList"
                                 ulcIsFristSelect="true" ulcFristSelectMsg="请选择市">
                         </select>
@@ -396,13 +398,9 @@
                 return;
             }
         }
-        //设置省市县
-        var provinces = $("#provinces").find("option:selected").val();
-        var city = $("#city").find("option:selected").val();
-        var area = $("#area").find("option:selected").val();
-        $("#signclosedAddrProvinces").val(provinces);
-        $("#signclosedAddrCity").val(city);
-        $("#signclosedAddrArea").val(area);
+
+
+
 
         //选择产品
         var flag = false;
@@ -420,6 +418,26 @@
             return false;
         }
 
+        //设置省市县
+        var provinces = $("#provinces").find("option:selected").val();
+        var city = $("#citys").find("option:selected").val();
+        var area = $("#area").find("option:selected").val();
+        if(provinces != null && provinces != ""){
+            $("#signclosedAddrProvinces").val(provinces);
+        }else{
+            $("#signclosedAddrProvinces").remove();
+        }
+        if(city != null && city != ""){
+            $("#signclosedAddrCity").val(city);
+        }else{
+            $("#signclosedAddrCity").remove();
+        }
+        if(area != null && area != ""){
+            $("#signclosedAddrArea").val(area);
+        }else{
+            $("#signclosedAddrArea").remove();
+        }
+
         $("#orderItemString").val(JSON.stringify(orderItemArray));
 
         $.ajax({
@@ -503,7 +521,8 @@
                                     '<input type="hidden" class="color_id" id="" value="'+ productColor.colorId +'" >' +
                                     ' <td>'+ cufte(productColor.productName) +'</td>' +
                                     ' <td>'+ cufte(productColor.colorName) +'</td>' +
-                                    ' <td>'+ cufte(productColor.colorPrice)/100 +'</td>' +
+                                    ' <td>'+ cufte(productColor.colorBar) +'</td>' +
+                                    ' <td>'+ cufte(productColor.productNumber) +'</td>' +
                                     ' <td><input type="text" class="input-text input-number item-num"  style="width: 100%;border: none;text-align: center;" name="" id="" placeholder="产品数量" value="1" onkeyup="keyFun($(this),999,1)" onpaste="keyFun($(this),999,1)"></td>' +
                                     ' <td><a href="javascript:void(0)" class="del_product all_down" onclick="delProduct($(this))" >删除</a></td>' +
                                     ' </tr>';