excel导入订单优化

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

@@ -141,7 +141,12 @@ public class ComplaintDetectInfo implements Serializable {
     private String signclosedCustomerDesc;//签收客服备注
 
     private Integer countNum;//数量
-
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date detectConfirmTime;//确认时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date detectBuytime;//购买时间
     public String getQuestionName() {
         return questionName;
     }
@@ -908,4 +913,20 @@ public class ComplaintDetectInfo implements Serializable {
     public void setCountNum(Integer countNum) {
         this.countNum = countNum;
     }
+
+    public Date getDetectConfirmTime() {
+        return detectConfirmTime;
+    }
+
+    public void setDetectConfirmTime(Date detectConfirmTime) {
+        this.detectConfirmTime = detectConfirmTime;
+    }
+
+    public Date getDetectBuytime() {
+        return detectBuytime;
+    }
+
+    public void setDetectBuytime(Date detectBuytime) {
+        this.detectBuytime = detectBuytime;
+    }
 }

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

@@ -77,7 +77,9 @@
       cpts.proc_type_name typeName,
       cpts.proc_type_id typeId,
       cd.company_id companyId,
-      si.store_name signclosedStoreName
+      si.store_name signclosedStoreName,
+      cd.detect_confirm_time detectConfirmTime,
+      cd.detect_buy_time detectBuytime
     from tb_rst_complaint_detect cd
     LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
     LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
@@ -185,7 +187,9 @@
     cd.company_id companyId,
     si.store_name signclosedStoreName,
     cd.detect_is_download detectIsDownload,
-    cs.signclosed_customer_desc signclosedCustomerDesc
+    cs.signclosed_customer_desc signclosedCustomerDesc,
+    cd.detect_confirm_time detectConfirmTime,
+    cd.detect_buy_time detectBuytime
     from tb_rst_complaint_detect cd
     LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
     LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
@@ -503,7 +507,13 @@
         company_id = #{companyId},
       </if>
       <if test="detectIsDownload != null" >
-        detect_is_download = #{detectIsDownload}
+        detect_is_download = #{detectIsDownload},
+      </if>
+      <if test="detectConfirmTime != null" >
+        detect_confirm_time = #{detectConfirmTime},
+      </if>
+      <if test="detectBuytime != null" >
+        detect_buy_time = #{detectBuytime}
       </if>
     </set>
     where
@@ -549,7 +559,9 @@
     question_id,
     method_id,
     detect_source,
-    company_id
+    company_id,
+    detect_confirm_time,
+    detect_buy_time
     )
     values
       (
@@ -589,7 +601,9 @@
       #{questionId},
       #{methodId},
       #{detectSource},
-      #{companyId}
+      #{companyId},
+      #{detectConfirmTime},
+      #{detectBuytime}
       )
   </insert>
 

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

@@ -1332,6 +1332,15 @@ public class AdminDetectController {
             msg.setReturnCode(500);
             return msg;
         }
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String detectConfirmTime = request.getParameter("detect_confirm_time");
+        if(detectConfirmTime != null){
+            detectInfo.setDetectConfirmTime(format.parse(detectConfirmTime));
+        }
+        String detectBuyTime = request.getParameter("detect_buy_time");
+        if(detectBuyTime != null){
+            detectInfo.setDetectBuytime(format.parse(detectBuyTime));
+        }
         Calendar date = Calendar.getInstance();
         date.setTime(new Date());
         boolean fl = false;

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

@@ -184,6 +184,8 @@
                 <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>
@@ -294,6 +296,8 @@
                     <td class="text-c" width="100">${detect.detectDesc!'-'}</td>
                     <td class="text-c" width="100">${detect.detectCustomerDesc!'-'}</td>
                     <td class="text-c" width="100">${(detect.detectDate?string("yyyy-MM-dd"))!'-'}</td>
+                    <td class="text-c" width="100">${(detect.detectConfirmTime?string("yyyy-MM-dd"))!'-'}${(detect.customerCreateTime?string("yyyy-MM-dd"))!'-'}</td>
+                    <td class="text-c" width="100">${(detect.detectBuytime?string("yyyy-MM-dd"))!'-'}</td>
                     <td class="text-c" width="100" id="print${detect.detectId}">
                     <#if detect.detectIsPrint??>
                         <#if detect.detectIsPrint == 1>
@@ -578,7 +582,9 @@
                         }
                     }
 
-                    if(detectInfo.customerCreateTime != null && detectInfo.customerCreateTime != ""){
+                    if(detectInfo.detectConfirmTime != null && detectInfo.detectConfirmTime != ""){
+                        $("#customerCreateTimeTd").html(detectInfo.detectConfirmTime);
+                    }else if(detectInfo.customerCreateTime != null && detectInfo.customerCreateTime != ""){
                         $("#customerCreateTimeTd").html(detectInfo.customerCreateTime);
                     }
 
@@ -596,7 +602,9 @@
                     if(detectInfo.colorName != null && detectInfo.colorName != ""){
                         $("#colorNameTd").html(detectInfo.colorName);
                     }
-                    if(detectInfo.salesPayTime != null && detectInfo.salesPayTime != ""){
+                    if(detectInfo.detectBuytime != null && detectInfo.detectBuytime != ""){
+                        $("#salesPayTimeTd").html(detectInfo.detectBuytime);
+                    }else if(detectInfo.salesPayTime != null && detectInfo.salesPayTime != ""){
                         $("#salesPayTimeTd").html(detectInfo.salesPayTime);
                     }
 

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

@@ -129,6 +129,8 @@
                 <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>
@@ -193,6 +195,8 @@
                         </#if>
                     </td>
                     <td class="text-c" width="100">${(detect.detectDate?string("yyyy-MM-dd"))!'-'}</td>
+              <#--      <td class="text-c" width="100">${(detect.detectConfirmTime?string("yyyy-MM-dd"))!'-'}</td>
+                    <td class="text-c" width="100">${(detect.detectBuytime?string("yyyy-MM-dd"))!'-'}</td>-->
                     <td class="text-c" width="100">${detect.signclosedCustomerDesc!''}</td>
                     <!-- 遍历操作 -->
                     <td class="td-manage text-c" width="120">

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

@@ -130,6 +130,18 @@
                 </select>
             </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-9 col-sm-9 huanhang" style="margin: 10px 0px 10px 0;padding-left: 0;">
+                <input type="text" style="" class="input-text my-input-date Wdate" placeholder="确认时间" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" id="detect_confirm_time" name="detect_confirm_time" readonly="readonly"/>
+            </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-9 col-sm-9 huanhang" style="margin: 10px 0px 10px 0;padding-left: 0;">
+                <input type="text" style="" class="input-text my-input-date Wdate" placeholder="购买时间" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" id="detect_buy_time" name="detect_buy_time" readonly="readonly"/>
+            </div>
+        </div>
         <div class="input-box" >
             <label class="form-label col-3 col-sm-3 huanhang"  style="text-align: right;">备注信息：</label>
             <div class="formControls col-xs-9 col-sm-9">

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

@@ -264,7 +264,7 @@
             <input type="hidden" class="input-text" value="0" placeholder="待付金额" id="salesWaitMoney" name="salesWaitMoney"  >
             <input type="hidden" class="input-text" value="0" placeholder="本次支付金额" id="salesLastMoney" name="salesLastMoney"  >
             <input type="hidden" class="input-text" value="0" placeholder="邮费" id="salesShippingFee" name="salesShippingFee"  >
-
+            <span style="color: #dd0000;margin-left: 190px;margin-top: 20px;"><strong>请认真填写实付金额，如果不知道实际销售价格，请联系业务员获取</strong></span>
             <div class="row cl">
                 <label class="form-label col-3">
                     <div class="tit-2">备注信息</div>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -310,7 +310,7 @@
 </div>
 <div style="display: none">
 
-</div>ueditor.config
+</div>
 <tfoot>
 <#include "/base/page_util.ftl">
 <script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>