不过滤犹豫期

yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java

@@ -178,7 +178,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
     private PageInfo<ComeCommissionVO> queryComeCommissionListPage(QueryComeCommissionListRequestVO requestVO) {
     private PageInfo<ComeCommissionVO> queryComeCommissionListPage(QueryComeCommissionListRequestVO requestVO) {
         PageInfo<ComeCommissionVO> page = requestVO.getPage();
         PageInfo<ComeCommissionVO> page = requestVO.getPage();
 
 
-        String orderBy = "orderDate desc";
+        String orderBy = "orderDate asc";
 
 
         PageHelper.startPage(page.getPageNum(), page.getPageSize(), orderBy);
         PageHelper.startPage(page.getPageNum(), page.getPageSize(), orderBy);
 
 

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

@@ -23,7 +23,7 @@
                         plan_id, insurer_id, order_date, commission_check_at
                         plan_id, insurer_id, order_date, commission_check_at
                 from ag_po_order t
                 from ag_po_order t
                 where t.status in (3,4) and policy_no is not null
                 where t.status in (3,4) and policy_no is not null
-                and (t.plan_id not in (424,453,464) or t.plan_id is not 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
@@ -37,11 +37,10 @@
                         left join ag_product_category proc on proc.id = pro.product_category_id
                         left join ag_product_category proc on proc.id = pro.product_category_id
                     ) a on o.plan_id = a.id
                     ) a on o.plan_id = a.id
         left join ag_acl_insurer i on o.insurer_id = i.id
         left join ag_acl_insurer i on o.insurer_id = i.id
-        left join (select order_id,withdrawable_date from ag_acl_customer_fortune group by order_id,withdrawable_date) f on o.id = f.order_id
         left join (SELECT
         left join (SELECT
                     order_id,
                     order_id,
-                    CASE WHEN factor_name = '保险期间' THEN element_text END coverageTerm,
-                    CASE WHEN factor_name = '缴费年限' THEN element_text END payTerm
+                    MAX(CASE WHEN factor_name = '保险期间' THEN element_text END) coverageTerm,
+                    MAX(CASE WHEN factor_name = '缴费年限' THEN element_text END) payTerm
                     FROM ag_po_order_life_product_elements t
                     FROM ag_po_order_life_product_elements t
                     GROUP BY order_id
                     GROUP BY order_id
                     ) e on e.order_id = o.id
                     ) e on e.order_id = o.id
@@ -52,7 +51,7 @@
             </when>
             </when>
             <otherwise>
             <otherwise>
                 <if test="compareDate != null">
                 <if test="compareDate != null">
-                    and date_format(f.withdrawable_date, '%Y-%m') &lt;= #{compareDate}
+                    and date_format(o.order_date, '%Y-%m') = #{compareDate}
                 </if>
                 </if>
                 <if test="insurerId != null">
                 <if test="insurerId != null">
                     and o.insurer_id = #{insurerId}
                     and o.insurer_id = #{insurerId}