产品险种

yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml

@@ -20,7 +20,7 @@
             f.name,
             f.name,
             f.practitioner_type_id practitionerTypeId,
             f.practitioner_type_id practitionerTypeId,
             IFNULL(p.categoryName,a.categoryName2) categoryName,
             IFNULL(p.categoryName,a.categoryName2) categoryName,
-            a.planCategoryName
+            IFNULL(p.planCategoryName,a.planCategoryName2) planCategoryName
         from (SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, commission_check_id, product_id,
         from (SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, commission_check_id, product_id,
                         plan_id, insurer_id, order_date, commission_check_at,
                         plan_id, insurer_id, order_date, commission_check_at,
                         CONCAT(payment_term, (case payment_term_unit when 'Y' then '年' when 'M' then '月' else '日' END)) payTerm,
                         CONCAT(payment_term, (case payment_term_unit when 'Y' then '年' when 'M' then '月' else '日' END)) payTerm,
@@ -30,10 +30,12 @@
                 and (t.plan_id not in (424,453,464) or t.plan_id is null)
                 and (t.plan_id not in (424,453,464) or t.plan_id is null)
              ) o
              ) o
         left join ag_po_order_commission_check c on o.commission_check_id = c.id
         left join ag_po_order_commission_check c on o.commission_check_id = c.id
-        left join (select p.id, p.name, pc.name categoryName
+        left join (select p.id, p.name, pc.name categoryName, ppc.name planCategoryName
                         from ag_product p left join ag_product_category pc on p.product_category_id = pc.id
                         from ag_product p left join ag_product_category pc on p.product_category_id = pc.id
+                                          left join ag_plan_category_list pcl on p.id = pcl.product_id
+                                          LEFT JOIN ag_plan_category ppc on ppc.id=pcl.plan_category_id
                     ) p on o.product_id = p.id
                     ) p on o.product_id = p.id
-        left join (select pl.id, pl.name, pc.name planCategoryName, proc.name categoryName2
+        left join (select pl.id, pl.name, pc.name planCategoryName2, proc.name categoryName2
                         from ag_product_plan pl
                         from ag_product_plan pl
                         left join ag_plan_category_list pcl on pl.id = pcl.plan_id
                         left join ag_plan_category_list pcl on pl.id = pcl.plan_id
                         left join ag_plan_category pc on pc.id = pcl.plan_category_id
                         left join ag_plan_category pc on pc.id = pcl.plan_category_id

yd-api/src/main/resources/mapper/order/PoOrderMapper.xml

@@ -83,6 +83,10 @@
         <result column="is_renew_complete" jdbcType="INTEGER" property="isRenewComplete"/>
         <result column="is_renew_complete" jdbcType="INTEGER" property="isRenewComplete"/>
         <result column="is_pay_to_yd" jdbcType="INTEGER" property="isPayToYd"/>
         <result column="is_pay_to_yd" jdbcType="INTEGER" property="isPayToYd"/>
         <result column="auto_pay_flag" jdbcType="VARCHAR" property="autoPayFlag"/>
         <result column="auto_pay_flag" jdbcType="VARCHAR" property="autoPayFlag"/>
+        <result column="commission_check_id" jdbcType="BIGINT" property="commissionCheckId"/>
+        <result column="commission_check_status" jdbcType="VARCHAR" property="commissionCheckStatus"/>
+        <result column="commission_check_at" jdbcType="TIMESTAMP" property="commissionCheckAt"/>
+        <result column="commission_check_by" jdbcType="BIGINT" property="commissionCheckBy"/>
     </resultMap>
     </resultMap>
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         <!--@mbg.generated-->
@@ -99,7 +103,7 @@
         frame_no, subject_province_id, subject_city_id, subject_address, room_qty, created_at,
         frame_no, subject_province_id, subject_city_id, subject_address, room_qty, created_at,
         created_by, updated_at, updated_by, source_channel, source_plan_name, source_publishdate,
         created_by, updated_at, updated_by, source_channel, source_plan_name, source_publishdate,
         source_article, ip_address, ip_region, renew_order_id, is_renew_complete, is_pay_to_yd,
         source_article, ip_address, ip_region, renew_order_id, is_renew_complete, is_pay_to_yd,
-        auto_pay_flag
+        auto_pay_flag, commission_check_id, commission_check_status, commission_check_at, commission_check_by
     </sql>
     </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         <!--@mbg.generated-->
         <!--@mbg.generated-->