骑手排行增加站点名称查询

src/main/java/com/sqx/modules/datacentre/query/RankListQuery.java

@@ -23,8 +23,7 @@ public class RankListQuery extends DataCenterQuery {
         stringBuilder
                 .append(StringUtils.hasText(address)?"商铺类型编号："+address+";":"")
                 .append(StringUtils.hasText(getDateType())?"日期类型："+getDateType()+";":"")
-                .append(StringUtils.hasText(getDate())?"日期："+getDate()+";":"")
-                .append(StringUtils.hasText(riderStationId)?"查询类型："+riderStationId+";":"");
+                .append(StringUtils.hasText(getDate())?"日期："+getDate()+";":"");
         return stringBuilder.toString();
     }
 

src/main/java/com/sqx/modules/datacentre/service/impl/DataCentreServiceImpl.java

@@ -425,7 +425,7 @@ public class DataCentreServiceImpl implements DataCentreService {
                 "地区 ",
                 "骑手所在站点",
                 "总收益");
-        data.setTitles(WalletDetailExportTitle());
+        data.setTitles(titleList);
         List<List<Object>> rows = new ArrayList<>();
         for (TbIndent tbOrder:tbOrderList ){
             List<Object> row = new ArrayList<>();

src/main/java/com/sqx/modules/exportExecl/controller/ExportExeclController.java

@@ -17,6 +17,8 @@ import com.sqx.modules.exportExecl.service.ExportJobService;
 import com.sqx.modules.order.dao.AppOrderDao;
 import com.sqx.modules.pay.controller.query.CashOutQueryDTO;
 import com.sqx.modules.pay.controller.query.WalletDetailQuery;
+import com.sqx.modules.riderStation.entity.RiderStation;
+import com.sqx.modules.riderStation.service.RiderStationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -46,11 +48,9 @@ import java.util.Date;
 public class ExportExeclController {
 
     private final AppOrderDao appOrderDao;
-
     private final ExportJobService exportJobService;
-
     private final CommonInfoService commonInfoService;
-
+    private final RiderStationService riderStationService;
     private final SftpUtil sftpUtil;
 
     @GetMapping("excelOrder")
@@ -266,7 +266,14 @@ public class ExportExeclController {
         if(!StringUtils.hasText(queryDTO.getUserId())){
             return Result.error("用户id不能为空");
         }
-        ExportJob exportJob =this.buildExportJob("骑手排行.xlsx","rankList",queryDTO.getUserId(),queryDTO.toStrMessage(),queryDTO.toStrCode());
+        String strMessage=queryDTO.toStrMessage();
+        if(StringUtils.hasText(queryDTO.getRiderStationId())){
+            RiderStation riderStation=riderStationService.getById(queryDTO.getRiderStationId());
+            if(riderStation!=null){
+                strMessage=strMessage+"站点"+riderStation.getStationName();
+            }
+        }
+        ExportJob exportJob =this.buildExportJob("骑手排行.xlsx","rankList",queryDTO.getUserId(),strMessage,queryDTO.toStrCode());
         boolean a=exportJobService.save(exportJob);
         if (a){
             return Result.success("新增骑手排行导出计划成功");