diff --git a/src/main/java/com/lz/modules/app/controller/ReportResultController.java b/src/main/java/com/lz/modules/app/controller/ReportResultController.java index 580e8a2e..0d493bea 100644 --- a/src/main/java/com/lz/modules/app/controller/ReportResultController.java +++ b/src/main/java/com/lz/modules/app/controller/ReportResultController.java @@ -117,16 +117,6 @@ public class ReportResultController extends AbstractController{ } - @RequestMapping("/own/result") - public R ownResult(Long userId){ - if(userId == null){ - //如果id为空，查询自己信息 - userId = getUserId(); - } - List ownResultResp = resultRecordService.ownResult(userId, ResultRecordStatusEnum.AGREE.getStatus()); - return R.ok().put("data",ownResultResp); - } - } diff --git a/src/main/java/com/lz/modules/app/resp/OwnResultResp.java b/src/main/java/com/lz/modules/app/resp/OwnResultResp.java index 75d99562..210e36c7 100644 --- a/src/main/java/com/lz/modules/app/resp/OwnResultResp.java +++ b/src/main/java/com/lz/modules/app/resp/OwnResultResp.java @@ -1,5 +1,7 @@ package com.lz.modules.app.resp; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -10,9 +12,12 @@ import java.math.BigDecimal; * @Date: 2020/9/14 10:07 */ @Data +@ApiModel("个人成长曲线实体") public class OwnResultResp { - //月份 - private String monthTime; + //绩效 + @ApiModelProperty("绩效类型") + private String name; //最后得分 + @ApiModelProperty("最后得分") private BigDecimal lastScore; } 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 1cbc1293..64d25b01 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; +import com.lz.modules.app.enums.ResultRecordStatusEnum; +import com.lz.modules.app.resp.OwnResultResp; import com.lz.modules.equipment.entity.model.BasePage; import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.entity.FlowStart; @@ -15,6 +17,7 @@ import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.performance.res.ResultRankListRes; import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.sys.controller.AbstractController; +import com.lz.modules.sys.service.app.ResultRecordService; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +39,8 @@ public class ChartController extends AbstractController{ private ChartResultService chartResultService; @Autowired private FlowStartMapper flowStartMapper; + @Autowired + private ResultRecordService resultRecordService; @GetMapping("chart/result") @ApiOperation("获取绩效报表统计") @@ -84,11 +89,16 @@ public class ChartController extends AbstractController{ - @PostMapping("chart/test") - public R chartTest(){ - List starts = flowStartMapper.selectList(new QueryWrapper().in("group_ids", Collections.EMPTY_LIST)); - System.out.println(); - return null; + @RequestMapping("/own/result") + @ApiOperation("获取个人成长曲线") + @ApiResponses({@ApiResponse(code = 200,message = "成功",response = OwnResultResp.class)}) + public R ownResult(Long userId){ + if(userId == null){ + //如果id为空，查询自己信息 + userId = getUserId(); + } + List ownResultResps = resultRecordService.ownResult(null); + return R.ok().put("data",ownResultResps); } 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 aa80000b..135d0210 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 @@ -61,7 +61,7 @@ public interface ResultRecordMapper extends BaseMapper { List selectResultRecordByIds(@Param("recordIds") List recordIds); - List ownResult(@Param("userId") Long userId, @Param("status") int status); + List ownResult(@Param("staffId") Long staffId); List staffDistribution(@Param("monthTime") String monthTime,@Param("staffIds") List staffIds); 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 24001402..d631d887 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 @@ -77,7 +77,7 @@ public interface ResultRecordService extends IService { void sendWorkMSG(StaffEntity mySelf, StaffEntity toSelf, WorkMsgTypeEnum workMsgTypeEnum , Long recordResultId, int count); - List ownResult(Long userId, int status); + List ownResult(Long staffId); /** * 人员等级排布 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 2e6a569b..49c4e33c 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 @@ -738,8 +738,8 @@ public class ResultRecordServiceImpl extends ServiceImpl ownResult(Long userId, int status) { - return resultRecordMapper.ownResult(userId,status); + public List ownResult(Long staffId) { + return resultRecordMapper.ownResult(staffId); } @Override diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index a5ddf451..aac875cf 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -281,8 +281,14 @@ + SELECT all_score,name FROM lz_result_record r + LEFT JOIN lz_flow_start f + ON r.start_id = f.id + where r.is_delete = 0 and f.is_delete = 0 and flow_process = 5 and staff_id = #{staffId} + order by start_id desc + + +