提交仓库

 controller代码合并

mjava-lanyun/src/main/java/com/malk/lanyun/controller/TimerController.java

@@ -1,6 +1,7 @@
 package com.malk.lanyun.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.malk.lanyun.entity.ProjectAnalysis;
 import com.malk.lanyun.service.NCService;
 import com.malk.lanyun.service.TimerService;
 import com.malk.server.common.McException;
@@ -18,6 +19,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
@@ -66,4 +68,27 @@ public class TimerController {
     }
 
 
+    /**
+     * 采购订单导出excel
+     * @param data 前端传入数据
+     * @param response 响应头
+     * @param request  请求头
+     */
+    @PostMapping("exportExecl")
+    void exportAttendance(@RequestBody Map data, HttpServletResponse response, HttpServletRequest request) {
+        timerService.execlExport(data,response,request);
+    }
+
+    /**
+     * 分组查询项目点经营分析报表
+     * @param data 传参年月
+     * @return 返回封装McR
+     */
+    @PostMapping("projectAnalysisGroup")
+    McR<ProjectAnalysis> projectAnalysisGroup(@RequestBody Map<String,Object> data) {
+        List<ProjectAnalysis> projectAnalyses = timerService.projectAnalysisGroup(data);
+        return McR.success(projectAnalyses);
+    }
+
+
 }