Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

fs-admin/src/main/java/com/fs/web/controller/system/SysDeptController.java

@@ -9,6 +9,7 @@ import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.model.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.framework.web.service.TokenService;
 import com.fs.system.domain.SysDeptConfigLog;
 import com.fs.system.service.ISysConfigService;
@@ -229,7 +230,7 @@ public class SysDeptController extends BaseController
         startPage();
         SysDeptConfigLog query = new SysDeptConfigLog();
         query.setDeptId(deptId);
-        query.setLogType(1); // 1表示流量类型
+        query.setLogType(1); 
         List<SysDeptConfigLog> list = sysDeptConfigLogService.selectSysDeptConfigLogList(query);
         return getDataTable(list);
     }
@@ -243,8 +244,37 @@ public class SysDeptController extends BaseController
         startPage();
         SysDeptConfigLog query = new SysDeptConfigLog();
         query.setDeptId(deptId);
-        query.setLogType(0); // 0表示红包类型
+        query.setLogType(0); 
         List<SysDeptConfigLog> list = sysDeptConfigLogService.selectSysDeptConfigLogList(query);
         return getDataTable(list);
     }
+
+    /**
+     * 导出部门红包明细
+     */
+    @Log(title = "部门红包明细导出", businessType = BusinessType.EXPORT)
+    @GetMapping("/exportRedMoneyDetail")
+    public AjaxResult exportRedMoneyDetail(Long deptId){
+        SysDeptConfigLog query = new SysDeptConfigLog();
+        query.setDeptId(deptId);
+        query.setLogType(0);
+        List<SysDeptConfigLog> list = sysDeptConfigLogService.selectSysDeptConfigLogList(query);
+        ExcelUtil<SysDeptConfigLog> util = new ExcelUtil<>(SysDeptConfigLog.class);
+        return util.exportExcel(list, "部门红包明细数据");
+    }
+
+    
+    /**
+     * 导出部门流量明细
+     */
+    @Log(title = "部门流量明细导出", businessType = BusinessType.EXPORT)
+    @GetMapping("/exportFlowDetail")
+    public AjaxResult exportFlowDetail(Long deptId){
+        SysDeptConfigLog query = new SysDeptConfigLog();
+        query.setDeptId(deptId);
+        query.setLogType(1);
+        List<SysDeptConfigLog> list = sysDeptConfigLogService.selectSysDeptConfigLogList(query);
+        ExcelUtil<SysDeptConfigLog> util = new ExcelUtil<>(SysDeptConfigLog.class);
+        return util.exportExcel(list, "部门流量明细数据");
+    }
 }