Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

pom.xml

@@ -254,9 +254,6 @@
 			<version>20200811</version>
 		</dependency>
 
-
-
-
 	</dependencies>
 
 	<build>

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

@@ -18,13 +18,14 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/performance")
-//@Api(value="报表接口", tags={"报表统计"})
+@Api(value="报表接口", tags={"报表统计"})
 public class ChartController extends AbstractController{
 
     @PostMapping("chart/result")
-    @ApiOperation("获取待办/处理事项")
+    @ApiOperation("获取绩效报表统计")
     @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatisticalRes.class)})
-    public R chartResult(@RequestBody @ApiParam(name = "body",value = "body请求体") ChartResultReq req){
+    public R chartResult(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){
+
         return R.ok();
     }
 

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Author: djc
  * @Desc:

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

@@ -1,18 +1,32 @@
 package com.lz.modules.performance.res;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author: djc
  * @Desc:
  * @Date: 2020/10/13 18:25
  */
 @Data
+@ApiModel(value = "绩效报表统计实体")
 public class ChartStatisticalRes {
-
+    @ApiModelProperty(value = "类型 0：节点统计 1：人数统计 2：等级统计",name = "type")
-    private String desc;
-    //人数
-    private int num;
-    //类型  0 节点  1 部门  2 等级
     private int type;
+
+    private List<ChartStatistical> data;
+
+}
+
+@Data
+@ApiModel(value = "报表统计实体")
+class ChartStatistical {
+    @ApiModelProperty(value = "描述",name = "desc")
+    private String desc;
+
+    @ApiModelProperty(value = "人数",name = "num")
+    private int num;
 }

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

@@ -10,7 +10,7 @@ import lombok.Data;
  * @Date: 2020/10/13 17:15
  */
 @Data
-@ApiModel(value = "待办/处理事项列表返回")
+@ApiModel(value = "待办/处理事项列表实体")
 public class TaskListRes {
     //头像
     @ApiModelProperty(value = "头像", name = "avatar")
@@ -22,6 +22,6 @@ public class TaskListRes {
     @ApiModelProperty(value = "时间", name = "time")
     private String time;
     //跳转路径
-    @ApiModelProperty(value = "跳转路径url", name = "url")
+    @ApiModelProperty(value = "跳转流程id", name = "recordId")
-    private String url;
+    private Long recordId;
 }

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

@@ -2,6 +2,10 @@ 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;
 
 /**
  * @Author: djc
@@ -10,4 +14,6 @@ import com.lz.modules.performance.req.AssessTaskReq;
  */
 public interface AssessTaskService {
     PageUtils assessTaskList(AssessTaskReq req,Long userId);
+
+    List<ChartStatisticalRes> chartResult(ChartResultReq req);
 }

src/main/java/com/lz/modules/performance/service/impl/AssessTaskServiceImpl.java

@@ -9,6 +9,8 @@ import com.lz.modules.flow.service.FlowChangeService;
 import com.lz.modules.flow.service.FlowRecordService;
 import com.lz.modules.performance.dto.TaskListDto;
 import com.lz.modules.performance.req.AssessTaskReq;
+import com.lz.modules.performance.req.ChartResultReq;
+import com.lz.modules.performance.res.ChartStatisticalRes;
 import com.lz.modules.performance.res.TaskListRes;
 import com.lz.modules.performance.service.AssessTaskService;
 import org.apache.commons.collections.CollectionUtils;
@@ -54,7 +56,7 @@ public class AssessTaskServiceImpl implements AssessTaskService {
             res.setTitle(name + "的" + taskListDto.getMonthTime() + "");
             res.setTime(DateUtils.format(taskListDto.getGmtModified(),DateUtils.DATE_TIME_PATTERN));
             //跳转绩效详情页
-            res.setUrl("?" + taskListDto.getRecordId());
+            res.setRecordId(taskListDto.getRecordId());
             list.add(res);
         });
         data.setTotalCount(pageUtils.getTotalCount());
@@ -64,4 +66,10 @@ public class AssessTaskServiceImpl implements AssessTaskService {
         data.setCurrPage(req.getCurrPage());
         return data;
     }
+
+    @Override
+    public List<ChartStatisticalRes> chartResult(ChartResultReq req) {
+
+        return null;
+    }
 }

src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java

@@ -2,12 +2,15 @@ package com.lz.modules.performance.service.impl;
 
 import com.lz.modules.performance.req.AssessListReq;
 import com.lz.modules.performance.req.ChartResultReq;
+import com.lz.modules.performance.res.ChartStatisticalRes;
 import com.lz.modules.performance.service.ChartResultService;
 import com.lz.modules.sys.service.app.ResultRecordService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Author: djc
  * @Desc:
@@ -21,7 +24,7 @@ public class ChartResultServiceImpl implements ChartResultService {
     public void ChartReport(ChartResultReq req) {
         AssessListReq query = new AssessListReq();
         BeanUtils.copyProperties(req,query);
-        resultRecordService.countNumByFlowProcess(query);
+        List<ChartStatisticalRes> chartStatisticalRes = resultRecordService.countNumByFlowProcess(query);
 
 
     }