diff --git a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java index 4d5b7fdd..52a2fe34 100644 --- a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java @@ -45,4 +45,6 @@ public interface EvaluationGroupMapper extends BaseMapper { void deleteByCopyIds(@Param("ids") List ids); + List selectIdsByCopyIds(@Param("copyIds")String copyIds); + } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java b/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java index 3f2ca943..25d648e9 100644 --- a/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java +++ b/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java @@ -35,4 +35,6 @@ public class AssessDetailReq extends BasePage{ private List departmentIds; private Long loginUserId; + + private String copyEvaluationIds; } diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index 3850dab3..00ea06dd 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -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 evaluationIds = evaluationGroupMapper.selectIdsByCopyIds(req.getEvaluationIds()); + req.setCopyEvaluationIds(StringUtils.join(evaluationIds,",")); + } PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect( page -> resultRecordMapper.selectAssessListByStartId(page,req) ); diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index e59dd064..eeb6feb0 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -434,14 +434,14 @@ + select id from lz_evaluation_group where is_delete = 0 + and copy_id in ( + + #{copy_id} + + ) +