fix

src/main/java/com/lz/modules/performance/controller/ChartController.java

@@ -2,25 +2,16 @@ package com.lz.modules.performance.controller;
 
 import com.lz.common.utils.PageUtils;
 import com.lz.common.utils.R;
-import com.lz.modules.flow.entity.EvaluationGroup;
+import com.lz.modules.equipment.entity.model.BasePage;
-import com.lz.modules.flow.service.EvaluationGroupService;
-import com.lz.modules.performance.req.ChartResultReq;
 import com.lz.modules.performance.res.ChartStatisticalRes;
 import com.lz.modules.performance.res.ResultRankListRes;
-import com.lz.modules.performance.res.TaskListRes;
 import com.lz.modules.performance.service.ChartResultService;
 import com.lz.modules.sys.controller.AbstractController;
 import io.swagger.annotations.*;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
-import java.util.function.ToLongFunction;
 
 /**
  * @Author: djc
@@ -36,19 +27,30 @@ public class ChartController extends AbstractController{
 
     @PostMapping("chart/result")
     @ApiOperation("获取绩效报表统计")
+    @ApiImplicitParam(name = "startId",value = "考核周期标识id", required = true, dataType = "Long",paramType = "query")
     @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatisticalRes.class)})
-    public R chartResult(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){
+    public R chartResult(@RequestParam Long startId){
-        List<ChartStatisticalRes> chartStatisticalRes = chartResultService.chartReport(req);
+        List<ChartStatisticalRes> chartStatisticalRes = chartResultService.chartReport(startId);
         return R.ok().put("data",chartStatisticalRes);
     }
 
-    @PostMapping("chart/rank")
+
+    @PostMapping("chart/starts")
+    @ApiOperation("获取考核类型列表")
+    @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatisticalRes.class)})
+    public R chartStarts(@RequestBody BasePage req){
+
+        return R.ok().put("data","");
+    }
+
+
+    /*@PostMapping("chart/rank")
     @ApiOperation("获取绩排名列表")
     @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultRankListRes.class)})
     public R rankList(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){
         PageUtils pageUtils = chartResultService.resultRankList(req);
         return R.ok().put("data",pageUtils);
-    }
+    }*/
 
 
 

src/main/java/com/lz/modules/performance/req/ChartResultReq.java

@@ -1,31 +0,0 @@
-package com.lz.modules.performance.req;
-
-import com.lz.modules.equipment.entity.model.BasePage;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.YearMonth;
-
-/**
- * @Author: djc
- * @Desc:
- * @Date: 2020/10/14 16:50
- */
-@Data
-@ApiModel(value = "绩效报表请求实体")
-public class ChartResultReq extends BasePage{
-    //考核类型  月度  季度
-    @ApiModelProperty(value = "考核类型 月度，自定义",name = "type")
-    private int type = 0;
-
-    @ApiModelProperty(value = "如果为月度 默认当前月",name = "month")
-    private String month = YearMonth.now().toString();
-
-    @ApiModelProperty(value = "自定义起始时间",name = "startTime")
-    private String startTime;
-
-    @ApiModelProperty(value = "自定义结束时间",name = "endTime")
-    private String endTime;
-
-}

src/main/java/com/lz/modules/performance/res/ChartStart.java

@@ -0,0 +1,12 @@
+package com.lz.modules.performance.res;
+
+import lombok.Data;
+
+@Data
+public class ChartStart{
+    
+    private String time;
+    
+    private Long startId;
+    
+}

src/main/java/com/lz/modules/performance/res/ChartStartsRes.java

@@ -0,0 +1,19 @@
+package com.lz.modules.performance.res;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: djc
+ * @Desc:
+ * @Date: 2020/10/26 14:21
+ */
+@Data
+public class ChartStartsRes {
+    private int type;
+
+    private List<ChartStart> list;
+
+}
+

src/main/java/com/lz/modules/performance/service/AssessService.java

@@ -2,7 +2,6 @@ package com.lz.modules.performance.service;
 
 import com.lz.common.utils.PageUtils;
 import com.lz.modules.performance.req.AssessTaskReq;
-import com.lz.modules.performance.req.ChartResultReq;
 import com.lz.modules.performance.res.ChartStatisticalRes;
 
 import java.util.List;
@@ -15,5 +14,5 @@ import java.util.List;
 public interface AssessService {
     PageUtils userTaskList(AssessTaskReq req,Long userId);
 
-    List<ChartStatisticalRes> chartResult(ChartResultReq req);
+    //List<ChartStatisticalRes> chartResult(ChartResultReq req);