From b136e0cf6e558cd485be8e1b2f96e7ca21d18646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 3 Nov 2020 14:36:17 +0800 Subject: [PATCH 1/7] fix --- .../controller/ChartController.java | 3 +- .../performance/req/AssessDetailReq.java | 2 + .../performance/req/AssessListReq.java | 4 ++ .../performance/req/ChartResultReq.java | 3 ++ .../res/AssessManagerDetailRes.java | 3 ++ .../performance/service/AssessService.java | 4 +- .../service/ChartResultService.java | 2 +- .../impl/AssessManagerServiceImpl.java | 18 ++++++++- .../service/impl/AssessServiceImpl.java | 14 +++---- .../service/impl/ChartResultServiceImpl.java | 37 +++++++++++++++---- .../sys/dao/app/ResultRecordMapper.java | 6 +-- .../sys/service/app/ResultRecordService.java | 4 +- .../app/impl/ResultRecordServiceImpl.java | 4 +- .../mapper/app/ResultRecordMapper.xml | 14 +++++++ 14 files changed, 91 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/controller/ChartController.java b/src/main/java/com/lz/modules/performance/controller/ChartController.java index 55b9492a..78cfc9c7 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -42,7 +42,8 @@ public class ChartController extends AbstractController{ public R chartResult(@RequestParam(required = false) @ApiParam(name = "startId",value = "考核周期标识id") Long startId){ List chartStatisticalRes = null; try { - chartStatisticalRes = chartResultService.chartReport(startId); + Long userId = getUserId(); + chartStatisticalRes = chartResultService.chartReport(startId,userId); } catch (Exception e) { log.error("获取绩效报表统计异常" ,e); return R.error(); diff --git a/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java b/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java index aa7dd4fe..1d478e8e 100644 --- a/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java +++ b/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java @@ -31,4 +31,6 @@ public class AssessDetailReq extends BasePage{ //状态 确认 执行 结果录入。。。 @ApiModelProperty(value = "状态 确认 执行 结果录入。。。",name = "flowProcess") private Integer flowProcess; + + private List departmentIds; } diff --git a/src/main/java/com/lz/modules/performance/req/AssessListReq.java b/src/main/java/com/lz/modules/performance/req/AssessListReq.java index 4d778d94..4626259f 100644 --- a/src/main/java/com/lz/modules/performance/req/AssessListReq.java +++ b/src/main/java/com/lz/modules/performance/req/AssessListReq.java @@ -4,6 +4,7 @@ import com.lz.modules.equipment.entity.model.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.beans.factory.annotation.Autowired; /** * @Author: djc @@ -19,4 +20,7 @@ public class AssessListReq extends BasePage { //组名称 @ApiModelProperty(value = "考核名称",name = "name") private String name; + + private Long staffId; + } diff --git a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java index 89921e5e..b848ea53 100644 --- a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java @@ -22,4 +22,7 @@ public class ChartResultReq extends BasePage{ @ApiModelProperty(value = "等级",name = "scoreLevel") private Long scoreLevel; + + private Long staffId; + } diff --git a/src/main/java/com/lz/modules/performance/res/AssessManagerDetailRes.java b/src/main/java/com/lz/modules/performance/res/AssessManagerDetailRes.java index 7c9a840c..4921ce50 100644 --- a/src/main/java/com/lz/modules/performance/res/AssessManagerDetailRes.java +++ b/src/main/java/com/lz/modules/performance/res/AssessManagerDetailRes.java @@ -15,6 +15,9 @@ import java.util.List; @Data @ApiModel("考核详情列表实体") public class AssessManagerDetailRes { + //头像 + @ApiModelProperty(value = "头像", name = "avatar") + private String avatar; @ApiModelProperty(value = "姓名",name = "staffName") private String staffName; diff --git a/src/main/java/com/lz/modules/performance/service/AssessService.java b/src/main/java/com/lz/modules/performance/service/AssessService.java index cfb46616..cc482098 100644 --- a/src/main/java/com/lz/modules/performance/service/AssessService.java +++ b/src/main/java/com/lz/modules/performance/service/AssessService.java @@ -17,9 +17,9 @@ public interface AssessService { /** * - * @param staffRole + * @param staffId * @return null 为全部部门 size = 0 为没有部门 */ - List roleDepartment(StaffRole staffRole); + List roleDepartments(Long staffId); } 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 40e85374..6d67af17 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); + List chartReport(Long startId,Long staffId); 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 01e8acca..cecdf9b6 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 @@ -1,5 +1,6 @@ package com.lz.modules.performance.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.collect.Maps; import com.lz.common.exception.RRException; @@ -8,6 +9,7 @@ import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; import com.lz.modules.app.dto.ApprovalDto; import com.lz.modules.app.dto.StaffSimpleDto; +import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.service.StaffService; import com.lz.modules.flow.dao.EvaluationStartStaffMapper; import com.lz.modules.flow.dao.FlowStartMapper; @@ -27,6 +29,7 @@ import com.lz.modules.performance.req.AssessToScoreReq; import com.lz.modules.performance.res.AssessManagerDetailRes; import com.lz.modules.performance.res.AssessManagerListRes; import com.lz.modules.performance.service.AssessManagerService; +import com.lz.modules.performance.service.AssessService; import com.lz.modules.sys.dao.app.ResultRecordMapper; import com.lz.modules.sys.entity.app.ResultRecord; import com.lz.modules.sys.service.app.ResultRecordService; @@ -71,6 +74,8 @@ public class AssessManagerServiceImpl implements AssessManagerService { private EvaluationStartStaffMapper evaluationStartStaffMapper; @Autowired private FlowStartService flowStartService; + @Autowired + private AssessService assessService; @Override public PageUtils assessList(AssessListReq req) { @@ -82,6 +87,7 @@ public class AssessManagerServiceImpl implements AssessManagerService { if(CollectionUtils.isEmpty(list)){ return pageUtils; } + List mandepartmentIds = assessService.roleDepartments(req.getStaffId()); list.forEach(flowStart -> { AssessManagerListRes res = new AssessManagerListRes(); String name = flowStart.getName(); @@ -90,7 +96,8 @@ public class AssessManagerServiceImpl implements AssessManagerService { if(name.contains("绩效考核")){ res.setCycleTime(name.substring(0,name.lastIndexOf("绩效考核"))); } - int i = resultRecordMapper.countStartAndGroupNum(flowStart.getId()); + //过滤非自己管理的人员 + int i = resultRecordMapper.countStartAndGroupNum(flowStart.getId(),mandepartmentIds); ResultRecord resultRecord = resultRecordMapper.selectOneByStartId(flowStart.getId()); res.setJoinNum(resultRecord == null? StringUtil.EMPTY : resultRecord.getStaffName() + i + "等人"); data.add(res); @@ -109,6 +116,12 @@ public class AssessManagerServiceImpl implements AssessManagerService { PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect( page -> resultRecordMapper.selectAssessListByStartId(page,req) ); + List list = pageUtils.getList(); + list.forEach(assessManagerDetailRes -> { + StaffEntity staffEntity = staffService.selectStaffById(assessManagerDetailRes.getStaffId()); + assessManagerDetailRes.setAvatar(Optional.ofNullable(staffEntity.getAvatar()).orElse(StringUtil.EMPTY)); + }); + return pageUtils; } @@ -236,7 +249,8 @@ public class AssessManagerServiceImpl implements AssessManagerService { approvalDto.setResultRecordId(aLong); approvalDto.setMenuName("开始评分"); try { - resultRecordService.newApproval(approvalDto); + R r = resultRecordService.newApproval(approvalDto); + log.info("绩效id aLong :" + aLong + " ,res" + JSON.toJSONString(r)); } catch (Exception e) { log.error("执行中状态跳过失败 recorId:" + aLong,e); } diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java index d0e756b6..5c29e7c9 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java @@ -8,10 +8,7 @@ import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.service.StaffService; import com.lz.modules.flow.entity.StaffRole; import com.lz.modules.flow.entity.StaffRoleDepartment; -import com.lz.modules.flow.service.FlowChangeService; -import com.lz.modules.flow.service.FlowRecordService; -import com.lz.modules.flow.service.StaffRoleDepartmentService; -import com.lz.modules.flow.service.StaffRoleEvaluationGroupService; +import com.lz.modules.flow.service.*; import com.lz.modules.performance.dto.TaskListDto; import com.lz.modules.performance.req.AssessTaskReq; import com.lz.modules.performance.res.ChartStatisticalRes; @@ -49,6 +46,8 @@ public class AssessServiceImpl implements AssessService { private StaffRoleDepartmentService staffRoleDepartmentService; @Autowired private StaffRoleEvaluationGroupService staffRoleEvaluationGroupService; + @Autowired + private StaffRoleService staffRoleService; @Override public PageUtils userTaskList(AssessTaskReq req,Long userId) { @@ -68,7 +67,7 @@ public class AssessServiceImpl implements AssessService { name = "您"; } //根据状态拼接文案 - res.setTitle(name + "的" + taskListDto.getMonthTime() + ""); + res.setTitle(name + "的" + taskListDto.getMonthTime() + "绩效考核 "); res.setTime(DateUtils.format(taskListDto.getGmtModified(),DateUtils.DATE_TIME_PATTERN)); //跳转绩效详情页 res.setRecordId(taskListDto.getRecordId()); @@ -84,7 +83,8 @@ public class AssessServiceImpl implements AssessService { @Override - public List roleDepartment(StaffRole staffRole) { + public List roleDepartments(Long staffId) { + StaffRole staffRole = staffRoleService.selectByStaffId(staffId); if(staffRole == null){ log.info("staffRole 为空"); return Collections.EMPTY_LIST; @@ -103,7 +103,7 @@ public class AssessServiceImpl implements AssessService { allDepart.addAll(strings); }); - List collect = allDepart.stream().distinct().map(s -> Long.valueOf(s)).collect(Collectors.toList()); + List collect = allDepart.stream().distinct().collect(Collectors.toList()); return collect; } log.info("未获取到用户权限对应的部门 roleID: " + staffRole.getId()); 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 20a59c38..4490f275 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 @@ -1,5 +1,6 @@ package com.lz.modules.performance.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.collect.Maps; import com.lz.common.utils.PageUtils; @@ -24,6 +25,7 @@ import com.lz.modules.performance.req.ChartStartsReq; import com.lz.modules.performance.res.ChartStartsRes; import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.performance.res.ChartStatisticalRes; +import com.lz.modules.performance.service.AssessService; import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.sys.dao.app.ResultRecordMapper; import com.lz.modules.sys.entity.app.ResultRecord; @@ -62,15 +64,18 @@ public class ChartResultServiceImpl implements ChartResultService { private DepartmentsService departmentsService; @Autowired private FlowChartService flowChartService; + @Autowired + private AssessService assessService; @Override - public List chartReport(Long startId) { + public List chartReport(Long startId,Long staffId) { String defaultTime = StringUtil.EMPTY; Integer defaultCycleType = null; + FlowStart flowStart = null; if(startId==null){ //取最近一条记录 - FlowStart flowStart = flowStartMapper.selectRecentlyLimt(); + flowStart = flowStartMapper.selectRecentlyLimt(); if(flowStart!=null){ log.info("首次进入，默认返回最新记录 flowStartId:" + flowStart.getId()); startId = flowStart.getId(); @@ -80,10 +85,12 @@ public class ChartResultServiceImpl implements ChartResultService { return new ArrayList<>(); } } + //自己管理的部门 + List mandepartmentIds = assessService.roleDepartments(staffId); List data = new ArrayList<>(); ChartStatisticalRes res; - List process = resultRecordService.countNumByFlowProcess(startId,null,null); + List process = resultRecordService.countNumByFlowProcess(startId,null,mandepartmentIds); res = new ChartStatisticalRes(); res.setType(0); @@ -95,7 +102,7 @@ public class ChartResultServiceImpl implements ChartResultService { } data.add(res); - List scoreLevel = resultRecordService.countNumByScoreLevel(startId,null,null); + List scoreLevel = resultRecordService.countNumByScoreLevel(startId,null,mandepartmentIds); res = new ChartStatisticalRes(); res.setType(1); res.setStatisticals(scoreLevel); @@ -106,14 +113,24 @@ public class ChartResultServiceImpl implements ChartResultService { } data.add(res); - FlowStart flowStart = flowStartMapper.selectFlowStartById(startId); + //如果不是默认，获得发起考核信息 + if(flowStart == null){ + flowStart = flowStartMapper.selectFlowStartById(startId); + } String[] split = flowStart.getGroupIds().split(","); Set staffIds = new HashSet<>(); for(String s:split){ List strings = evaluationGroupService.selectAllStaffIdsByGroupId(Long.valueOf(s)); staffIds.addAll(strings); } - List all = new ArrayList<>(staffIds); + log.info("chartReport 所有人员：" + JSON.toJSONString(staffIds)); + //自己管理的和发起的人员交集 + List manstaffIds = staffService.staffsByAllDeparmentIds(mandepartmentIds); + log.info("chartReport 管理人员：" + JSON.toJSONString(manstaffIds)); + manstaffIds.retainAll(staffIds); + log.info("chartReport 交集人员：" + JSON.toJSONString(manstaffIds)); + + List all = new ArrayList<>(manstaffIds); List depstaff = this.countDepartmentAndStaffNum(all); res = new ChartStatisticalRes(); res.setType(2); @@ -161,7 +178,13 @@ public class ChartResultServiceImpl implements ChartResultService { @Override public PageUtils selectChartDetailList(ChartResultReq req) { List allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId()); - List ids = staffService.staffsByAllDeparmentIds(allDeparmentIds); + //自己管理的和所有的部门交集 + log.info("selectChartDetailList 管理部门：" + JSON.toJSONString(allDeparmentIds)); + List mandepartmentIds = assessService.roleDepartments(req.getStaffId()); + log.info("selectChartDetailList 管理部门：" + JSON.toJSONString(mandepartmentIds)); + mandepartmentIds.retainAll(allDeparmentIds); + log.info("selectChartDetailList 交集部门：" + JSON.toJSONString(mandepartmentIds)); + List ids = staffService.staffsByAllDeparmentIds(mandepartmentIds); PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect( page -> resultRecordMapper.selectChartDetailList(page,ids,req.getStartId(),req.getScoreLevel()) ); diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java index bf9f9a14..6d67c384 100644 --- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java +++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java @@ -73,15 +73,15 @@ public interface ResultRecordMapper extends BaseMapper { List selectResultRecordAllByStaffId(@Param("staffId") Long staffId); - List countNumByFlowProcess(@Param("startId") Long startId,@Param("evaluationIds")List evaluationIds,@Param("departmentIds")List departmentIds); + List countNumByFlowProcess(@Param("startId") Long startId,@Param("evaluationIds")List evaluationIds,@Param("departmentIds")List departmentIds); - List countNumByScoreLevel(@Param("startId") Long startId,@Param("evaluationIds")List evaluationIds,@Param("departmentIds")List departmentIds); + List countNumByScoreLevel(@Param("startId") Long startId,@Param("evaluationIds")List evaluationIds,@Param("departmentIds")List departmentIds); List selectChartDetailList(@Param("page") IPage page, @Param("staffIds") List staffIds, @Param("startId")Long startId,@Param("scoreLevel")Long scoreLevel); int batchDeleteByStartId(@Param("startId")Long startId); - int countStartAndGroupNum(@Param("startId")Long startId); + int countStartAndGroupNum(@Param("startId")Long startId,@Param("departmentIds")List departmentIds); ResultRecord selectOneByStartId(@Param("startId")Long startId); diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java index 0479e567..24001402 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java @@ -103,9 +103,9 @@ public interface ResultRecordService extends IService { List selectResultRecordAllByStaffId(Long staffId); - List countNumByFlowProcess(Long startId,List evaluationIds,List departmentIds); + List countNumByFlowProcess(Long startId,List evaluationIds,List departmentIds); - List countNumByScoreLevel(Long startId,List evaluationIds,List departmentIds); + List countNumByScoreLevel(Long startId,List evaluationIds,List departmentIds); void batchDeleteByStaffIds(List staffIds); 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 f071c467..dd593118 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 @@ -750,12 +750,12 @@ public class ResultRecordServiceImpl extends ServiceImpl countNumByFlowProcess(Long startId,List evaluationIds,List departmentIds) { + public List countNumByFlowProcess(Long startId,List evaluationIds,List departmentIds) { return resultRecordMapper.countNumByFlowProcess(startId,evaluationIds,departmentIds); } @Override - public List countNumByScoreLevel(Long startId,List evaluationIds,List departmentIds) { + public List countNumByScoreLevel(Long startId,List evaluationIds,List departmentIds) { return resultRecordMapper.countNumByScoreLevel(startId,evaluationIds,departmentIds); } diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 886340b8..353c9c7a 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -420,6 +420,13 @@ From 3e51dbc961b297dd885e9e263435c20024dfc3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 3 Nov 2020 14:54:00 +0800 Subject: [PATCH 2/7] fix --- .../performance/service/impl/AssessManagerServiceImpl.java | 7 +++++-- .../performance/service/impl/AssessServiceImpl.java | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) 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 cecdf9b6..def09c4c 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 @@ -85,6 +85,7 @@ public class AssessManagerServiceImpl implements AssessManagerService { ); List list = pageUtils.getList(); if(CollectionUtils.isEmpty(list)){ + log.info("未找到考核发起数据"); return pageUtils; } List mandepartmentIds = assessService.roleDepartments(req.getStaffId()); @@ -240,8 +241,10 @@ public class AssessManagerServiceImpl implements AssessManagerService { List recordIds = resultRecordMapper.selectToScoreList(req.getStartId(), evaluation); if(CollectionUtils.isEmpty(recordIds)){ + log.info("该考评组无数据 evaluationId:" + evaluation); continue; } + log.info("本次评分更新操作 num: " + recordIds.size()); recordIds.forEach(aLong -> { //更新流程绩效 ApprovalDto approvalDto = new ApprovalDto(); @@ -262,7 +265,7 @@ public class AssessManagerServiceImpl implements AssessManagerService { } - public static void main(String[] args) { + /* public static void main(String[] args) { ExecutorService executorService = Executors.newFixedThreadPool(10); CompletableFuture> future = CompletableFuture.supplyAsync(()-> Arrays.asList(1L,2L),executorService); try { @@ -273,6 +276,6 @@ public class AssessManagerServiceImpl implements AssessManagerService { } catch (ExecutionException e) { e.printStackTrace(); } - } + }*/ } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java index 5c29e7c9..85e7b4a5 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java @@ -104,6 +104,7 @@ public class AssessServiceImpl implements AssessService { }); List collect = allDepart.stream().distinct().collect(Collectors.toList()); + log.info("获取到权限对应的部门 " + JSON.toJSONString(collect)); return collect; } log.info("未获取到用户权限对应的部门 roleID: " + staffRole.getId()); From e8d8f0020e28520003c06fcf7762074ce53e0857 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 3 Nov 2020 14:58:24 +0800 Subject: [PATCH 3/7] =?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 --- .../modules/sys/service/app/impl/ResultRecordServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 e1864723..a31efd34 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 @@ -1118,6 +1118,8 @@ public class ResultRecordServiceImpl extends ServiceImpl resultCommentList = resultCommentService.selectByRecordId(recordDetailDto.getResultRecordId()); Map auth = new HashMap<>(); + auth.put("showScore",1); + auth.put("showResult",1); List currentResultRecords = flowRecordService.selectFlowRecordByRecordIdStatus(recordDetailDto.getResultRecordId(),2); if(currentResultRecords !=null && currentResultRecords.size() > 0 ){ FlowRecord currentResultRecord = null; From 491f31797dcde22d0c65578c36550b44fb1d31a6 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 3 Nov 2020 15:14:08 +0800 Subject: [PATCH 4/7] =?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 --- .../app/controller/ResultRecordController.java | 5 +---- .../com/lz/modules/app/resp/FlowDetailResp.java | 1 + .../service/app/impl/ResultRecordServiceImpl.java | 13 ++++++++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 95d696ed..ff74be58 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -966,13 +966,10 @@ public class ResultRecordController extends AbstractController { } - - - /** * 删除 */ - // 审批：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=267&status=1&comment=xxx&menuName=bbb + // 审批：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=1&comment=xxx&menuName=bbb // 跳过：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=4&menuName=bbb&flowRecordId=360 // 转交：http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=8&menuName=bbb&flowRecordId=360&transferStaffId=294 @RequestMapping("/new/approval") 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 a463ed2d..14c1225a 100644 --- a/src/main/java/com/lz/modules/app/resp/FlowDetailResp.java +++ b/src/main/java/com/lz/modules/app/resp/FlowDetailResp.java @@ -8,5 +8,6 @@ public class FlowDetailResp { private String staffName; private Long flowRecordId; private String departName; + private String avatar; } 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 5c9fd4dc..9603f5bd 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,7 +3,6 @@ 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.*; @@ -1107,16 +1106,22 @@ public class ResultRecordServiceImpl extends ServiceImpl flowDetailRespList = new ArrayList<>(); mySetFlowDetailRespList(flowDetailRespList,flowRecord); - resp.setFlowDetailRespList(flowDetailRespList); flowRecordList.add(resp); flowIndex = flowRecord.getFlowIndex(); } + boolean flag = true; + for(FlowRecordResp flowRecordResp : flowRecordList) { + if (flowRecordResp.getStatus() == 0) { + flag = false; + break; + } + } FlowRecordResp end = new FlowRecordResp(); end.setFlowName("结束"); + end.setStatus(flag ? 1 : 0); flowRecordList.add(end); List resultCommentList = resultCommentService.selectByRecordId(recordDetailDto.getResultRecordId()); - Map auth = new HashMap<>(); auth.put("showScore",1); auth.put("showResult",1); @@ -1161,7 +1166,9 @@ public class ResultRecordServiceImpl extends ServiceImpl Date: Tue, 3 Nov 2020 15:30:35 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=82=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/app/controller/ResultRecordController.java | 3 ++- .../java/com/lz/modules/sys/entity/app/ResultComment.java | 7 +++++++ .../sys/service/app/impl/ResultRecordServiceImpl.java | 5 +++++ src/main/resources/mapper/app/ResultCommentMapper.xml | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index ff74be58..4f51d89e 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -254,6 +254,7 @@ public class ResultRecordController extends AbstractController { list.add(resultDetailService.getWenHuaJiaZhiGuaResult2()); list.add(resultDetailService.getLastResult(resultRecord.getLastScore())); List comments = resultCommentService.selectByRecordId(resultRecord.getId()); + if (CollectionUtils.isNotEmpty(comments)) { ResultDetailResp header = new ResultDetailResp(); header.setCheckRange("领导"); @@ -987,7 +988,7 @@ public class ResultRecordController extends AbstractController { /** * 删除 */ - // http://localhost:8080/lz_management/user/lzresultrecord/new/resultRecordDetail?resultRecordId=322&loginUserId=313 + // http://localhost:8080/lz_management/user/lzresultrecord/new/resultRecordDetail?resultRecordId=331&loginUserId=825 @RequestMapping("/new/resultRecordDetail") public R newResultRecordList(RecordDetailDto recordDetailDto) { if(recordDetailDto.getLoginUserId() ==null && getUser() !=null ){ diff --git a/src/main/java/com/lz/modules/sys/entity/app/ResultComment.java b/src/main/java/com/lz/modules/sys/entity/app/ResultComment.java index d9eff989..e0e6d0d2 100644 --- a/src/main/java/com/lz/modules/sys/entity/app/ResultComment.java +++ b/src/main/java/com/lz/modules/sys/entity/app/ResultComment.java @@ -1,4 +1,5 @@ package com.lz.modules.sys.entity.app; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; @@ -6,6 +7,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; + /** *

*

*业绩评论表 @@ -50,6 +53,10 @@ public class ResultComment implements java.io.Serializable { //操作名称 @ApiModelProperty(value = "操作名称", name = "optDesc") private String optDesc; + + + @TableField(exist=false) + private String avatar; /** * * @return 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 9603f5bd..74b1017f 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 @@ -1122,6 +1122,11 @@ public class ResultRecordServiceImpl extends ServiceImpl resultCommentList = resultCommentService.selectByRecordId(recordDetailDto.getResultRecordId()); + for(ResultComment resultComment:resultCommentList){ + StaffEntity staffEntity = staffService.selectStaffById(resultComment.getStaffId()); + resultComment.setAvatar(staffEntity.getAvatar()); + } + Map auth = new HashMap<>(); auth.put("showScore",1); auth.put("showResult",1); diff --git a/src/main/resources/mapper/app/ResultCommentMapper.xml b/src/main/resources/mapper/app/ResultCommentMapper.xml index b26c1b68..9a24a613 100644 --- a/src/main/resources/mapper/app/ResultCommentMapper.xml +++ b/src/main/resources/mapper/app/ResultCommentMapper.xml @@ -102,7 +102,7 @@