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 8a551d81..710ef288 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -25,8 +25,10 @@ import com.lz.modules.flow.model.*; import com.lz.modules.flow.req.ResultDetailReq; import com.lz.modules.flow.service.*; import com.lz.modules.job.business.DingtalkBusiness; +import com.lz.modules.performance.dto.ResultTaskDto; import com.lz.modules.performance.res.ResultRankListRes; import com.lz.modules.performance.service.ChartResultService; +import com.lz.modules.performance.service.ResultTaskService; import com.lz.modules.sys.controller.AbstractController; import com.lz.modules.sys.entity.Print; import com.lz.modules.sys.entity.Resource; @@ -129,6 +131,9 @@ public class ResultRecordController extends AbstractController { @Autowired private ChartResultService chartResultService; + @Autowired + private ResultTaskService resultTaskService; + private final static String TYPE = "H5_URL"; private final static String SEC_TYPE = "RECORD"; @@ -551,6 +556,7 @@ public class ResultRecordController extends AbstractController { ) { //下面设置计算公式 dto.setCalculate(setCalculateValue(calculateModels1, dto)) ; + List taskDtos = resultTaskService.selectResultTasksByDetailId(dto.getId()); weight = weight.add(dto.getCheckWeight()); if(scoreDtos.size() > 0){ //获取评分详细 @@ -613,6 +619,7 @@ public class ResultRecordController extends AbstractController { } } resultRecortModelDto.setDetailDtos(detailDtos); + resultRecortModelDtos.add(resultRecortModelDto); } resultRecordDetailDto.setWeight(weight); diff --git a/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java b/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java index 2039028a..17820fed 100644 --- a/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java @@ -33,8 +33,6 @@ public interface ResultTaskMapper extends BaseMapper { int deleteResultTaskById(@Param("id") Long id); - List selectResultTasksByDetailId(Long detailId); - - + List selectResultTasksByDetailId(@Param("detailId") Long detailId); } \ No newline at end of file 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 2161a534..1bb88f06 100644 --- a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java +++ b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java @@ -1,10 +1,13 @@ package com.lz.modules.performance.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.lz.modules.performance.dto.ResultTaskDto; import com.lz.modules.performance.entity.ResultTask; import com.lz.modules.performance.req.ResultUpdateTaskReq; import com.lz.modules.performance.res.ResultTaskDetailRes; +import java.util.List; + /** *

* 任务表 服务类 @@ -36,4 +39,5 @@ public interface ResultTaskService extends IService { int saveOrUpdateResultTask(ResultUpdateTaskReq req); + List selectResultTasksByDetailId(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 2fade1fa..d8823b3a 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 @@ -160,9 +160,10 @@ public class ResultTaskServiceImpl extends ServiceImpl selectResultTasksByDetailId(Long detailId){ + return resultTaskMapper.selectResultTasksByDetailId(detailId); } } diff --git a/src/main/resources/mapper/performance/ResultTaskMapper.xml b/src/main/resources/mapper/performance/ResultTaskMapper.xml index eaea5edb..7375915c 100644 --- a/src/main/resources/mapper/performance/ResultTaskMapper.xml +++ b/src/main/resources/mapper/performance/ResultTaskMapper.xml @@ -84,5 +84,9 @@ update lz_result_task set is_delete = 1 where id=#{id} limit 1 + +