From b2134efefa97b9ad43e022b730f41978edc87251 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:05:15 +0800 Subject: [PATCH 1/5] fix --- src/main/resources/mapper/performance/ResultTaskMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/performance/ResultTaskMapper.xml b/src/main/resources/mapper/performance/ResultTaskMapper.xml index f68f183e..769079a9 100644 --- a/src/main/resources/mapper/performance/ResultTaskMapper.xml +++ b/src/main/resources/mapper/performance/ResultTaskMapper.xml @@ -89,7 +89,7 @@ From 1ea511358bbff1cc1ef4a7bb54adedba1e7ea193 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:05:45 +0800 Subject: [PATCH 2/5] fix --- src/main/resources/mapper/performance/ResultTaskMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/performance/ResultTaskMapper.xml b/src/main/resources/mapper/performance/ResultTaskMapper.xml index 769079a9..c8607394 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 From a85f4a937a18bf74211d336b190229d14f78bb66 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:08:43 +0800 Subject: [PATCH 3/5] fix --- .../performance/dto/ResultTaskDto.java | 19 ------------------- .../mapper/performance/ResultTaskMapper.xml | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) 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 90193073..b33ecd83 100644 --- a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java +++ b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java @@ -21,9 +21,6 @@ public class ResultTaskDto { //任务的当前进度 @ApiModelProperty(value = "任务的当前进度", name = "processRate") private BigDecimal processRate; - //排序由小到大 - @ApiModelProperty(value = "排序由小到大", name = "orderBy") - private Integer orderBy; /** * 任务名称 * @return @@ -56,27 +53,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/resources/mapper/performance/ResultTaskMapper.xml b/src/main/resources/mapper/performance/ResultTaskMapper.xml index c8607394..dc9a9832 100644 --- a/src/main/resources/mapper/performance/ResultTaskMapper.xml +++ b/src/main/resources/mapper/performance/ResultTaskMapper.xml @@ -89,7 +89,7 @@ From 8bac3406fbff92e433f7b56acca9d83e8ba55e12 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:23:29 +0800 Subject: [PATCH 4/5] fix --- .../lz/modules/performance/enums/ProcessRecordEnum.java | 2 ++ .../performance/service/impl/ResultTaskServiceImpl.java | 7 +++++++ 2 files changed, 9 insertions(+) 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/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java index 98c2bc60..f5a837c2 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 @@ -108,6 +108,7 @@ public class ResultTaskServiceImpl extends ServiceImpl Date: Wed, 9 Dec 2020 16:32:18 +0800 Subject: [PATCH 5/5] fix --- .../performance/controller/ResultTaskController.java | 7 +++++++ .../performance/service/ResultTaskService.java | 2 ++ .../service/impl/ResultTaskServiceImpl.java | 11 +++++++++++ 3 files changed, 20 insertions(+) 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/service/ResultTaskService.java b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java index b1300452..a024ce20 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); + + 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 f5a837c2..04141b4c 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 @@ -180,4 +180,15 @@ public class ResultTaskServiceImpl extends ServiceImpl selectResultTasksByDetailId(Long detailId){ return resultTaskMapper.selectResultTasksByDetailId(detailId); } + + @Override + 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); + } }