[fix] 销售管理

修复原客户报价通过筛选定价时间数据错误问题：前端列表新增录入时间，前端录入时间、定价时间和后端分页查询的录入时间、定价时间通过不同字段区分

ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml

@@ -87,10 +87,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyTitle != null  and applyTitle != ''"> and s.apply_title = #{applyTitle}</if>
             <if test="applyUser != null  and applyUser != ''"> and s.apply_user = #{applyUser}</if>
             <if test="applyTime != null "> and s.apply_time = #{applyTime}</if>
-            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
-                and s.pricingDate between #{params.beginCreateTime} and #{params.endCreateTime}
+            <if test="params.beginPricingDate != null and params.beginPricingDate != '' and params.endPricingDate != null and params.endPricingDate != ''">
+                and s.pricingDate between #{params.beginPricingDate} and #{params.endPricingDate}
             </if>
-            <if test="params.beginCreateTime1 != null and params.beginCreateTime1 != '' and params.endCreateTime1 != null and params.endCreateTime1 != ''">
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
                 and s.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
             </if>
             <if test="keyword != null and keyword != ''"> and ((s.customerCode like concat('%',#{keyword},'%') or s.customerName like concat('%',#{keyword},'%')))</if>

ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html

@@ -45,15 +45,15 @@
                             </li>
                             <li>
                                 <label>定价时间：</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginPricingDate]"/>
                                 <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endPricingDate]"/>
                             <li>
                             <li>
                                 <label>录入时间：</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime1]"/>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
                                 <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime1]"/>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -189,8 +189,9 @@
                     {title: '含税单价(RMB)',field: 'rmb'},
                     {title: '不含税单价(美元)',field: 'noUsd'},
                     {title: '含税单价(美元)',field: 'usd'},
+                    {title: '定价时间',field: 'pricingDate'},
                     {title: '录入人',field: 'createBy'},
-                    {title: '定价时间',field: 'createTime'},
+                    {title: '录入时间',field: 'createTime'},
                     {title: '更新人',field: 'updateBy'},
                     { title: '上次修改时间',field: 'updateTime'},
                     {title: '备注',field: 'remark'},