csv导出问题5

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

@@ -147,6 +147,8 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
 
         List<ComeCommissionVO> dataList = lifeCommissionMapper.queryComeCommissionList(requestVO);
 
+        dataList.sort(Comparator.comparing(ComeCommissionVO::getOrderDate).reversed());
+
         createCSV(dataList, response);
         responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
         return responseVO;

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

@@ -19,10 +19,10 @@
             IFNULL(o.payTerm,e.payTerm) payTerm,
             f.name,
             f.practitioner_type_id practitionerTypeId,
-            IFNULL(p.categoryName,a.categoryName2) categoryName,
-            IFNULL(p.planCategoryName,a.planCategoryName2) planCategoryName
+            (case o.config_level when 2 then p2.pName2 else p3.pName3 END) categoryName,
+            (case o.config_level when 2 then p2.cName2 else p3.cName3 END) planCategoryName
         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, config_level,
                         CONCAT(payment_term, (case payment_term_unit when 'Y' then '年' when 'M' then '月' else '日' END)) payTerm,
                         CONCAT(cover_term, cover_term_type) coverageTerm
                 from ag_po_order t
@@ -30,18 +30,22 @@
                 and (t.plan_id not in (424,453,464) or t.plan_id is null)
              ) o
         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, ppc.name planCategoryName
-                        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
-        left join (select pl.id, pl.name, pc.name planCategoryName2, proc.name categoryName2
-                        from ag_product_plan pl
-                        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_product pro on pro.id = pl.product_id
-                        left join ag_product_category proc on proc.id = pro.product_category_id
-                    ) a on o.plan_id = a.id
+        left join ag_product_plan a on o.plan_id = a.id
+        left join ag_product p on o.product_id = p.id
+        left join (select plcl.config_level, plcl.product_id, plc.name cName2, pc.name pName2
+                        from ag_plan_category_list plcl
+                        left join ag_plan_category plc on plcl.plan_category_id = plc.id
+                        left join ag_product_category pc on plc.product_category_id = pc.id
+                    where plcl.config_level = 2
+                    ) p2
+                    on o.config_level = p2.config_level and o.product_id = p2.product_id
+        left join (select plcl.config_level, plcl.plan_id, plc.name cName3, pc.name pName3
+                        from ag_plan_category_list plcl
+                        left join ag_plan_category plc on plcl.plan_category_id = plc.id
+                        left join ag_product_category pc on plc.product_category_id = pc.id
+                        where plcl.config_level = 3
+                    ) p3
+                    on o.config_level = p3.config_level and o.plan_id = p3.plan_id
         left join ag_acl_insurer i on o.insurer_id = i.id
         left join (SELECT order_id, name, practitioner_type_id, f.customer_id
                         from (