diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 35fd9b0c..878206c1 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -562,7 +562,8 @@ public class ResultRecordController extends AbstractController { ) { //下面设置计算公式 dto.setCalculate(setCalculateValue(calculateModels1, dto)) ; - List resultTasks = resultTaskService.selectResultTasksByDetailId(dto.getId()); + List resultTaskDtos = resultTaskService.selectResultTaskDtosByDetailId(dto.getId()); + dto.setTaskDtos(resultTaskDtos); weight = weight.add(dto.getCheckWeight()); if(scoreDtos.size() > 0){ //获取评分详细 diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index 4bb551bf..03c8ced1 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -646,6 +646,7 @@ public class DingtalkBusiness { } public String sendTaskNoticeMsg(Long detailId, Long taskId) { + return "OK"; } public String sendNoticeMsg(ResultRecord lzResultRecord, List staffs) { diff --git a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java index c1e24370..92b0cb1b 100644 --- a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java +++ b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java @@ -44,4 +44,5 @@ public interface ResultTaskService extends IService { List selectResultTasksByDetailId(Long detailId); void deleteTask(Long taskId); + List selectResultTaskDtosByDetailId(Long detailId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java index 208ca3a7..f142c315 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -150,7 +150,6 @@ public class ResultTaskServiceImpl extends ServiceImpl selectResultTaskDtosByDetailId(Long detailId){ + return resultTaskMapper.selectResultTaskDtosByDetailId(detailId); + } } diff --git a/src/main/resources/mapper/performance/ResultTaskMapper.xml b/src/main/resources/mapper/performance/ResultTaskMapper.xml index d542f868..5b94ecd5 100644 --- a/src/main/resources/mapper/performance/ResultTaskMapper.xml +++ b/src/main/resources/mapper/performance/ResultTaskMapper.xml @@ -93,7 +93,7 @@