From 5b68b85c53596cf0cb3a8f8e5307a0e93402dd07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 7 Dec 2020 17:03:07 +0800 Subject: [PATCH] fix --- .../controller/ResultRecordController.java | 11 +++-- .../app/resp/RecordDetailExportResp.java | 48 +++++++++++++++++++ .../controller/AssessManagerController.java | 9 ++++ 3 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/lz/modules/app/resp/RecordDetailExportResp.java 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 201afee6..2e2ed29b 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -14,6 +14,7 @@ import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.entity.StaffSimpleInfo; import com.lz.modules.app.req.RecordDetailExplanReq; import com.lz.modules.app.req.ResultRecordReq; +import com.lz.modules.app.resp.RecordDetailExportResp; import com.lz.modules.app.resp.ResultDetailResp; import com.lz.modules.app.resp.Step; import com.lz.modules.app.service.DepartmentsService; @@ -24,6 +25,7 @@ import com.lz.modules.flow.model.*; import com.lz.modules.flow.req.ResultDetailReq; import com.lz.modules.flow.service.*; import com.lz.modules.job.business.DingtalkBusiness; +import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.sys.controller.AbstractController; import com.lz.modules.sys.entity.Print; import com.lz.modules.sys.entity.Resource; @@ -97,8 +99,6 @@ public class ResultRecordController extends AbstractController { @Autowired private EvaluationStartStaffService evaluationStartStaffService; - - @Autowired private StaffRoleService staffRoleService; @@ -126,6 +126,9 @@ public class ResultRecordController extends AbstractController { @Autowired private ResourceService resourceService; + @Autowired + private ChartResultService chartResultService; + private final static String TYPE = "H5_URL"; private final static String SEC_TYPE = "RECORD"; @@ -1249,15 +1252,17 @@ public class ResultRecordController extends AbstractController { @ApiOperation("导出绩效详情报表") @GetMapping("/recordDetailExport") public R recordDetailExport(Long recordId){ + RecordDetailExportResp resp = new RecordDetailExportResp(); Map map = Maps.newHashMap(); map.put("id",recordId); R respnse = getDetail(map); if(respnse.isSuccess()){ ResultRecordDetailDto resultRecordDetailDto = (ResultRecordDetailDto) respnse.get("data"); + //chartResultService.selectLevelDetailList(req); } - return R.ok(); + return R.ok().put("data",resp); } @ApiOperation("保存绩效详情报表计划") diff --git a/src/main/java/com/lz/modules/app/resp/RecordDetailExportResp.java b/src/main/java/com/lz/modules/app/resp/RecordDetailExportResp.java new file mode 100644 index 00000000..42b97735 --- /dev/null +++ b/src/main/java/com/lz/modules/app/resp/RecordDetailExportResp.java @@ -0,0 +1,48 @@ +package com.lz.modules.app.resp; + +import com.lz.modules.flow.model.ResultRecortModelDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/12/7 15:53 + */ +@Data +public class RecordDetailExportResp { + + //员工工号 + @ApiModelProperty(value = "员工工号", name = "jobNumber") + private String jobNumber; + //员工姓名 + @ApiModelProperty(value = "员工姓名", name = "staffName") + private String staffName; + //职位 + @ApiModelProperty(value = "职位", name = "position") + private String position; + //最后得分 + @ApiModelProperty(value = "最后得分", name = "allScore") + private BigDecimal allScore; + //等级 + @ApiModelProperty(value = "等级", name = "scoreLevel") + private String scoreLevel; + + @ApiModelProperty(value = "考核维度合计", name = "recortModelDtos") + List recortModelDtos; + //一级部门 + @ApiModelProperty(value = "一级部门", name = "departmentOne") + private String departmentOne; + //二级部门 + @ApiModelProperty(value = "二级部门", name = "departmentTwo") + private String departmentTwo; + //三级部门 + @ApiModelProperty(value = "三级部门", name = "departmentThree") + private String departmentThree; + + //直属上级 + //考核月份 +} diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java index 2dbee8f0..5f6b4173 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -6,7 +6,9 @@ import com.lz.common.utils.StringUtil; import com.lz.modules.app.dto.StaffSimpleDto; import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.entity.FlowStart; +import com.lz.modules.flow.entity.StaffRole; import com.lz.modules.flow.service.EvaluationStartStaffService; +import com.lz.modules.flow.service.StaffRoleService; import com.lz.modules.performance.req.AssessChangeReq; import com.lz.modules.performance.req.AssessListReq; import com.lz.modules.performance.req.AssessDetailReq; @@ -46,6 +48,8 @@ public class AssessManagerController extends AbstractController{ private ResultRecordMapper resultRecordMapper; @Autowired private ChartResultService chartResultService; + @Autowired + private StaffRoleService staffRoleService; @@ -127,6 +131,11 @@ public class AssessManagerController extends AbstractController{ return R.error("没有此条记录"); } try { + Long userId = getUserId(); + StaffRole role = staffRoleService.selectByStaffId(userId); + if(role == null || role.getDepartmentId()!=0){ + return R.error("您不是绩效管理员或未管理全公司，无法删除此任务"); + } assessManagerService.accessDelete(flowStart); } catch (Exception e) { log.error("删除考核任务异常, id:" + assessId ,e);