Merge remote-tracking branch 'origin/dev' into dev_20200908_PEP_Statistics

yd-api/src/main/resources/mapper/agms/AgmsDashboardMapper.xml

@@ -246,7 +246,7 @@ where ps.practitioner_type_id = 28
         concat(ifnull(sum(policy.INS_MST_TOTAL_PREIUM),0),'') as fyp,
         concat(ifnull(sum(policy.INS_MST_TOTAL_PREIUM),0),'') as fyp,
         concat(ifnull(sum(policy.INS001_FYCTOTAL),0),'') as fyc
         concat(ifnull(sum(policy.INS001_FYCTOTAL),0),'') as fyc
         FROM
         FROM
-        ins001 policy INNER JOIN mon025 m on policy.INS_MST_ID = m.MON025_002 and m.MON025_109 IN (1,2,3) AND m.MON025_303 = 1 AND m.mon025_108 = 'S01'
+        ins001 policy INNER JOIN mon025 m on policy.INS_MST_ID = m.MON025_002 and m.MON025_109 IN (1,2,3,4,7) AND m.MON025_303 = 1 AND m.mon025_108 = 'S01'
         INNER JOIN (
         INNER JOIN (
         SELECT mon025_002,MAX(MON025_405) as MON025_405 FROM mon025 group by mon025_002 ORDER BY mon025_002
         SELECT mon025_002,MAX(MON025_405) as MON025_405 FROM mon025 group by mon025_002 ORDER BY mon025_002
         ) b on m.mon025_002 = b.mon025_002 AND m.MON025_405 = b.MON025_405
         ) b on m.mon025_002 = b.mon025_002 AND m.MON025_405 = b.MON025_405

yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml

@@ -555,7 +555,7 @@
 <!--    left join DRP003 md on p.FK_DRP_TITLE_CODE = md.DRP_TITLE_CODE-->
 <!--    left join DRP003 md on p.FK_DRP_TITLE_CODE = md.DRP_TITLE_CODE-->
 <!--    inner JOIN ins001 policy on m.MON025_002 = policy.INS_MST_ID &#45;&#45; 保单id-->
 <!--    inner JOIN ins001 policy on m.MON025_002 = policy.INS_MST_ID &#45;&#45; 保单id-->
 <!--    inner join spc004 spc on m.MON025_006 = spc.SPC_DIV_ID &#45;&#45; 体系-->
 <!--    inner join spc004 spc on m.MON025_006 = spc.SPC_DIV_ID &#45;&#45; 体系-->
-<!--    WHERE m.MON025_109 IN (1,2,3) AND m.MON025_303 = 1 AND m.mon025_108 = 'S01'-->
+<!--    WHERE m.MON025_109 IN (1,2,3,4,7) AND m.MON025_303 = 1 AND m.mon025_108 = 'S01'-->
 <!--    <choose>-->
 <!--    <choose>-->
 <!--      <when test="time == 1">-->
 <!--      <when test="time == 1">-->
 <!--        and DATE_FORMAT(policy.INS_MST_ACCEPT_DATE, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )-->
 <!--        and DATE_FORMAT(policy.INS_MST_ACCEPT_DATE, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )-->
@@ -581,7 +581,7 @@
       ifnull(sum(policy.INS_MST_TOTAL_PREIUM),0) as fyp,-- 保费
       ifnull(sum(policy.INS_MST_TOTAL_PREIUM),0) as fyp,-- 保费
       ifnull(sum(policy.INS001_FYCTOTAL),0) as fyc  -- 应发佣金
       ifnull(sum(policy.INS001_FYCTOTAL),0) as fyc  -- 应发佣金
       FROM
       FROM
-      ins001 policy INNER JOIN mon025 m on policy.INS_MST_ID = m.MON025_002 and m.MON025_109 IN (1,2,3) AND m.MON025_303 = 1 AND m.mon025_108 = 'S01'
+      ins001 policy INNER JOIN mon025 m on policy.INS_MST_ID = m.MON025_002 and m.MON025_109 IN (1,2,3,4,7) AND m.MON025_303 = 1 AND m.mon025_108 = 'S01'
       INNER JOIN (
       INNER JOIN (
       SELECT mon025_002,MAX(MON025_405) as MON025_405 FROM mon025 group by mon025_002 ORDER BY mon025_002
       SELECT mon025_002,MAX(MON025_405) as MON025_405 FROM mon025 group by mon025_002 ORDER BY mon025_002
       ) b on m.mon025_002 = b.mon025_002 AND m.MON025_405 = b.MON025_405
       ) b on m.mon025_002 = b.mon025_002 AND m.MON025_405 = b.MON025_405
@@ -829,7 +829,7 @@
     ifnull(sum(policy.INS_MST_TOTAL_PREIUM),0) as fyp,-- 保费
     ifnull(sum(policy.INS_MST_TOTAL_PREIUM),0) as fyp,-- 保费
     ifnull(sum(policy.INS001_FYCTOTAL),0) as fyc  -- 应发佣金
     ifnull(sum(policy.INS001_FYCTOTAL),0) as fyc  -- 应发佣金
     FROM
     FROM
-    ins001 policy INNER JOIN mon025 m on policy.INS_MST_ID = m.MON025_002 and m.MON025_109 IN (1,2,3) AND m.MON025_303 = 1 AND m.mon025_108 = 'S01'
+    ins001 policy INNER JOIN mon025 m on policy.INS_MST_ID = m.MON025_002 and m.MON025_109 IN (1,2,3,4,7) AND m.MON025_303 = 1 AND m.mon025_108 = 'S01'
     INNER JOIN (
     INNER JOIN (
     SELECT mon025_002,MAX(MON025_405) as MON025_405 FROM mon025 group by mon025_002 ORDER BY mon025_002
     SELECT mon025_002,MAX(MON025_405) as MON025_405 FROM mon025 group by mon025_002 ORDER BY mon025_002
     ) b on m.mon025_002 = b.mon025_002 AND m.MON025_405 = b.MON025_405
     ) b on m.mon025_002 = b.mon025_002 AND m.MON025_405 = b.MON025_405

yd-api/src/main/resources/mapper/customer/AclPractitionerSubordinateSystemMapper.xml

@@ -278,7 +278,7 @@
     ifnull(count(distinct policy.INS_MST_ID),0) as count,-- 保单id
     ifnull(count(distinct policy.INS_MST_ID),0) as count,-- 保单id
     ifnull(sum(policy.INS_MST_TOTAL_PREIUM),0) as fyp,-- 保费
     ifnull(sum(policy.INS_MST_TOTAL_PREIUM),0) as fyp,-- 保费
     ifnull(sum(policy.INS001_FYCTOTAL),0) as fyc  -- 应发佣金
     ifnull(sum(policy.INS001_FYCTOTAL),0) as fyc  -- 应发佣金
-    FROM ins001 policy INNER JOIN mon025 m on policy.INS_MST_ID = m.MON025_002 and m.MON025_109 IN (1,2,3) AND m.MON025_303 = 1 AND m.mon025_108 = 'S01'
+    FROM ins001 policy INNER JOIN mon025 m on policy.INS_MST_ID = m.MON025_002 and m.MON025_109 IN (1,2,3,4,7) AND m.MON025_303 = 1 AND m.mon025_108 = 'S01'
     INNER JOIN (
     INNER JOIN (
     SELECT mon025_002,MAX(MON025_405) as MON025_405 FROM mon025 group by mon025_002 ORDER BY mon025_002
     SELECT mon025_002,MAX(MON025_405) as MON025_405 FROM mon025 group by mon025_002 ORDER BY mon025_002
     ) b on m.mon025_002 = b.mon025_002 AND m.MON025_405 = b.MON025_405
     ) b on m.mon025_002 = b.mon025_002 AND m.MON025_405 = b.MON025_405

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

@@ -1004,7 +1004,7 @@
     f.id as fortuneId
     f.id as fortuneId
     FROM ag_acl_customer_fortune f INNER JOIN ag_po_order o ON f.order_id = o.id and o.status = 3 and o.order_price > 0 and o.insurer_id != 888
     FROM ag_acl_customer_fortune f INNER JOIN ag_po_order o ON f.order_id = o.id and o.status = 3 and o.order_price > 0 and o.insurer_id != 888
     inner JOIN ag_acl_policyholder p ON o.id = p.order_id and p.type = 2
     inner JOIN ag_acl_policyholder p ON o.id = p.order_id and p.type = 2
-    WHERE f.customer_id = #{customerId,jdbcType=BIGINT}
+    WHERE f.drop_option_code = 'S01' AND f.customer_id = #{customerId,jdbcType=BIGINT}
     <choose>
     <choose>
       <when test="time == 1">
       <when test="time == 1">
         and DATE_FORMAT(f.order_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
         and DATE_FORMAT(f.order_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )