Browse Source

报价历史字段调整

785834757 9 months ago
parent
commit
20f6bb784c

+ 26 - 0
commons/src/main/java/com/jzg/commons/entity/orders/vo/HistoryQuoteResultVo.java

@@ -52,6 +52,32 @@ public class HistoryQuoteResultVo {
      */
     private String sumPremium;
 
+    /**
+     * 交强保费
+     */
+    private String jqPremium;
+
+    /**
+     * 商业保费
+     */
+    private String syPremium;
+
+    /**
+     * 驾意保费
+     */
+    private String jyPremium;
+
+    /**
+     * 订单状态code
+     */
+    private String orderStatus;
+
+    /**
+     * 订单状态name
+     */
+    private String orderStatusName;
+
+
     /**
      * 报价时间
      */

+ 14 - 2
tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -450,7 +450,7 @@
     
     <select id="selectOrdersCarInfoByOrderNo" resultMap="carInfoMap">
         select order_no,license_no,is_registered,vin_no,brand_name,engine_no,car_year,seat_count,complete_kerb_mass,limit_load,power_scale,purchase_price,car_nature_code,vehicle_use_code,car_type_code,car_kind_code,
-        energy_type_code,property_code,license_color_code,car_kind_detail_id_code,license_kind_code,register_date,issue_date,transfer_date,transfer
+        energy_type_code,property_code,license_color_code,car_kind_detail_id_code,license_kind_code,register_date,issue_date,transfer_date,transfer,displacement
         from ins_orders_car_info where order_no = #{orderNo}
     </select>
 
@@ -613,11 +613,22 @@
 
     <select id="getHistoryQuoteList" resultType="com.jzg.commons.entity.orders.vo.HistoryQuoteResultVo">
         SELECT
+            io.id as order_no,
+            io.company_id,
+            io.company_name,
             ioci.license_no,
+            io.order_status,
+            io.product_name,
+            io.create_time as quote_time,
+            ioc.jq_premium,
+            ioc.sy_premium,
+            ioc.jy_premium,
+            sum(ioc.jq_premium + ioc.sy_premium + ioc.jy_premium) as sum_premium,
             COUNT(*) AS quote_number
         FROM
             ins_orders io
                 LEFT JOIN ins_orders_car_info ioci ON io.id = ioci.order_no
+        LEFT JOIN ins_orders_costs ioc on io.id = ioc.order_no
         WHERE
             io.real_quote_user_id = #{userName}
         <if test="params.licenseNo != null and params.licenseNo != ''">
@@ -626,7 +637,8 @@
         and
             io.parent_id != 0
         GROUP BY
-            ioci.license_no;
+            ioci.license_no,
+            io.id;
     </select>
 
     <select id="getHistoryQuoteByLicenseNo" resultType="com.jzg.commons.entity.orders.vo.HistoryQuoteResultVo">