wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wulin 2020-11-12 12:02:39 +08:00
commit 6ae642147f
5 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
View File

@ -57,7 +57,8 @@ public class AssessManagerController extends AbstractController{
PageUtils pageUtils = assessManagerService.assessList(req);
return R.ok().put("data",pageUtils);
} catch (Exception e) {
return R.error();
log.error("获取考核列表异常，",e);
return R.error(e.getMessage());
}
}
@ -65,17 +66,14 @@ public class AssessManagerController extends AbstractController{
@ApiOperation("获取考核详情列表")
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = AssessManagerDetailRes.class)})
public R assessDetail(@RequestBody AssessDetailReq req){
if(req.getStartId()==null){
return R.error("考核id不能为空");
}
PageUtils pageUtils = null;
PageUtils pageUtils;
try {
Long userId = getUserId();
req.setLoginUserId(userId);
pageUtils = assessManagerService.assessDetail(req);
} catch (Exception e) {
log.error("获取考核详情列表异常" ,e);
return R.error();
return R.error(e.getMessage());
}
return R.ok().put("data",pageUtils);
@ -87,17 +85,14 @@ public class AssessManagerController extends AbstractController{
@ApiOperation("获取考核详情列表人数统计")
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatistical.class)})
public R assessChart(@RequestBody AssessDetailReq req){
if(req.getStartId()==null){
return R.error("考核id不能为空");
}
List<ChartStatistical> process = null;
List<ChartStatistical> process;
try {
Long userId = getUserId();
req.setLoginUserId(userId);
process = chartResultService.countAssessNumByFlowProcess(req);
} catch (Exception e) {
log.error("获取详情顶部人数统计异常" ,e);
return R.error();
return R.error(e.getMessage());
}
return R.ok().put("data",process);
@ -108,15 +103,6 @@ public class AssessManagerController extends AbstractController{
@ApiOperation("考核管理组管理变更")
@ApiResponses({@ApiResponse(code = 200,message = "成功"),@ApiResponse(code = 503,message = "去设置",response = StaffSimpleDto.class)})
public R assessChange(@RequestBody AssessChangeReq req){
if(req.getStartId()==null){
return R.error("考核id不能为空");
}
if(req.getChangeType()==null){
return R.error("变动类型无效");
}
if(StringUtil.isBlank(req.getStaffIds())){
return R.error("变动人员不能为空");
}
try {
return assessManagerService.assessChange(req);
} catch (Exception e) {
@ -142,7 +128,7 @@ public class AssessManagerController extends AbstractController{
assessManagerService.accessDelete(flowStart);
} catch (Exception e) {
log.error("删除考核任务异常, id:" + assessId ,e);
return R.error();
return R.error(e.getMessage());
}
return R.ok();
}
@ -155,7 +141,7 @@ public class AssessManagerController extends AbstractController{
assessManagerService.toScore(req);
} catch (Exception e) {
log.error("开始评分异常" ,e);
return R.error();
return R.error(e.getMessage());
}
return R.ok();
}

10
src/main/java/com/lz/modules/performance/controller/ChartController.java
View File

@ -52,7 +52,7 @@ public class ChartController extends AbstractController{
chartStatisticalRes = chartResultService.chartReport(startId,userId);
} catch (Exception e) {
log.error("获取绩效报表统计异常" ,e);
return R.error();
return R.error(e.getMessage());
}
return R.ok().put("data",chartStatisticalRes);
}
@ -62,12 +62,12 @@ public class ChartController extends AbstractController{
@ApiOperation("获取考核类型列表")
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStartsRes.class)})
public R chartStarts(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true)ChartStartsReq req){
PageUtils pageUtils = null;
PageUtils pageUtils;
try {
pageUtils = chartResultService.chartStarts(req);
} catch (Exception e) {
log.error("获取考核类型列表异常" ,e);
return R.error();
return R.error(e.getMessage());
}
return R.ok().put("data",pageUtils);
}
@ -77,14 +77,14 @@ public class ChartController extends AbstractController{
@ApiOperation("获取报表等级详情")
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultRankListRes.class)})
public R chartDetailList(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){
PageUtils pageUtils = null;
PageUtils pageUtils;
try {
Long userId = getUserId();
req.setLoginUserId(userId);
pageUtils = chartResultService.selectChartDetailList(req);
} catch (Exception e) {
log.error("获取报表等级详情异常" ,e);
return R.error();
return R.error(e.getMessage());
}
return R.ok().put("data",pageUtils);
}

4
src/main/java/com/lz/modules/performance/controller/UserTaskController.java
View File

@ -31,13 +31,13 @@ public class UserTaskController extends AbstractController{
@ApiOperation("获取待办/处理事项")
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskListRes.class)})
public R list(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) AssessTaskReq req){
PageUtils pageUtils = null;
PageUtils pageUtils;
try {
Long userId = getUserId();
pageUtils = assessService.userTaskList(req, userId);
} catch (Exception e) {
log.error("获取用户事项异常 userId:" ,e);
return R.error();
return R.error(e.getMessage());
}
return R.ok().put("data",pageUtils);
}

17
src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
View File

@ -138,6 +138,9 @@ public class AssessManagerServiceImpl implements AssessManagerService {
@Override
public PageUtils assessDetail(AssessDetailReq req) {
if(req.getStartId() == null ){
throw new RRException("考核id不能为空");
}
//拼接拷贝组
if(StringUtil.isNotBlank(req.getEvaluationIds())){
req.setCopyEvaluationIds(evaluationGroupService.getEvaluationCopyIdsByEvaluationIds(req.getEvaluationIds(),req.getStartId()));
@ -180,6 +183,15 @@ public class AssessManagerServiceImpl implements AssessManagerService {
@Override
public R assessChange(AssessChangeReq req) {
if(req.getStartId()==null){
throw new RRException("考核id不能为空");
}
if(req.getChangeType()==null){
throw new RRException("变动类型无效");
}
if(StringUtil.isBlank(req.getStaffIds())){
throw new RRException("变动人员不能为空");
}
FlowStart flowStart = flowStartMapper.selectFlowStartById(req.getStartId());
if(flowStart == null){
throw new RRException("暂无此考核组信息");
@ -322,9 +334,10 @@ public class AssessManagerServiceImpl implements AssessManagerService {
//通知评分
try {
dingtalkBusiness.sendWorkMSGWithAsyn(toStaffids, WorkMsgTypeEnum.START_SCORE.getType());
String s = dingtalkBusiness.sendWorkMSGWithAsyn(toStaffids, WorkMsgTypeEnum.START_SCORE.getType());
log.info("钉钉评分响应返回，res：" + s);
} catch (Exception e) {
log.error("通知评分异常：",e);
log.error("通知评分异常：ids: " + JSON.toJSONString(toStaffids) + " ,e: " ,e);
}

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

@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.lz.common.exception.RRException;
import com.lz.common.utils.PageUtils;
import com.lz.common.utils.R;
import com.lz.common.utils.StringUtil;
@ -230,6 +231,9 @@ public class ChartResultServiceImpl implements ChartResultService {
@Override
public List<ChartStatistical> countAssessNumByFlowProcess(AssessDetailReq req) {
if(req.getStartId()==null){
throw new RRException("考核id不能为空");
}
req.setCopyEvaluationIds(evaluationGroupService.getEvaluationCopyIdsByEvaluationIds(req.getEvaluationIds(),req.getStartId()));
//获取自己管理的部门
List<String> mandepartmentIds = assessService.roleDepartments(req.getLoginUserId());