fix
This commit is contained in:
parent
51c760f04e
commit
74e745dd04
@ -51,13 +51,14 @@ public class AssessManagerController extends AbstractController{
|
|||||||
@ApiOperation("获取考核列表")
|
@ApiOperation("获取考核列表")
|
||||||
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = AssessManagerListRes.class)})
|
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = AssessManagerListRes.class)})
|
||||||
public R assessList(@RequestBody AssessListReq req){
|
public R assessList(@RequestBody AssessListReq req){
|
||||||
|
Long userId = null;
|
||||||
try {
|
try {
|
||||||
Long userId = getUserId();
|
userId = getUserId();
|
||||||
req.setLoginUserId(userId);
|
req.setLoginUserId(userId);
|
||||||
PageUtils pageUtils = assessManagerService.assessList(req);
|
PageUtils pageUtils = assessManagerService.assessList(req);
|
||||||
return R.ok().put("data",pageUtils);
|
return R.ok().put("data",pageUtils);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("获取考核列表异常,",e);
|
log.error("获取考核列表异常,userId: " + userId,e);
|
||||||
return R.error(e.getMessage());
|
return R.error(e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -67,12 +68,13 @@ public class AssessManagerController extends AbstractController{
|
|||||||
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = AssessManagerDetailRes.class)})
|
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = AssessManagerDetailRes.class)})
|
||||||
public R assessDetail(@RequestBody AssessDetailReq req){
|
public R assessDetail(@RequestBody AssessDetailReq req){
|
||||||
PageUtils pageUtils;
|
PageUtils pageUtils;
|
||||||
|
Long userId = null;
|
||||||
try {
|
try {
|
||||||
Long userId = getUserId();
|
userId = getUserId();
|
||||||
req.setLoginUserId(userId);
|
req.setLoginUserId(userId);
|
||||||
pageUtils = assessManagerService.assessDetail(req);
|
pageUtils = assessManagerService.assessDetail(req);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("获取考核详情列表异常" ,e);
|
log.error("获取考核详情列表异常,userId: " + userId,e);
|
||||||
return R.error(e.getMessage());
|
return R.error(e.getMessage());
|
||||||
}
|
}
|
||||||
return R.ok().put("data",pageUtils);
|
return R.ok().put("data",pageUtils);
|
||||||
@ -86,12 +88,13 @@ public class AssessManagerController extends AbstractController{
|
|||||||
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatistical.class)})
|
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatistical.class)})
|
||||||
public R assessChart(@RequestBody AssessDetailReq req){
|
public R assessChart(@RequestBody AssessDetailReq req){
|
||||||
List<ChartStatistical> process;
|
List<ChartStatistical> process;
|
||||||
|
Long userId = null;
|
||||||
try {
|
try {
|
||||||
Long userId = getUserId();
|
userId = getUserId();
|
||||||
req.setLoginUserId(userId);
|
req.setLoginUserId(userId);
|
||||||
process = chartResultService.countAssessNumByFlowProcess(req);
|
process = chartResultService.countAssessNumByFlowProcess(req);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("获取详情顶部人数统计异常" ,e);
|
log.error("获取详情顶部人数统计异常,userId: " + userId,e);
|
||||||
return R.error(e.getMessage());
|
return R.error(e.getMessage());
|
||||||
}
|
}
|
||||||
return R.ok().put("data",process);
|
return R.ok().put("data",process);
|
||||||
|
|||||||
@ -19,13 +19,11 @@ import com.lz.modules.flow.dao.EvaluationStartStaffMapper;
|
|||||||
import com.lz.modules.flow.dao.FlowRecordMapper;
|
import com.lz.modules.flow.dao.FlowRecordMapper;
|
||||||
import com.lz.modules.flow.dao.FlowStartMapper;
|
import com.lz.modules.flow.dao.FlowStartMapper;
|
||||||
import com.lz.modules.flow.entity.EvaluationGroup;
|
import com.lz.modules.flow.entity.EvaluationGroup;
|
||||||
import com.lz.modules.flow.entity.EvaluationStartStaff;
|
|
||||||
import com.lz.modules.flow.entity.FlowStart;
|
import com.lz.modules.flow.entity.FlowStart;
|
||||||
import com.lz.modules.flow.model.GroupStaffs;
|
import com.lz.modules.flow.model.GroupStaffs;
|
||||||
import com.lz.modules.flow.model.StartGroups;
|
import com.lz.modules.flow.model.StartGroups;
|
||||||
import com.lz.modules.flow.service.EvaluationGroupService;
|
import com.lz.modules.flow.service.EvaluationGroupService;
|
||||||
import com.lz.modules.flow.service.EvaluationStartStaffService;
|
import com.lz.modules.flow.service.EvaluationStartStaffService;
|
||||||
import com.lz.modules.flow.service.FlowRecordService;
|
|
||||||
import com.lz.modules.flow.service.FlowStartService;
|
import com.lz.modules.flow.service.FlowStartService;
|
||||||
import com.lz.modules.job.business.DingtalkBusiness;
|
import com.lz.modules.job.business.DingtalkBusiness;
|
||||||
import com.lz.modules.performance.dto.ToScoreDingTalkDto;
|
import com.lz.modules.performance.dto.ToScoreDingTalkDto;
|
||||||
@ -40,21 +38,12 @@ import com.lz.modules.performance.service.AssessService;
|
|||||||
import com.lz.modules.sys.dao.app.ResultRecordMapper;
|
import com.lz.modules.sys.dao.app.ResultRecordMapper;
|
||||||
import com.lz.modules.sys.entity.app.ResultRecord;
|
import com.lz.modules.sys.entity.app.ResultRecord;
|
||||||
import com.lz.modules.sys.service.app.ResultRecordService;
|
import com.lz.modules.sys.service.app.ResultRecordService;
|
||||||
import com.sun.org.apache.regexp.internal.RE;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.collections.CollectionUtils;
|
import org.apache.commons.collections.CollectionUtils;
|
||||||
import org.apache.commons.lang.StringUtils;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
import java.util.concurrent.ExecutorService;
|
|
||||||
import java.util.concurrent.Executors;
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
import java.util.function.Function;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import static java.util.stream.Collectors.toList;
|
import static java.util.stream.Collectors.toList;
|
||||||
|
|
||||||
@ -291,7 +280,6 @@ public class AssessManagerServiceImpl implements AssessManagerService {
|
|||||||
Long evaluation = group.getId();
|
Long evaluation = group.getId();
|
||||||
int i = evaluationStartStaffService.updateBatchToScore(req.getStartId(), group.getId());
|
int i = evaluationStartStaffService.updateBatchToScore(req.getStartId(), group.getId());
|
||||||
log.info("更新evaluationStartStaff 数据 为已评分 " + i);
|
log.info("更新evaluationStartStaff 数据 为已评分 " + i);
|
||||||
|
|
||||||
List<ToScoreDingTalkDto> dtos = resultRecordMapper.selectToScoreList(req.getStartId(), evaluation);
|
List<ToScoreDingTalkDto> dtos = resultRecordMapper.selectToScoreList(req.getStartId(), evaluation);
|
||||||
if(CollectionUtils.isNotEmpty(dtos)){
|
if(CollectionUtils.isNotEmpty(dtos)){
|
||||||
log.info("本次评分更新操作 num: " + dtos.size());
|
log.info("本次评分更新操作 num: " + dtos.size());
|
||||||
@ -347,17 +335,4 @@ public class AssessManagerServiceImpl implements AssessManagerService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* public static void main(String[] args) {
|
|
||||||
ExecutorService executorService = Executors.newFixedThreadPool(10);
|
|
||||||
CompletableFuture<List<Long>> future = CompletableFuture.supplyAsync(()-> Arrays.asList(1L,2L),executorService);
|
|
||||||
try {
|
|
||||||
List<Long> longs = future.get();
|
|
||||||
System.out.println();
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
} catch (ExecutionException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user