来佣检核列表查询分页排序

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

@@ -135,7 +135,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 = "created_at desc";
+        String orderBy = "orderDate desc";
 
 
         PageHelper.startPage(page.getPageNum(), page.getSize(), orderBy);
         PageHelper.startPage(page.getPageNum(), page.getSize(), orderBy);
 
 

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

@@ -39,7 +39,7 @@
         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 coverageTerm,
-                    CASE WHEN factor_name = '交费年限' THEN element_text END payTerm
+                    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
@@ -50,7 +50,7 @@
             </when>
             </when>
             <otherwise>
             <otherwise>
                 <if test="compareDate != null">
                 <if test="compareDate != null">
-                    and (o.commission_check_id is null and date_format(f.withdrawable_date, '%Y-%m') &lt;= #{compareDate})
+                    and ((o.commission_check_status is null or o.commission_check_status = 1) and date_format(f.withdrawable_date, '%Y-%m') &lt;= #{compareDate})
                 </if>
                 </if>
                 <if test="insurerId != null">
                 <if test="insurerId != null">
                     and o.insurer_id = #{insurerId}
                     and o.insurer_id = #{insurerId}