diff --git a/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java b/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java index 3c7cae1c..5c3d8f1d 100644 --- a/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java @@ -37,7 +37,7 @@ public interface ResultTagetLibMapper extends BaseMapper { int deleteResultTagetLibById(@Param("id")Long id); - List selectResultTagetLibByModelId(Long id); + List selectResultTagetLibByModelId(Long id); List selectByCondition(@Param("page") IPage page, @Param("req") ResultTagetLibSearchReq req); diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index 54756f5f..230044e9 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -383,9 +383,21 @@ public class FlowStartServiceImpl extends ServiceImpl resultTagetLibDtos = resultTagetLibService.selectResultTagetLibDtoByModelId(modelDto.getId()); + modelDto.setTagetLibs(resultTagetLibDtos); + } + //以下代码没必要更新,因为这个拷贝分用不到。正确的对应关系清查看lz_evaluation_start_staff //evaluationGroup.setStaffIds(evaluationGroup.getStaffIds() + ","); @@ -424,6 +436,8 @@ public class FlowStartServiceImpl extends ServiceImpl { int deleteResultTagetLibById(Long id); - List selectResultTagetLibByModelId(Long id); + List selectResultTagetLibByModelId(Long id); PageUtils selectResultTagetLibByReq(ResultTagetLibSearchReq req); diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java index 341f6aa2..50370d6b 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java @@ -55,7 +55,7 @@ public class ResultTagetLibServiceImpl extends ServiceImpl resultTagetLibDtos = selectResultTagetLibByModelId(resultModel.getId()); + List resultTagetLibDtos = selectResultTagetLibDtoByModelId(resultModel.getId()); BigDecimal weight = BigDecimal.ZERO; for(int i = 0; i < resultTagetLibDtos.size(); i++){ ResultTagetLibDto dto = resultTagetLibDtos.get(i); @@ -92,7 +92,7 @@ public class ResultTagetLibServiceImpl extends ServiceImpl selectResultTagetLibByModelId(Long id){ + public List selectResultTagetLibByModelId(Long id){ return resultTagetLibMapper.selectResultTagetLibByModelId(id); } diff --git a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml index f4a1edd6..bf1fd63e 100644 --- a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml +++ b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml @@ -89,7 +89,7 @@ update lz_result_taget_lib set is_delete = 1 where id=#{id} limit 1 - select * from lz_result_taget_lib where model_id=#{id} and is_delete = 0 order by order_by desc