线上线下分开导出

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/MaterialDataStaticsController.java

@@ -247,7 +247,7 @@ public class MaterialDataStaticsController {
         task.setDataType(1);
         task.setUser(user);
         task.setTotalCount(total);
-        String fileName = "素材-导购数据导出";
+        String fileName = "素材-" + materialStatisticsBaseQO.getMallDesc() + "导购数据导出";
         task.setFileName(fileName);
         task.setProjectCode("haoban_new");
         task.setChannelName("好办-素材导购数据");
@@ -307,7 +307,7 @@ public class MaterialDataStaticsController {
         user.setUserId(clerkDTO.getClerkId());
         user.setEnterpriseId(clerkDTO.getEnterpriseId());
         user.setRealName(clerkDTO.getClerkName());
-        String fileName = "素材-门店数据导出";
+        String fileName = "素材-" + materialStatisticsBaseQO.getMallDesc() + "门店数据导出";
         DownloadTask task = new DownloadTask();
         task.setTaskTypeEnum(TaskTypeEnum.CONTENT_USED_DOWNLOAD);
         task.setDataType(1);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/statistics/MaterialStatisticsBaseQO.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.time.DateUtils;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @Author MUSI
@@ -167,4 +168,13 @@ public class MaterialStatisticsBaseQO extends BasePageInfo {
     public void setMallType(Integer mallType) {
         this.mallType = mallType;
     }
+
+    public String getMallDesc() {
+        if (Objects.equals(this.mallType, 0)) {
+            return "线下";
+        } else if (Objects.equals(this.mallType, 1)) {
+            return "商城";
+        }
+        return "";
+    }
 }