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 4831fd21..94cf0e54 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -26,11 +26,10 @@ 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; -<<<<<<< HEAD + import com.lz.modules.performance.req.ResultUpdateTaskReq; -======= + import com.lz.modules.performance.entity.ResultTask; ->>>>>>> a686b4951729942fab37f1855cca21161b19793a import com.lz.modules.performance.res.ResultRankListRes; import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.performance.service.ResultTaskService; @@ -846,39 +845,46 @@ 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() - ) { - if(taskDto.getIsDelete() != null && taskDto.getIsDelete().intValue() == 1){ - //删除 - }else{ - 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()); resultDetail.setType(model.getType()); resultDetail.setModelId(model.getId()); - inserts.add(resultDetail); + resultDetailService.insertResultDetail(resultDetail); + + //inserts.add(resultDetail); } - if(resultDetail.getIsDelete() == null || resultDetail.getIsDelete().intValue() == 0){ + 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()); + int orderBy = 0; + for (ResultTaskDto taskDto:detailDto.getTaskDtos() + ) { + if(taskDto.getId() != null && taskDto.getIsDelete() != null && taskDto.getIsDelete().intValue() == 1){ + //删除 + resultTaskService.deleteTask(taskDto.getId()); + }else{ + ResultUpdateTaskReq taskReq = new ResultUpdateTaskReq(); + taskReq.setDetailId(resultDetail.getId()); + taskReq.setTasklId(taskDto.getId()); + taskReq.setName(taskDto.getName()); + taskReq.setOrderBy(orderBy); + taskReq.setProcessRate(taskDto.getProcessRate()); + resultTaskService.saveOrUpdateResultTask(taskReq); + orderBy++; + } + + } + + } + // } + //if(resultDetail.getIsDelete() == null || resultDetail.getIsDelete().intValue() == 0){ BigDecimal score = BigDecimal.ZERO; if(detailDto.getScoreDtos() != null){ for (ResultScoreDto scoreDto:detailDto.getScoreDtos() @@ -909,9 +915,9 @@ public class ResultRecordController extends AbstractController { }*/ } //下面更新指标记录 - if(inserts.size() > 0){ + /*if(inserts.size() > 0){ resultDetailService.saveBatch(inserts); - } + }*/ if(updates.size() > 0){ resultDetailService.updateBatchById(updates); } diff --git a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java index 470190a1..b0f3cb53 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java @@ -62,4 +62,11 @@ public class ResultTaskController { return R.ok().put("data",pageUtils); } + @GetMapping("/result/deleteTask") + @ApiOperation("任务删除") + @ApiResponses({@ApiResponse(code = 200,message = "成功")}) + public R deleteTask(Long taskId){ + resultTaskService.deleteTask(taskId); + return R.ok(); + } } 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 363a006c..636e619f 100644 --- a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java +++ b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java @@ -29,9 +29,6 @@ public class ResultTaskDto { //任务的当前进度 @ApiModelProperty(value = "任务的当前进度", name = "processRate") private BigDecimal processRate; - //排序由小到大 - @ApiModelProperty(value = "排序由小到大", name = "orderBy") - private Integer orderBy; /** * 任务名称 * @return @@ -64,27 +61,11 @@ public class ResultTaskDto { this.processRate = processRate; } - /** - * 排序由小到大 - * @return - */ - public Integer getOrderBy() { - return orderBy; - } - /** - * 排序由小到大 - * @param orderBy - */ - public void setOrderBy(Integer orderBy) { - this.orderBy = orderBy; - } - @Override public String toString() { return "ResultTaskDto{" + "name='" + name + '\'' + ", processRate=" + processRate + - ", orderBy=" + orderBy + '}'; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java b/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java index 51402c71..efeaa3b3 100644 --- a/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java +++ b/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java @@ -9,6 +9,8 @@ public enum ProcessRecordEnum { NAME(1,"修改名称"), PROCESS(2,"修改进度"), ALL(3,"全部修改"), + ADD(4,"增加"), + DELETE(5,"删除"), ; diff --git a/src/main/java/com/lz/modules/performance/req/ResultUpdateTaskReq.java b/src/main/java/com/lz/modules/performance/req/ResultUpdateTaskReq.java index ed989fa4..5bf9d423 100644 --- a/src/main/java/com/lz/modules/performance/req/ResultUpdateTaskReq.java +++ b/src/main/java/com/lz/modules/performance/req/ResultUpdateTaskReq.java @@ -27,5 +27,8 @@ public class ResultUpdateTaskReq { //更新说明 @ApiModelProperty(value = "更新说明", name = "remake") private String remake; + //排序由小到大 + @ApiModelProperty(value = "排序由小到大", name = "orderBy") + private Integer 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 ea850774..c1e24370 100644 --- a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java +++ b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java @@ -42,4 +42,6 @@ public interface ResultTaskService extends IService { int deleteResultTasksByDetailId(Long detailId); List selectResultTasksByDetailId(Long detailId); + + void deleteTask(Long taskId); } \ 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 dccd933a..3eb85768 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 @@ -113,6 +113,7 @@ public class ResultTaskServiceImpl extends ServiceImpl tasks = resultTaskMapper.selectResultTasksByDetailId(detailId); - for (ResultTask task:tasks - ) { + for (ResultTask task : tasks + ) { taskProcessRecordService.deleteTaskProcessRecordsByTaskId(task.getId()); taskCommentService.deleteTaskCommensByTaskId(task.getId()); } return resultTaskMapper.deleteResultTasksByDetailId(detailId); } + public void deleteTask(Long taskId) { + ResultTask resultTask = resultTaskMapper.selectResultTaskById(taskId); + resultTaskMapper.deleteResultTaskById(taskId); + TaskProcessRecord taskProcessRecord = new TaskProcessRecord(); + taskProcessRecord.setTaskId(taskId); + taskProcessRecord.setType(ProcessRecordEnum.DELETE.getType()); + taskProcessRecord.setLabel("将" +resultTask.getName() + "任务删除"); + taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord); + } } diff --git a/src/main/resources/mapper/performance/ResultTaskMapper.xml b/src/main/resources/mapper/performance/ResultTaskMapper.xml index 31ab5181..986fccb9 100644 --- a/src/main/resources/mapper/performance/ResultTaskMapper.xml +++ b/src/main/resources/mapper/performance/ResultTaskMapper.xml @@ -84,7 +84,7 @@ 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 @@ -95,7 +95,7 @@ ======= >>>>>>> a686b4951729942fab37f1855cca21161b19793a