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

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

@@ -4,24 +4,22 @@ import com.lz.common.utils.R;
 import com.lz.common.utils.StringUtil;
 import com.lz.modules.app.entity.StaffEntity;
 import com.lz.modules.app.service.StaffService;
-import com.lz.modules.flow.entity.FlowRecord;
 import com.lz.modules.flow.service.FlowChangeService;
 import com.lz.modules.flow.service.FlowRecordService;
+import com.lz.modules.performance.req.AssessDetailReq;
+import com.lz.modules.performance.req.AssessListReq;
 import com.lz.modules.performance.res.TaskListRes;
 import com.lz.modules.sys.controller.AbstractController;
 import com.lz.modules.sys.entity.app.ResultRecord;
 import com.lz.modules.sys.service.app.ResultRecordService;
-import com.lz.modules.third.service.ThirdMsgSendRecordService;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 /**
  * @Author: djc
@@ -37,7 +35,7 @@ public class TaskController extends AbstractController{
     private FlowChangeService flowChangeService;
 
     @RequestMapping("task/list")
-    public R list(){
+    public R list(int status){
         List<TaskListRes> list = new ArrayList<>();
         Long userId = getUserId();
         List<Long> flowRecordIds = flowRecordService.selectFlowRecordIdsByApprovalStaffId(userId);
@@ -56,4 +54,20 @@ public class TaskController extends AbstractController{
         });
         return R.ok();
     }
+
+
+    @RequestMapping("assess/group/list")
+    public R groupList(@RequestBody AssessListReq req){
+        return R.ok();
+    }
+
+    @RequestMapping("assess/group/detail")
+    public R groupDetail(@RequestBody AssessDetailReq req){
+        return R.ok();
+    }
+
+    @RequestMapping("chart/result")
+    public R chartResult(@RequestBody AssessDetailReq req){
+        return R.ok();
+    }
 }

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

@@ -0,0 +1,16 @@
+package com.lz.modules.performance.req;
+
+import lombok.Data;
+
+/**
+ * @Author: djc
+ * @Desc:
+ * @Date: 2020/10/13 18:20
+ */
+@Data
+public class AssessDetailReq {
+    //考核类型  月度  季度
+    private int assessType;
+    //组名称
+    private String groupName;
+}

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

@@ -0,0 +1,32 @@
+package com.lz.modules.performance.req;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: djc
+ * @Desc:
+ * @Date: 2020/10/13 18:00
+ */
+@Data
+public class AssessListReq {
+    //考勤组id
+    private Long groupId;
+
+    private String month;
+
+    private String startTime;
+
+    private String endTime;
+    //周期类型
+    private int type;
+    //员工名称
+    private String staffName;
+    //部门ids数组
+    private List<Long> departments;
+    //人员id数组
+    private List<Long> staffIds;
+    //状态 确认 执行 结果录入。。。
+    private int status;
+}

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

@@ -0,0 +1,18 @@
+package com.lz.modules.performance.res;
+
+import lombok.Data;
+
+/**
+ * @Author: djc
+ * @Desc:
+ * @Date: 2020/10/13 18:25
+ */
+@Data
+public class chartStatisticalRes {
+
+    private String desc;
+    //人数
+    private int num;
+    //类型  0 节点  1 部门  2 等级
+    private int type;
+}