大区分组排序bug修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dealer/DealerRoundController.java

@@ -37,7 +37,7 @@ public class DealerRoundController extends BaseController {
     /**
      * 修改经销商信息
      */
-    @Log(title = "初始化第二轮数据", businessType = BusinessType.UPDATE)
+    @Log(title = "初始化第1轮数据", businessType = BusinessType.UPDATE)
     @PostMapping("/init")
     public AjaxResult initRoundInfo() {
         return toAjax(resultService.initRoundInfo());

ruoyi-system/src/main/java/com/ruoyi/dealer/mapper/DealerRoundResultMapper.java

@@ -19,7 +19,8 @@ import java.util.List;
 public interface DealerRoundResultMapper extends BaseMapper<DealerRoundResult> {
 
     @Select("select result.round_time, result.sales_region_group_name as group_Name , sum(result.payment_ttl) as payment_ttl,sum(result.goal_ttl_act) as goal_ttl_act , 100*sum(result.payment_ttl)/sum(result.goal_ttl_act) as payment_percentage from dealer_round_result  result " +
-            "group  by round_time ,result.sales_region_group_name order by payment_percentage desc ")
+            "group  by round_time ,result.sales_region_group_name " +
+            "order by payment_percentage desc,sum(result.goal_ttl_act) desc ")
     // 手动指定映射：column（数据库字段）→ property（Java属性）
     @Results({
             @Result(column = "round_time", property = "roundTime"),

ruoyi-system/src/main/java/com/ruoyi/dealer/service/impl/DealerRoundResultServiceImpl.java

@@ -241,7 +241,7 @@ public class DealerRoundResultServiceImpl extends ServiceImpl<DealerRoundResultM
             ExcelUtil<DealerRoundResult> util = new ExcelUtil<>(DealerRoundResult.class);
             String encodedFileName = null;
             try {
-                encodedFileName = URLEncoder.encode("个人分组明细.exls", "UTF-8");
+                encodedFileName = URLEncoder.encode("个人分组明细.xlsx", "UTF-8");
             } catch (UnsupportedEncodingException e) {
                 throw new RuntimeException(e);
             }
@@ -254,7 +254,7 @@ public class DealerRoundResultServiceImpl extends ServiceImpl<DealerRoundResultM
             ExcelUtil<DealerResult> util = new ExcelUtil<>(DealerResult.class);
             String encodedFileName = null;
             try {
-                encodedFileName = URLEncoder.encode("团队汇总.exls", "UTF-8");
+                encodedFileName = URLEncoder.encode("团队汇总.xlsx", "UTF-8");
             } catch (UnsupportedEncodingException e) {
                 throw new RuntimeException(e);
             }