Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

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<ResultTaskDto> 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);

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

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

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;
+
 /**
 * <p>
 * 任务表 服务类
@@ -36,4 +39,5 @@ public interface ResultTaskService extends IService<ResultTask> {
 	int saveOrUpdateResultTask(ResultUpdateTaskReq req);
 
 
+    List<ResultTaskDto> selectResultTasksByDetailId(Long detailId);
 }

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

@@ -166,8 +166,10 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 			taskProcessRecord.setLabel("将" +before.getName() + "得进度由"  + before.getProcessRate() + "更新为：" + after.getProcessRate());
 			return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue();
 		}
+	}
 
-		return -1;
+	@Override
-
+	public List<ResultTaskDto> selectResultTasksByDetailId(Long detailId){
+		return resultTaskMapper.selectResultTasksByDetailId(detailId);
 	}
 }

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

@@ -84,5 +84,9 @@
         update lz_result_task set is_delete = 1 where id=#{id} limit 1
     </update>
 
+    <select id="selectResultTasksByDetailId" resultType="ResultTask" >
+        select * from lz_result_task  where detail_id=#{detailId} and is_delete = 0 order by order_by asc
+    </select>
+
 </mapper>