近期更改。

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

@@ -123,6 +123,7 @@
     LEFT JOIN tb_rst_cm_proc_type cpts on cpms.proc_type_id = cpts.proc_type_id
     LEFT JOIN tb_rst_store_info si on cs.signclosed_store_id = si.store_id
     LEFT JOIN tb_rst_store_info ssi on cd.store_id = ssi.store_id
+    left join tb_rst_complaint_detect_transport t on t.detect_id = cd.detect_id
     <where>
       <if test="productTypeId != null" >
         AND pt.type_id = #{productTypeId,jdbcType=INTEGER}
@@ -173,7 +174,7 @@
         AND cd.detect_number like CONCAT('%',#{detectNumber},'%')
       </if>
       <if test="logisticsNumber != null and logisticsNumber != ''" >
-        AND cs.signclosed_logistics_number = #{logisticsNumber}
+        AND ((cs.signclosed_logistics_number = #{logisticsNumber}) OR (t.transport_send_post LIKE CONCAT('%', #{logisticsNumber}, '%')))
       </if>
       <if test="signclosedDate != null and signclosedDate != ''" >
         AND cs.signclosed_date = #{signclosedDate}
@@ -312,6 +313,8 @@
          tb_rst_cm_proc_method m on d.method_id = m.proc_method_id
     left join
          tb_rst_cm_complaint_question q on q.question_id = d.question_id
+    left join
+         tb_rst_complaint_detect_transport t on t.detect_id = d.detect_id
     <where>
       d.admin_id IS NOT NULL
       <if test="detectState != null and detectState != 0">
@@ -326,9 +329,15 @@
           #{storeId}
         </foreach >
       </if>
+      <if test="detectNumber != null and detectNumber != ''">
+        AND d.detect_number LIKE CONCAT('%', #{detectNumber}, '%')
+      </if>
       <if test="machineNo != null and machineNo != ''">
         AND d.machine_no LIKE CONCAT('%', #{machineNo}, '%')
       </if>
+      <if test="logisticsNumber != null and logisticsNumber != ''">
+        AND t.transport_send_post LIKE CONCAT('%', #{logisticsNumber}, '%')
+      </if>
       <if test="productName != null and productName != ''">
         AND p.product_name LIKE CONCAT('%', #{productName}, '%')
       </if>

watero-rst-web/src/main/webapp/WEB-INF/views/yulia/edit_transport.ftl

@@ -47,6 +47,11 @@
             <label class="form-label col-xs-4 col-sm-3" style="padding-left: 0;margin-left: 0px;width: 16%;"><h5 style="font-weight: bold;">寄送客户信息</h5></label>
         </div>
         <div class="row cl">
+            <pre style="margin-left: 18%;margin-right: 10%;">
+寄回客户信息：是指您填机器维修好以后寄回给客户的地址，您填写此地址以后，我司维修人员就可以直接打单发货，发货后您可以在售后列表查看寄出机器进度、物流单号。
+            </pre>
+        </div>
+        <div class="row cl">
             <label class="form-label col-3 col-sm-3"><span class="c-red"></span>客户信息：</label>
             <div class="formControls col-9 col-sm-9">
                 <input style="height: 31px;width: 50%" class="input-text" type="text" value="${(obj.transport.transportSignName)!}" name="transportSignName" id="transportSignName" placeholder="请输入客户姓名或昵称"/>

watero-rst-web/src/main/webapp/WEB-INF/views/yulia/list.ftl

@@ -17,7 +17,7 @@
 <div class="page-container">
     <div class="text-c">
         <form action="${path}/admin/afterSales/listAfterSales" method="POST" id="search-form">
-            <select class="select" name="detectState" id="detectState" style="height: 31px;width:8%">
+            <select class="select" name="detectState" id="detectState" style="height: 31px;width:7%">
                 <option value="">检测进度状态</option>
                 <option <#if (req.detectState)??><#if req.detectState ==  0>selected="selected"</#if></#if> value= "0">${(util.detectState(0))}</option>
                 <option <#if (req.detectState)??><#if req.detectState ==  1>selected="selected"</#if></#if> value= "1">${(util.detectState(1))}</option>
@@ -41,15 +41,17 @@
                     <option value="${(s.storeId)!}" <#if (req.storeId)??><#if (req.storeId == s.storeId)>selected</#if></#if>>${(s.storeName)!}</option>
                 </#list>
             </select>
-            <input type="text" class="input-text" style="width:8%;margin-top: -3px;" value="${(req.machineNo)!}" placeholder="机器条码" id="machineNo" name="machineNo">
-            <input type="text" class="input-text" style="width:8%;margin-top: -3px;" value="${(req.productName)!}" placeholder="产品名称" id="productName" name="productName">
-            <input type="text" class="input-text" style="width:8%;margin-top: -3px;" value="${(req.detectName)!}" placeholder="客户姓名/昵称" id="detectName" name="detectName">
-            <input type="text" class="input-text" style="width:8%;margin-top: -3px;" value="${(req.detectTel)!}" placeholder="客户电话/手机" id="detectTel" name="detectTel">
-            <input type="text" class="input-text" style="width:8%;margin-top: -3px;" value="${(req.methodName)!}" placeholder="处理方式" id="methodName" name="methodName">
-            <input type="text" class="input-text" style="width:8%;margin-top: -3px;" name="startTime" id="startTime"  placeholder="录入开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(req.startTime)!''}" readonly="readonly"/>
-            <input type="text" class="input-text" style="width:8%;margin-top: -3px;" name="endTime" id="endTime"  placeholder="录入结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(req.endTime)!''}" readonly="readonly"/>
+            <input type="text" class="input-text" style="width:7%;margin-top: -3px;" value="${(req.detectNumber)!}" placeholder="维修编号" id="detectNumber" name="detectNumber">
+            <input type="text" class="input-text" style="width:7%;margin-top: -3px;" value="${(req.machineNo)!}" placeholder="机器条码" id="machineNo" name="machineNo">
+            <input type="text" class="input-text" style="width:7%;margin-top: -3px;" value="${(req.logisticsNumber)!}" placeholder="寄回物流单号" id="logisticsNumber" name="logisticsNumber">
+            <input type="text" class="input-text" style="width:7%;margin-top: -3px;" value="${(req.productName)!}" placeholder="产品名称" id="productName" name="productName">
+            <input type="text" class="input-text" style="width:7%;margin-top: -3px;" value="${(req.detectName)!}" placeholder="客户姓名/昵称" id="detectName" name="detectName">
+            <input type="text" class="input-text" style="width:7%;margin-top: -3px;" value="${(req.detectTel)!}" placeholder="客户电话/手机" id="detectTel" name="detectTel">
+            <input type="text" class="input-text" style="width:7%;margin-top: -3px;" value="${(req.methodName)!}" placeholder="处理方式" id="methodName" name="methodName">
+            <input type="text" class="input-text" style="width:7%;margin-top: -3px;" name="startTime" id="startTime"  placeholder="录入开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(req.startTime)!''}" readonly="readonly"/>
+            <input type="text" class="input-text" style="width:7%;margin-top: -3px;" name="endTime" id="endTime"  placeholder="录入结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(req.endTime)!''}" readonly="readonly"/>
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);"><i class="Hui-iconfont">&#xe665;</i> 搜索 </button>
-            <button type="button" onclick="downLoadExcel()" class="btn" style="width:8%;margin-top: -3px;"><i class="Hui-iconfont">&#xe640;</i> 下载 </button>
+            <button type="button" onclick="downLoadExcel()" class="btn" style="width:7%;margin-top: -3px;"><i class="Hui-iconfont">&#xe640;</i> 下载 </button>
         </form>
     </div>
      <table class="table table-border table-bordered table-hover" style="margin-top: 20px">