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

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-11-05 10:12:04 +08:00
commit c3378a8021
6 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/config/ShiroConfig.java
View File

@ -69,7 +69,7 @@ public class ShiroConfig {
filterMap.put("/dtlg/jump", "anon");
filterMap.put("/luck/getLuckById", "anon");
filterMap.put("/luck/updateLuck", "anon");
filterMap.put("/**", "anon");
filterMap.put("/**", "oauth2");
shiroFilter.setFilterChainDefinitionMap(filterMap);
return shiroFilter;

1
src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
View File

@ -215,6 +215,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
flowStart1.setGroupIds(ids1.stream().collect(Collectors.joining(",")));//把新的组信息加入
updateById(flowStart1);//更新组信息到记录里面
flowStart.setGroupIds(ids.stream().collect(Collectors.joining(",")));//过滤后的考核组
flowStart.setId(flowStart1.getId());
flowStart.setIsDelete(flowStart1.getIsDelete());
}

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

@ -43,8 +43,7 @@ public class ChartController extends AbstractController{
public R chartResult(@RequestParam(required = false) @ApiParam(name = "startId",value = "考核周期标识id") Long startId){
List<ChartStatisticalRes> chartStatisticalRes = null;
try {
//Long userId = getUserId();
Long userId = 313L;
Long userId = getUserId();
chartStatisticalRes = chartResultService.chartReport(startId,userId);
} catch (Exception e) {
log.error("获取绩效报表统计异常" ,e);

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

@ -33,8 +33,8 @@ public class UserTaskController extends AbstractController{
public R list(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) AssessTaskReq req){
PageUtils pageUtils = null;
try {
//Long userId = getUserId();
pageUtils = assessService.userTaskList(req, 313L);
Long userId = getUserId();
pageUtils = assessService.userTaskList(req, userId);
} catch (Exception e) {
log.error("获取用户事项异常 userId:" ,e);
return R.error();

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

@ -105,8 +105,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
log.info("未找到考核发起数据");
return pageUtils;
}
//List<String> mandepartmentIds = assessService.roleDepartments(req.getLoginUserId());
List<String> mandepartmentIds = Collections.EMPTY_LIST;
List<String> mandepartmentIds = assessService.roleDepartments(req.getLoginUserId());
list.forEach(flowStart -> {
AssessManagerListRes res = new AssessManagerListRes();
String name = flowStart.getName();

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

@ -88,8 +88,7 @@ public class ChartResultServiceImpl implements ChartResultService {
}
}
//自己管理的部门
//List<String> mandepartmentIds = assessService.roleDepartments(staffId);
List<String> mandepartmentIds = Collections.EMPTY_LIST;
List<String> mandepartmentIds = assessService.roleDepartments(staffId);
List<ChartStatisticalRes> data = new ArrayList<>();
ChartStatisticalRes res;
@ -183,8 +182,7 @@ public class ChartResultServiceImpl implements ChartResultService {
List<String> allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId());
//自己管理的和所有的部门交集
log.info("selectChartDetailList 管理部门：" + JSON.toJSONString(allDeparmentIds));
//List<String> mandepartmentIds = assessService.roleDepartments(req.getLoginUserId());
List<String> mandepartmentIds = Collections.EMPTY_LIST;
List<String> mandepartmentIds = assessService.roleDepartments(req.getLoginUserId());
log.info("selectChartDetailList 管理部门：" + JSON.toJSONString(mandepartmentIds));
mandepartmentIds.retainAll(allDeparmentIds);
log.info("selectChartDetailList 交集部门：" + JSON.toJSONString(mandepartmentIds));
@ -225,8 +223,7 @@ public class ChartResultServiceImpl implements ChartResultService {
public List<ChartStatistical> countAssessNumByFlowProcess(AssessDetailReq req) {
List<ChartStatistical> process = resultRecordMapper.countAssessNumByFlowProcess(req);
//获取自己管理的部门
//List<String> mandepartmentIds = assessService.roleDepartments(req.getLoginUserId());
List<String> mandepartmentIds = Collections.EMPTY_LIST;
List<String> mandepartmentIds = assessService.roleDepartments(req.getLoginUserId());
List<ChartStatistical> data = buildProcess(process, req.getStartId(),mandepartmentIds);
return data;
}