fix
This commit is contained in:
parent
40bc33e5d9
commit
12575cd84a
@ -45,4 +45,6 @@ public interface EvaluationGroupMapper extends BaseMapper<EvaluationGroup> {
|
||||
|
||||
void deleteByCopyIds(@Param("ids") List<Long> ids);
|
||||
|
||||
List<Long> selectIdsByCopyIds(@Param("copyIds")String copyIds);
|
||||
|
||||
}
|
||||
@ -35,4 +35,6 @@ public class AssessDetailReq extends BasePage{
|
||||
private List<String> departmentIds;
|
||||
|
||||
private Long loginUserId;
|
||||
|
||||
private String copyEvaluationIds;
|
||||
}
|
||||
|
||||
@ -11,6 +11,7 @@ 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.EvaluationGroupMapper;
|
||||
import com.lz.modules.flow.dao.EvaluationStartStaffMapper;
|
||||
import com.lz.modules.flow.dao.FlowStartMapper;
|
||||
import com.lz.modules.flow.entity.EvaluationGroup;
|
||||
@ -36,6 +37,7 @@ import com.lz.modules.sys.service.app.ResultRecordService;
|
||||
import com.sun.org.apache.regexp.internal.RE;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@ -76,6 +78,8 @@ public class AssessManagerServiceImpl implements AssessManagerService {
|
||||
private FlowStartService flowStartService;
|
||||
@Autowired
|
||||
private AssessService assessService;
|
||||
@Autowired
|
||||
private EvaluationGroupMapper evaluationGroupMapper;
|
||||
|
||||
@Override
|
||||
public PageUtils assessList(AssessListReq req) {
|
||||
@ -115,6 +119,11 @@ public class AssessManagerServiceImpl implements AssessManagerService {
|
||||
|
||||
@Override
|
||||
public PageUtils assessDetail(AssessDetailReq req) {
|
||||
//拼接拷贝组
|
||||
if(StringUtil.isNotBlank(req.getEvaluationIds())){
|
||||
List<Long> evaluationIds = evaluationGroupMapper.selectIdsByCopyIds(req.getEvaluationIds());
|
||||
req.setCopyEvaluationIds(StringUtils.join(evaluationIds,","));
|
||||
}
|
||||
PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
|
||||
page -> resultRecordMapper.selectAssessListByStartId(page,req)
|
||||
);
|
||||
|
||||
@ -434,14 +434,14 @@
|
||||
</select>
|
||||
|
||||
<select id="selectAssessListByStartId" resultType="com.lz.modules.performance.res.AssessManagerDetailRes">
|
||||
select r.id,r.staff_id,staff_name,department_name,all_score,score_level,evaluation_name from lz_result_record r
|
||||
select DISTINCT (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
|
||||
and r.start_id = #{req.startId}
|
||||
<if test="req.evaluationIds !=null and req.evaluationIds !=''">
|
||||
<if test="req.copyEvaluationIds !=null and req.copyEvaluationIds !=''">
|
||||
and r.evaluation_id in(
|
||||
<foreach collection="req.evaluationIds.split(',')" item="evaluation_id" open="(" separator="," close=")">
|
||||
<foreach collection="req.copyEvaluationIds.split(',')" item="evaluation_id" open="(" separator="," close=")">
|
||||
#{evaluation_id}
|
||||
</foreach>
|
||||
)
|
||||
|
||||
@ -142,5 +142,14 @@
|
||||
</foreach>
|
||||
)
|
||||
</update>
|
||||
|
||||
<select id="selectIdsByCopyIds" resultType="long">
|
||||
select id from lz_evaluation_group where is_delete = 0
|
||||
and copy_id in (
|
||||
<foreach collection="copyIds" item="copy_id" separator=",">
|
||||
#{copy_id}
|
||||
</foreach>
|
||||
)
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user