From 86f244d091a7af3a74b59c59b616cd65a2a78c2d Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 9 Dec 2020 16:05:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultRecordController.java | 24 +++++++++++++++++++ .../modules/flow/model/ResultDetailDto.java | 2 ++ .../performance/dao/ResultTaskMapper.java | 1 + .../service/ResultTaskService.java | 2 ++ .../service/impl/ResultTaskServiceImpl.java | 6 +++++ .../mapper/performance/ResultTaskMapper.xml | 4 ++++ 6 files changed, 39 insertions(+) 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..9684e1d3 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.req.ResultUpdateTaskReq; import com.lz.modules.performance.res.ResultRankListRes; import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.performance.service.ResultTaskService; @@ -134,6 +135,8 @@ public class ResultRecordController extends AbstractController { @Autowired private ResultTaskService resultTaskService; + + private final static String TYPE = "H5_URL"; private final static String SEC_TYPE = "RECORD"; @@ -839,6 +842,27 @@ public class ResultRecordController extends AbstractController { index++; if(resultDetail.getId() != null){ updates.add(resultDetail); + if(resultDetail.getIsDelete() != null && resultDetail.getIsDelete().intValue() == 1){ + //删除任务 + resultTaskService.deleteResultTasksByDetailId(resultDetail.getId()); + }else{ + //更新任务 + if(detailDto.getTaskDtos() != null && detailDto.getTaskDtos().size() > 0){ + log.info("任务个数{}", detailDto.getTaskDtos().size()); + for (ResultTaskDto taskDto:detailDto.getTaskDtos() + ) { + ResultUpdateTaskReq taskReq = new ResultUpdateTaskReq(); + taskReq.setDetailId(resultDetail.getId()); + taskReq.setTasklId(taskDto.getId()); + taskReq.setName(taskDto.getName()); + taskReq.setProcessRate(taskDto.getProcessRate()); + resultTaskService.saveOrUpdateResultTask(taskReq); + } + + } + } + + }else{ resultDetail.setStaffId(resultRecord.getStaffId()); resultDetail.setRecordId(resultRecord.getId()); diff --git a/src/main/java/com/lz/modules/flow/model/ResultDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultDetailDto.java index a810ea87..0e71f3ed 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultDetailDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultDetailDto.java @@ -63,6 +63,8 @@ public class ResultDetailDto { private Long modelId; @ApiModelProperty(value = "指标任务列表", name = "taskDtos") List taskDtos; + @ApiModelProperty(value = "进度", name = "processRate") + private BigDecimal processRate; /** * * @return 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..986b9cac 100644 --- a/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java @@ -35,4 +35,5 @@ public interface ResultTaskMapper extends BaseMapper { List selectResultTasksByDetailId(@Param("detailId") Long detailId); + int deleteResultTasksByDetailId(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 1bb88f06..89a69897 100644 --- a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java +++ b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java @@ -40,4 +40,6 @@ public interface ResultTaskService extends IService { List selectResultTasksByDetailId(Long detailId); + + int deleteResultTasksByDetailId(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..ce29cff3 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 @@ -173,4 +173,10 @@ public class ResultTaskServiceImpl extends ServiceImpl selectResultTasksByDetailId(Long detailId){ return resultTaskMapper.selectResultTasksByDetailId(detailId); } + + @Override + public int deleteResultTasksByDetailId(Long detailId){ + //List tasks = resultTaskMapper.selectResultTasksByDetailId() + return resultTaskMapper.deleteResultTasksByDetailId(detailId); + } } diff --git a/src/main/resources/mapper/performance/ResultTaskMapper.xml b/src/main/resources/mapper/performance/ResultTaskMapper.xml index 7375915c..df365cc2 100644 --- a/src/main/resources/mapper/performance/ResultTaskMapper.xml +++ b/src/main/resources/mapper/performance/ResultTaskMapper.xml @@ -88,5 +88,9 @@ select * from lz_result_task where detail_id=#{detailId} and is_delete = 0 order by order_by asc + + update lz_result_task set is_delete = 1 where detail_id=#{detailId} limit 1 + +