From 7f9e0817073c0b1ef724a7b92c0df4d695012233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 29 Oct 2020 11:44:12 +0800 Subject: [PATCH 1/4] fix --- .../flow/service/EvaluationStartStaffService.java | 1 + .../performance/enums/ResultFlowProcessEnum.java | 3 ++- .../service/impl/AssessManagerServiceImpl.java | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java b/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java index e131eba6..113f65b5 100644 --- a/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java +++ b/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java @@ -39,4 +39,5 @@ public interface EvaluationStartStaffService extends IService strings = evaluationGroupService.selectAllStaffIdsByGroupId(Long.valueOf(s)); + + evaluationStartStaffService.insertEvaluationStartStaffs(); } } + } + + + private List buildList(List staffIds){ + List evaluationStartStaffs = new ArrayList<>(); + + + return evaluationStartStaffs; + } } From b8910416315f8682354076e45c3462d17262ac2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 29 Oct 2020 11:49:59 +0800 Subject: [PATCH 2/4] fix --- .../lz/modules/performance/enums/ResultFlowProcessEnum.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/enums/ResultFlowProcessEnum.java b/src/main/java/com/lz/modules/performance/enums/ResultFlowProcessEnum.java index fbab6c8b..35c082f9 100644 --- a/src/main/java/com/lz/modules/performance/enums/ResultFlowProcessEnum.java +++ b/src/main/java/com/lz/modules/performance/enums/ResultFlowProcessEnum.java @@ -11,8 +11,7 @@ public enum ResultFlowProcessEnum { DO(2,"执行中"), WRITE(3,"结果值录入"), SCORE(4,"评分"), - NODE(5,"审批节点（不用，跟flowchaet对应）"), - FINISH(6,"考核结束"), + FINISH(5,"考核结束"), ; private int status; From 5ab95765bc66256f54a7b87aa3ae340bc170913f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 29 Oct 2020 15:22:58 +0800 Subject: [PATCH 3/4] fix --- .../service/EvaluationStartStaffService.java | 2 -- .../impl/EvaluationStartStaffServiceImpl.java | 4 ---- .../controller/ChartController.java | 13 +---------- .../performance/res/ChartStatisticalRes.java | 3 +++ .../service/ChartResultService.java | 2 +- .../impl/AssessManagerServiceImpl.java | 22 ++++++++++--------- .../service/impl/ChartResultServiceImpl.java | 19 +++++++++++++++- 7 files changed, 35 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java b/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java index 113f65b5..96ba897d 100644 --- a/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java +++ b/src/main/java/com/lz/modules/flow/service/EvaluationStartStaffService.java @@ -38,6 +38,4 @@ public interface EvaluationStartStaffService extends IService chartStatisticalRes = chartResultService.chartReport(startId,defaultTime); + List chartStatisticalRes = chartResultService.chartReport(startId); return R.ok().put("data",chartStatisticalRes); } diff --git a/src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java b/src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java index e08c77e9..547fee59 100644 --- a/src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java +++ b/src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java @@ -20,6 +20,9 @@ public class ChartStatisticalRes { @ApiModelProperty(value = "默认时间 ",name = "defaultTime") private String defaultTime; + @ApiModelProperty(value = "0 月度 1：自定义 ",name = "defaultCycleType") + private Integer defaultCycleType; + @ApiModelProperty(value = "默认考核id ",name = "defaultId") private Long defaultId; diff --git a/src/main/java/com/lz/modules/performance/service/ChartResultService.java b/src/main/java/com/lz/modules/performance/service/ChartResultService.java index 0e309d81..40e85374 100644 --- a/src/main/java/com/lz/modules/performance/service/ChartResultService.java +++ b/src/main/java/com/lz/modules/performance/service/ChartResultService.java @@ -18,7 +18,7 @@ import java.util.List; */ public interface ChartResultService { - List chartReport(Long startId,String defaultTime); + List chartReport(Long startId); List countDepartmentAndStaffNum(ListstaffIds); diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index 16b060e1..69611a7b 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -158,24 +158,26 @@ public class AssessManagerServiceImpl implements AssessManagerService { @Override public void toScore(AssessToScoreReq req) { String[] split = req.getEvaluationIds().split(","); - for(String s:split){ - int i = evaluationStartStaffService.existByStartIdAndEvaluationId(req.getStartId(), Long.valueOf(s)); - if(i<1){ - //发起评分 - List strings = evaluationGroupService.selectAllStaffIdsByGroupId(Long.valueOf(s)); + Arrays.asList(split); - evaluationStartStaffService.insertEvaluationStartStaffs(); - - } - } + /* evaluationStartStaffService.updateBatchById() + evaluationStartStaffService.saveBatch()*/ } - private List buildList(List staffIds){ + private List buildStartStaffList(List staffIds){ List evaluationStartStaffs = new ArrayList<>(); + staffIds.forEach(new Consumer() { + @Override + public void accept(String s) { + EvaluationStartStaff startStaff = new EvaluationStartStaff(); + startStaff.setStaffId(Long.valueOf(s)); + + } + }); return evaluationStartStaffs; diff --git a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java index 78d819c5..ab4b38a9 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java @@ -3,6 +3,7 @@ package com.lz.modules.performance.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.collect.Maps; import com.lz.common.utils.PageUtils; +import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; import com.lz.modules.app.entity.DepartmentsEntity; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; @@ -62,7 +63,20 @@ public class ChartResultServiceImpl implements ChartResultService { @Override - public List chartReport(Long startId,String defaultTime) { + public List chartReport(Long startId) { + String defaultTime = StringUtil.EMPTY; + Integer defaultCycleType = null; + if(startId==null){ + //取最近一条记录 + FlowStart flowStart = flowStartMapper.selectRecentlyLimt(); + if(flowStart!=null){ + startId = flowStart.getId(); + defaultTime = flowStart.getName(); + defaultCycleType = flowStart.getCycleType(); + }else { + return new ArrayList<>(); + } + } List data = new ArrayList<>(); ChartStatisticalRes res; @@ -74,6 +88,7 @@ public class ChartResultServiceImpl implements ChartResultService { res.setDefaultTime(defaultTime); if(StringUtil.isNotBlank(defaultTime)){ res.setDefaultId(startId); + res.setDefaultCycleType(defaultCycleType); } data.add(res); @@ -84,6 +99,7 @@ public class ChartResultServiceImpl implements ChartResultService { res.setDefaultTime(defaultTime); if(StringUtil.isNotBlank(defaultTime)){ res.setDefaultId(startId); + res.setDefaultCycleType(defaultCycleType); } data.add(res); @@ -102,6 +118,7 @@ public class ChartResultServiceImpl implements ChartResultService { res.setDefaultTime(defaultTime); if(StringUtil.isNotBlank(defaultTime)){ res.setDefaultId(startId); + res.setDefaultCycleType(defaultCycleType); } data.add(res); return data; From 74c61f4b2d09a5de7ad442a785bc631d35154681 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Thu, 29 Oct 2020 15:38:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/modules/app/resp/FlowDetailResp.java | 2 ++ .../sys/service/app/impl/ResultRecordServiceImpl.java | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/lz/modules/app/resp/FlowDetailResp.java b/src/main/java/com/lz/modules/app/resp/FlowDetailResp.java index 7f957050..a463ed2d 100644 --- a/src/main/java/com/lz/modules/app/resp/FlowDetailResp.java +++ b/src/main/java/com/lz/modules/app/resp/FlowDetailResp.java @@ -7,4 +7,6 @@ public class FlowDetailResp { private Long currentStaffId; private String staffName; private Long flowRecordId; + private String departName; + } diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 599b258e..addfad95 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -3,6 +3,7 @@ package com.lz.modules.sys.service.app.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dingtalk.api.response.OapiDepartmentListResponse; import com.lz.common.emun.WorkMsgTypeEnum; import com.lz.common.exception.RRException; import com.lz.common.utils.*; @@ -1125,6 +1126,11 @@ public class ResultRecordServiceImpl extends ServiceImpl