fix

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<ResultTaskDto> taskDtos = resultTaskService.selectResultTasksByDetailId(dto.getId());
+                List<ResultTask> resultTasks = resultTaskService.selectResultTasksByDetailId(dto.getId());
                 weight = weight.add(dto.getCheckWeight());
                 if(scoreDtos.size() > 0){
                     //获取评分详细

src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java

@@ -33,6 +33,8 @@ public interface ResultTaskMapper extends BaseMapper<ResultTask> {
 
 	int deleteResultTaskById(@Param("id") Long id);
 
-	List<ResultTaskDto> selectResultTasksByDetailId(@Param("detailId") Long detailId);
+	List<ResultTaskDto> selectResultTaskDtosByDetailId(@Param("detailId") Long detailId);
+
+	List<ResultTask> selectResultTasksByDetailId(@Param("detailId") Long detailId);
 
 }

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{" +
+        return "ResultTaskDto{"
-                ",id=" + id +
                 ",name=" + name +
                 ",processRate=" + processRate +
                 ",orderBy=" + orderBy +

src/main/java/com/lz/modules/performance/service/ResultTaskService.java

@@ -39,5 +39,5 @@ public interface ResultTaskService extends IService<ResultTask> {
 	int saveOrUpdateResultTask(ResultUpdateTaskReq req);
 
 
-    List<ResultTaskDto> selectResultTasksByDetailId(Long detailId);
+    List<ResultTask> selectResultTasksByDetailId(Long detailId);
 }

src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java

@@ -88,7 +88,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
             res.setProcessRate(resultDetail1.getProcessRate());
             res.setTarget(resultDetail1.getTarget());
         });
-		List<ResultTaskDto> resultTasks = resultTaskMapper.selectResultTasksByDetailId(detailId);
+		List<ResultTaskDto> resultTasks = resultTaskMapper.selectResultTaskDtosByDetailId(detailId);
 		res.setResultTasks(resultTasks);
 		return res;
 	}
@@ -128,7 +128,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 
 	//计算总进度
 	private BigDecimal caclateResultDetailProcess(Long detailId){
-		List<ResultTaskDto> resultTaskDtos = resultTaskMapper.selectResultTasksByDetailId(detailId);
+		List<ResultTaskDto> resultTaskDtos = resultTaskMapper.selectResultTaskDtosByDetailId(detailId);
 		if(CollectionUtils.isEmpty(resultTaskDtos)){
 			log.info("未找到该绩效详情下得任务信息");
 			return BigDecimal.ZERO;
@@ -170,7 +170,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 	}
 
 	@Override
-	public List<ResultTaskDto> selectResultTasksByDetailId(Long detailId){
+	public List<ResultTask> selectResultTasksByDetailId(Long detailId){
 		return resultTaskMapper.selectResultTasksByDetailId(detailId);
 	}
 }

src/main/resources/mapper/performance/ResultTaskMapper.xml

@@ -84,9 +84,12 @@
         update lz_result_task set is_delete = 1 where id=#{id} limit 1
     </update>
 
-    <select id="selectResultTasksByDetailId" resultType="ResultTask" >
+    <select id="cselectResultTasksByDetailId" resultType="ResultTask" >
         select * from lz_result_task  where detail_id=#{detailId} and is_delete = 0 order by order_by asc
     </select>
 
+    <select id="selectResultTaskDtosByDetailId" resultType="com.lz.modules.performance.dto.ResultTaskDto" >
+        select name,processRate,orderBy from lz_result_task  where detail_id=#{detailId} and is_delete = 0 order by order_by asc
+    </select>
 </mapper>