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-03 09:31:07 +08:00
commit 4494f185dc
6 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,10 @@ public class AssessManagerDetailRes {
@ApiModelProperty(value = "绩效等级",name = "scoreLevel")
private String scoreLevel;
@ApiModelProperty(value = "id",name = "id")
@ApiModelProperty(value = "绩效record id",name = "id")
private Long id;
@ApiModelProperty(value = "人员staff id",name = "staffId")
private Long staffId;
}

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

@ -83,7 +83,7 @@ public class ChartResultServiceImpl implements ChartResultService {
List<ChartStatisticalRes> data = new ArrayList<>();
ChartStatisticalRes res;
List<ChartStatistical> process = resultRecordService.countNumByFlowProcess(startId);
List<ChartStatistical> process = resultRecordService.countNumByFlowProcess(startId,null,null);
res = new ChartStatisticalRes();
res.setType(0);
@ -95,7 +95,7 @@ public class ChartResultServiceImpl implements ChartResultService {
}
data.add(res);
List<ChartStatistical> scoreLevel = resultRecordService.countNumByScoreLevel(startId);
List<ChartStatistical> scoreLevel = resultRecordService.countNumByScoreLevel(startId,null,null);
res = new ChartStatisticalRes();
res.setType(1);
res.setStatisticals(scoreLevel);

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

@ -73,9 +73,9 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
List<ResultRecord> selectResultRecordAllByStaffId(@Param("staffId") Long staffId);
List<ChartStatistical> countNumByFlowProcess(@Param("startId") Long startId);
List<ChartStatistical> countNumByFlowProcess(@Param("startId") Long startId,@Param("evaluationIds")List<Long> evaluationIds,@Param("departmentIds")List<Long> departmentIds);
List<ChartStatistical> countNumByScoreLevel(@Param("startId") Long startId);
List<ChartStatistical> countNumByScoreLevel(@Param("startId") Long startId,@Param("evaluationIds")List<Long> evaluationIds,@Param("departmentIds")List<Long> departmentIds);
List<ResultRecord> selectChartDetailList(@Param("page") IPage page, @Param("staffIds") List<String> staffIds, @Param("startId")Long startId,@Param("scoreLevel")Long scoreLevel);

4
src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
View File

@ -103,9 +103,9 @@ public interface ResultRecordService extends IService<ResultRecord> {
List<ResultRecord> selectResultRecordAllByStaffId(Long staffId);
List<ChartStatistical> countNumByFlowProcess(Long startId);
List<ChartStatistical> countNumByFlowProcess(Long startId,List<Long> evaluationIds,List<Long> departmentIds);
List<ChartStatistical> countNumByScoreLevel(Long startId);
List<ChartStatistical> countNumByScoreLevel(Long startId,List<Long> evaluationIds,List<Long> departmentIds);
void batchDeleteByStaffIds(List<String> staffIds);

10
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -750,13 +750,13 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
}
@Override
public List<ChartStatistical> countNumByFlowProcess(Long startId) {
return resultRecordMapper.countNumByFlowProcess(startId);
public List<ChartStatistical> countNumByFlowProcess(Long startId,List<Long> evaluationIds,List<Long> departmentIds) {
return resultRecordMapper.countNumByFlowProcess(startId,evaluationIds,departmentIds);
}
@Override
public List<ChartStatistical> countNumByScoreLevel(Long startId) {
return resultRecordMapper.countNumByScoreLevel(startId);
public List<ChartStatistical> countNumByScoreLevel(Long startId,List<Long> evaluationIds,List<Long> departmentIds) {
return resultRecordMapper.countNumByScoreLevel(startId,evaluationIds,departmentIds);
}
@Override
@ -1111,7 +1111,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
flowIndex = flowRecord.getFlowIndex();
}
FlowRecordResp end = new FlowRecordResp();
end.setFlowName("线束");
end.setFlowName("结束");
flowRecordList.add(end);
List<ResultComment> resultCommentList = resultCommentService.selectByRecordId(recordDetailDto.getResultRecordId());

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

@ -353,11 +353,43 @@
</select>
<select id="countNumByFlowProcess" resultType="com.lz.modules.performance.res.ChartStatistical">
SELECT count(flow_process) num,flow_process as 'desc' from lz_result_record where is_delete=0 and start_id =#{startId} GROUP BY flow_process
SELECT count(flow_process) num,flow_process as 'desc' from lz_result_record where is_delete=0
and start_id =#{startId}
<if test="evaluationIds !=null and evaluationIds.size()!=0">
and evaluation_id in (
<foreach collection="evaluationIds" item="evaluation_id" separator=",">
#{evaluation_id}
</foreach>
)
</if>
<if test="departmentIds !=null and departmentIds.size()!=0">
and department_id in (
<foreach collection="departmentIds" item="department_id" separator=",">
#{department_id}
</foreach>
)
</if>
GROUP BY flow_process
</select>
<select id="countNumByScoreLevel" resultType="com.lz.modules.performance.res.ChartStatistical">
SELECT count(score_level) num,case score_level WHEN 0 THEN '无等级' ELSE score_level END as 'desc' from lz_result_record where is_delete=0 and start_id =#{startId} GROUP BY score_level
SELECT count(score_level) num,case score_level WHEN 0 THEN '无等级' ELSE score_level END as 'desc' from lz_result_record where is_delete=0
and start_id =#{startId}
<if test="evaluationIds !=null and evaluationIds.size()!=0">
and evaluation_id in (
<foreach collection="evaluationIds" item="evaluation_id" separator=",">
#{evaluation_id}
</foreach>
)
</if>
<if test="departmentIds !=null and departmentIds.size()!=0">
and department_id in (
<foreach collection="departmentIds" item="department_id" separator=",">
#{department_id}
</foreach>
)
</if>
GROUP BY score_level
</select>
<select id="selectChartDetailList" resultType="com.lz.modules.performance.res.ResultRankListRes">
@ -395,7 +427,7 @@
</select>
<select id="selectAssessListByStartId" resultType="com.lz.modules.performance.res.AssessManagerDetailRes">
select r.id,staff_name,department_name,all_score,score_level,evaluation_name from lz_result_record r
select r.id,r.staff_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