From 50915b9f6b2601c4e87a0e6ddba12abc76ecfbb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Wed, 9 Dec 2020 16:03:40 +0800 Subject: [PATCH] fix --- .../controller/ResultRecordController.java | 3 ++- .../performance/dao/ResultTaskMapper.java | 4 +++- .../performance/dto/ResultTaskDto.java | 21 +------------------ .../service/ResultTaskService.java | 2 +- .../service/impl/ResultTaskServiceImpl.java | 6 +++--- .../mapper/performance/ResultTaskMapper.xml | 5 ++++- 6 files changed, 14 insertions(+), 27 deletions(-) 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 710ef288..c2490e58 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -26,6 +26,7 @@ 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.entity.ResultTask; import com.lz.modules.performance.res.ResultRankListRes; import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.performance.service.ResultTaskService; @@ -556,7 +557,7 @@ public class ResultRecordController extends AbstractController { ) { //下面设置计算公式 dto.setCalculate(setCalculateValue(calculateModels1, dto)) ; - List taskDtos = resultTaskService.selectResultTasksByDetailId(dto.getId()); + List resultTasks = resultTaskService.selectResultTasksByDetailId(dto.getId()); weight = weight.add(dto.getCheckWeight()); if(scoreDtos.size() > 0){ //获取评分详细 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 17820fed..1dfc2489 100644 --- a/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java @@ -33,6 +33,8 @@ public interface ResultTaskMapper extends BaseMapper { int deleteResultTaskById(@Param("id") Long id); - List selectResultTasksByDetailId(@Param("detailId") Long detailId); + List selectResultTaskDtosByDetailId(@Param("detailId") Long detailId); + + List selectResultTasksByDetailId(@Param("detailId") Long detailId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java index 71d340c1..e9a6228f 100644 --- a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java +++ b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java @@ -15,9 +15,6 @@ import java.math.BigDecimal; @Data @ApiModel(value = "任务表Dto") public class ResultTaskDto { - // - @ApiModelProperty(value = "", name = "id") - private Long id; //任务名称 @ApiModelProperty(value = "任务名称", name = "name") private String name; @@ -27,21 +24,6 @@ public class ResultTaskDto { //排序由小到大 @ApiModelProperty(value = "排序由小到大", name = "orderBy") private Integer orderBy; - /** - * - * @return - */ - public Long getId() { - return id; - } - /** - * - * @param id - */ - public void setId(Long id) { - this.id = id; - } - /** * 任务名称 * @return @@ -91,8 +73,7 @@ public class ResultTaskDto { @Override public String toString() { - return "ResultTaskDto{" + - ",id=" + id + + return "ResultTaskDto{" ",name=" + name + ",processRate=" + processRate + ",orderBy=" + orderBy + 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 1bb88f06..b1300452 100644 --- a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java +++ b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java @@ -39,5 +39,5 @@ public interface ResultTaskService extends IService { int saveOrUpdateResultTask(ResultUpdateTaskReq req); - List selectResultTasksByDetailId(Long detailId); + 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 db18d153..98c2bc60 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 @@ -88,7 +88,7 @@ public class ResultTaskServiceImpl extends ServiceImpl resultTasks = resultTaskMapper.selectResultTasksByDetailId(detailId); + List resultTasks = resultTaskMapper.selectResultTaskDtosByDetailId(detailId); res.setResultTasks(resultTasks); return res; } @@ -128,7 +128,7 @@ public class ResultTaskServiceImpl extends ServiceImpl resultTaskDtos = resultTaskMapper.selectResultTasksByDetailId(detailId); + List resultTaskDtos = resultTaskMapper.selectResultTaskDtosByDetailId(detailId); if(CollectionUtils.isEmpty(resultTaskDtos)){ log.info("未找到该绩效详情下得任务信息"); return BigDecimal.ZERO; @@ -170,7 +170,7 @@ public class ResultTaskServiceImpl extends ServiceImpl selectResultTasksByDetailId(Long detailId){ + public List 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 7375915c..f68f183e 100644 --- a/src/main/resources/mapper/performance/ResultTaskMapper.xml +++ b/src/main/resources/mapper/performance/ResultTaskMapper.xml @@ -84,9 +84,12 @@ update lz_result_task set is_delete = 1 where id=#{id} limit 1 - select * from lz_result_task where detail_id=#{detailId} and is_delete = 0 order by order_by asc +