|
|
@@ -1,6 +1,7 @@
|
|
|
package com.goafanti.admin.controller;
|
|
|
|
|
|
import com.goafanti.admin.bo.AdminPublicDuration;
|
|
|
+import com.goafanti.admin.bo.AdminPublicDurationCount;
|
|
|
import com.goafanti.admin.service.AdminStatisticsService;
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.controller.CertifyApiController;
|
|
|
@@ -12,6 +13,7 @@ import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
@@ -145,20 +147,30 @@ public class AdminStatisticsController extends CertifyApiController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/month/data/export", method = RequestMethod.GET)
|
|
|
public Result monthDataExport(String date,Integer type) {
|
|
|
- Result res =new Result();
|
|
|
- NewExcelUtil<AdminPublicDuration> newExcelUtil=new NewExcelUtil<>(AdminPublicDuration.class);
|
|
|
+
|
|
|
Map<String, Object> map = adminStatisticsService.monthData(date);
|
|
|
- List<AdminPublicDuration> o;
|
|
|
String sheetName;
|
|
|
if (type==null||type==1){
|
|
|
+ NewExcelUtil<AdminPublicDuration> newExcelUtil=new NewExcelUtil<>(AdminPublicDuration.class);
|
|
|
sheetName="统计月份打卡数据(详情)";
|
|
|
- o = (List<AdminPublicDuration>) map.get("date");
|
|
|
+ List<AdminPublicDuration> o = (List<AdminPublicDuration>) map.get("date");
|
|
|
+ return newExcelUtil.exportExcel(o,sheetName,uploadPath);
|
|
|
}else {
|
|
|
sheetName="统计月份打卡数据(总计)";
|
|
|
- o = (List<AdminPublicDuration>) map.get("count");
|
|
|
+ List<AdminPublicDuration> o = (List<AdminPublicDuration>) map.get("count");
|
|
|
+ List<AdminPublicDurationCount> list = new ArrayList<>();
|
|
|
+ o.forEach(e->{
|
|
|
+ AdminPublicDurationCount adminPublicDurationCount = new AdminPublicDurationCount();
|
|
|
+ adminPublicDurationCount.setId(e.getId());
|
|
|
+ adminPublicDurationCount.setName(e.getName());
|
|
|
+ adminPublicDurationCount.setDuration(e.getDuration());
|
|
|
+ adminPublicDurationCount.setCountNumber(e.getCountNumber());
|
|
|
+ adminPublicDurationCount.setDays(e.getDays());
|
|
|
+ list.add(adminPublicDurationCount);
|
|
|
+ });
|
|
|
+ NewExcelUtil<AdminPublicDurationCount> newExcelUtil=new NewExcelUtil<>(AdminPublicDurationCount.class);
|
|
|
+ return newExcelUtil.exportExcel(list, sheetName, uploadPath);
|
|
|
}
|
|
|
- newExcelUtil.exportExcel(o,sheetName,uploadPath);
|
|
|
- return res;
|
|
|
}
|
|
|
|
|
|
}
|