Pārlūkot izejas kodu

处理任务池和费用审核的订单的时间改为子订单的时间

hxl13994548489 2 gadi atpakaļ
vecāks
revīzija
3bdbef08bc

+ 10 - 10
src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -149,14 +149,14 @@
         io.agreeid,
         iac.productid,
         iac.product,
-        io.createtime,
+        iac.createtime,
         io.frameno,
         io.licenseno,
         io.insuredname,
-        io.jqstartdate,
-        io.jqenddate,
-        io.systartdate,
-        io.syenddate,
+        iac.jq_start_date as jqstartdate,
+        iac.jq_end_date as jqenddate,
+        iac.sy_start_date as systartdate,
+        iac.sy_end_date as syenddate,
         io.vehicle_and_vessel_tax,
         io.operatorid,
         sd.management_source,
@@ -215,14 +215,14 @@
             and iac.product = #{params.riskCode}
         </if>
         <if test="params.quoteStartDateStr != null and params.quoteStartDateStr != '' and params.quoteEndDateStr != null and params.quoteEndDateStr != ''">
-            and  DATE_FORMAT(io.createtime, '%Y-%m-%d') between #{params.quoteStartDateStr} AND #{params.quoteEndDateStr}
+            and  DATE_FORMAT(iac.createtime, '%Y-%m-%d') between #{params.quoteStartDateStr} AND #{params.quoteEndDateStr}
         </if>
         <if test="params.attachStartDateStr != null and params.attachStartDateStr != '' and params.attachStartDateStr != null and params.attachStartDateStr != '' ">
             and  ((
-            DATE_FORMAT(io.jqstartdate, '%Y-%m-%d') BETWEEN #{params.attachStartDateStr}
+            DATE_FORMAT(iac.jq_start_date, '%Y-%m-%d') BETWEEN #{params.attachStartDateStr}
             AND #{params.attachEndDateStr}
             )
-            OR ( DATE_FORMAT(io.systartdate, '%Y-%m-%d')  BETWEEN #{params.attachStartDateStr} AND #{params.attachEndDateStr} )
+            OR ( DATE_FORMAT(iac.sy_start_date, '%Y-%m-%d')  BETWEEN #{params.attachStartDateStr} AND #{params.attachEndDateStr} )
             )
         </if>
         <if test="params.provinceId != null and params.provinceId != ''">
@@ -253,10 +253,10 @@
             and sd.management_source = #{params.managementSource}
         </if>
         <if test="params.signStartDateStr != null and params.signStartDateStr != '' and params.signEndDateStr != null and params.signEndDateStr != ''">
-            and  DATE_FORMAT(io.createtime, '%Y-%m-%d') between #{params.signStartDateStr} AND #{params.signEndDateStr}
+            and  DATE_FORMAT(iac.signing_time, '%Y-%m-%d') between #{params.signStartDateStr} AND #{params.signEndDateStr}
         </if>
         <if test="params.payStartDateStr != null and params.payStartDateStr != '' and params.payEndDateStr != null and params.payEndDateStr != ''">
-            and  DATE_FORMAT(io.createtime, '%Y-%m-%d') between #{params.payStartDateStr} AND #{params.payEndDateStr}
+            and  DATE_FORMAT(iac.pay_date, '%Y-%m-%d') between #{params.payStartDateStr} AND #{params.payEndDateStr}
         </if>
     </select>
 

+ 11 - 11
src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -812,14 +812,14 @@
         io.agreeid as agreeid,
         iac.productid as productid,
         iac.product as product,
-        io.createtime as createtime,
+        iac.createtime as createtime,
         io.frameno as frameno,
         io.licenseno as licenseno,
         io.insuredname as insuredname,
-        io.jqstartdate as jqstartdate,
-        io.jqenddate as jqenddate,
-        io.systartdate as systartdate,
-        io.syenddate as syenddate,
+        iac.jq_start_date as jqstartdate,
+        iac.jq_end_date as jqenddate,
+        iac.sy_start_date as systartdate,
+        iac.sy_end_date as syenddate,
         io.risk as risk,
         io.king as king,
         io.vehicle_and_vessel_tax as vehicleAndVesselTax,
@@ -897,7 +897,7 @@
                 and io.insuredname = #{orderQueryVo.insuredName}
             </if>
             <if test="orderQueryVo.quoteStartDateStr != null and orderQueryVo.quoteEndDateStr != null">
-                and  DATE_FORMAT(io.createtime, '%Y-%m-%d') between #{orderQueryVo.quoteStartDateStr} AND #{orderQueryVo.quoteEndDateStr}
+                and  DATE_FORMAT(iac.createtime, '%Y-%m-%d') between #{orderQueryVo.quoteStartDateStr} AND #{orderQueryVo.quoteEndDateStr}
             </if>
             <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
                 and iac.company_id = #{orderQueryVo.companyId}
@@ -937,10 +937,10 @@
             </if>
             <if test="orderQueryVo.attachStartDateStr != null and orderQueryVo.attachEndDateStr != ''">
                 and  ((
-                DATE_FORMAT(io.jqstartdate, '%Y-%m-%d') BETWEEN #{orderQueryVo.attachStartDateStr}
+                DATE_FORMAT(iac.jq_start_date, '%Y-%m-%d') BETWEEN #{orderQueryVo.attachStartDateStr}
                 AND #{orderQueryVo.attachEndDateStr}
                 )
-                OR ( DATE_FORMAT(io.systartdate, '%Y-%m-%d')  BETWEEN #{orderQueryVo.attachStartDateStr} AND #{orderQueryVo.attachEndDateStr} )
+                OR ( DATE_FORMAT(iac.sy_start_date, '%Y-%m-%d')  BETWEEN #{orderQueryVo.attachStartDateStr} AND #{orderQueryVo.attachEndDateStr} )
                 )
             </if>
         </where>
@@ -1009,7 +1009,7 @@
                 and io.insuredname = #{orderQueryVo.insuredName}
             </if>
             <if test="orderQueryVo.quoteStartDateStr != null and orderQueryVo.quoteEndDateStr != null">
-                and DATE_FORMAT(io.createtime, '%Y-%m-%d') between #{orderQueryVo.quoteStartDateStr} AND #{orderQueryVo.quoteEndDateStr}
+                and DATE_FORMAT(iac.createtime, '%Y-%m-%d') between #{orderQueryVo.quoteStartDateStr} AND #{orderQueryVo.quoteEndDateStr}
             </if>
             <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
                 and iac.company_id = #{orderQueryVo.companyId}
@@ -1049,10 +1049,10 @@
             </if>
             <if test="orderQueryVo.attachStartDateStr != null and orderQueryVo.attachEndDateStr != ''">
                 and  ((
-                DATE_FORMAT(io.jqstartdate, '%Y-%m-%d') BETWEEN #{orderQueryVo.attachStartDateStr}
+                DATE_FORMAT(iac.jq_start_date, '%Y-%m-%d') BETWEEN #{orderQueryVo.attachStartDateStr}
                 AND #{orderQueryVo.attachEndDateStr}
                 )
-                OR ( DATE_FORMAT(io.systartdate, '%Y-%m-%d')  BETWEEN #{orderQueryVo.attachStartDateStr} AND #{orderQueryVo.attachEndDateStr} )
+                OR ( DATE_FORMAT(iac.sy_start_date, '%Y-%m-%d')  BETWEEN #{orderQueryVo.attachStartDateStr} AND #{orderQueryVo.attachEndDateStr} )
                 )
             </if>
         </where>