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

fix

Browse Source
This commit is contained in:
杜建超 2020-10-28 11:06:32 +08:00
parent 7546eb5ef4
commit 2b2ab2ff07
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/lz/modules/performance/req/ChartResultReq.java
View File

@ -20,6 +20,6 @@ public class ChartResultReq extends BasePage{
@ApiModelProperty(value = "考核id",name = "startId")
private Long startId;
@ApiModelProperty(value = "状态",name = "flowProcess")
private Long flowProcess;
@ApiModelProperty(value = "等级",name = "scoreLevel")
private Long scoreLevel;
}

11
src/main/java/com/lz/modules/performance/res/AssessManagerDetailRes.java
View File

@ -1,5 +1,7 @@
package com.lz.modules.performance.res;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
@ -11,15 +13,24 @@ import java.util.List;
* @Date: 2020/10/21 11:35
*/
@Data
@ApiModel("考核详情列表实体")
public class AssessManagerDetailRes {
@ApiModelProperty(value = "姓名",name = "staffName")
private String staffName;
@ApiModelProperty(value = "部门名称",name = "departmentName")
private String departmentName;
@ApiModelProperty(value = "考核组",name = "evaluationName")
private String evaluationName;
@ApiModelProperty(value = "考核结果",name = "allScore")
private String allScore;
@ApiModelProperty(value = "绩效等级",name = "scoreLevel")
private String scoreLevel;
@ApiModelProperty(value = "id",name = "id")
private Long id;
}

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

@ -138,7 +138,7 @@ public class ChartResultServiceImpl implements ChartResultService {
List<String> allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId());
List<String> ids = staffService.staffsByAllDeparmentIds(allDeparmentIds);
PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect(
page -> resultRecordMapper.selectChartDetailList(page,ids,req.getStartId(),req.getFlowProcess())
page -> resultRecordMapper.selectChartDetailList(page,ids,req.getStartId(),req.getScoreLevel())
);
return pageUtils;
}

2
src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
View File

@ -77,7 +77,7 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
List<ChartStatistical> countNumByScoreLevel(@Param("startId") Long startId);
List<ResultRecord> selectChartDetailList(@Param("page") IPage page, @Param("staffIds") List<String> staffIds, @Param("startId")Long startId,@Param("flowProcess")Long flowProcess);
List<ResultRecord> selectChartDetailList(@Param("page") IPage page, @Param("staffIds") List<String> staffIds, @Param("startId")Long startId,@Param("scoreLevel")Long scoreLevel);
void batchDeleteByStartId(@Param("startId")Long startId);

6
src/main/resources/mapper/app/ResultRecordMapper.xml
View File

@ -373,8 +373,8 @@
</foreach>
)
</if>
<if test="flowProcess !=null">
and r.flow_process = #{flowProcess}
<if test="scoreLevel !=null">
and r.score_level = #{scoreLevel}
</if>
ORDER BY all_score desc
</select>
@ -395,7 +395,7 @@
</select>
<select id="selectAssessListByStartId" resultType="com.lz.modules.performance.res.AssessManagerDetailRes">
select staff_name,department_name,all_score,score_level,evaluation_name from lz_result_record r
select r.id,staff_name,department_name,all_score,score_level,evaluation_name from lz_result_record r
LEFT JOIN lz_evaluation_start_staff s
ON r.start_id = s.start_id and r.staff_id = s.staff_id
where r.is_delete = 0 and s.is_delete = 0