导出

src/main/java/com/huiju/estateagents/controller/StatisticalController.java

 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TdWxDict;
 import com.huiju.estateagents.excel.IntentionUser;
 import com.huiju.estateagents.excel.StatsBuilding;
 import com.huiju.estateagents.excel.StatsTimeBuilding;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.service.IStatisticalService;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计
         excelWriter.finish();
     }
 
+
+
+    /**
+     * 新增用户导出
+     * @return
+     */
+    @GetMapping(value = "/admin/exportUserStats")
+    public void exportUserStats(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                         @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
+                                         @RequestParam(value = "userType", required = false) String userType,
+                                         HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=新增用户.xlsx");
+        ResponseBean responseBean = iStatisticalService.selectPersonFrom(getOrgId(request), startDate, endDate);
+        List<List<String>> headerList = headerList(responseBean.getData());
+        List<List<String>> dataList = dataList(responseBean.getData(),userType);
+        EasyExcel.write(response.getOutputStream()).head(headerList).sheet("新增用户").doWrite(dataList);
+    }
+
+    /**
+     * 构建表数据
+     * @param data
+     * @return
+     */
+    private List<List<String>> dataList(Object data,String userType) {
+        Map<String, Object> map = (Map<String, Object>) data;
+        List<TsPersonFromStatistic> list = (List<TsPersonFromStatistic>) map.get("list");
+        List<List<String>> dataList = new ArrayList<>();
+        List<TdWxDict> tdWxDicts = (List<TdWxDict>) map.get("tdWxDicts");
+        list.forEach(l -> {
+            List<String> columlist = new ArrayList<>();
+            columlist.add(l.getCreateTime());
+            tdWxDicts.forEach(e -> {
+                if (e.getSceneType().equals(l.getSceneType())){
+                    if (userType.equals("registered")){
+                        columlist.add(l.getRegisteredNum().toString());
+                    }else {
+                        columlist.add(l.getFromNum().toString());
+                    }
+                }else {
+                    columlist.add("0");
+                }
+            });
+            dataList.add(columlist);
+        });
+        return dataList;
+    }
+
+    /**
+     * 构造表头
+     * @param data
+     * @return
+     */
+    private List<List<String>> headerList(Object data) {
+        Map<String, Object> map = (Map<String, Object>) data;
+        List<TdWxDict> tdWxDicts = (List<TdWxDict>) map.get("tdWxDicts");
+        List<List<String>> headerList = new ArrayList<>();
+        List<String> rqHeader = new ArrayList<>();
+        rqHeader.add("日期");
+        headerList.add(rqHeader);
+        tdWxDicts.forEach(e -> {
+            List<String> header = new ArrayList<>();
+            header.add(e.getSceneAlias());
+            headerList.add(header);
+        });
+        return headerList;
+    }
+
 }

src/main/resources/mapper/statistic/TsPersonFromStatisticMapper.xml

         GROUP BY
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' ),
         tp.scene_type
+        ORDER BY tp.create_date
     </select>
     <select id="selectNewLinePersonFromGroupByData"
             resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">