From 515dadf81257b3fb23bf3e791717061990237ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 26 Oct 2020 18:04:11 +0800 Subject: [PATCH] fix --- .../performance/controller/AssessManagerController.java | 3 +-- .../com/lz/modules/performance/res/ChartStatistical.java | 4 ++++ .../modules/performance/service/AssessManagerService.java | 2 ++ .../service/impl/AssessManagerServiceImpl.java | 8 ++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java index 35028f44..75402cbb 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -71,8 +71,7 @@ public class AssessManagerController { if(flowStart == null){ return R.error("没有此条记录"); } - resultRecordMapper.batchDeleteByStartId(flowStart.getId()); + assessManagerService.accessDelete(flowStart); return R.ok(); - } } diff --git a/src/main/java/com/lz/modules/performance/res/ChartStatistical.java b/src/main/java/com/lz/modules/performance/res/ChartStatistical.java index 077f99aa..9df82d0c 100644 --- a/src/main/java/com/lz/modules/performance/res/ChartStatistical.java +++ b/src/main/java/com/lz/modules/performance/res/ChartStatistical.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; @Data @ApiModel(value = "报表统计实体") @@ -13,4 +14,7 @@ public class ChartStatistical { @ApiModelProperty(value = "人数",name = "num") private int num = 0; + + @ApiModelProperty(value = "是否被选中",name = "check") + private int check; } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/AssessManagerService.java b/src/main/java/com/lz/modules/performance/service/AssessManagerService.java index f75bfbfc..c81c29a6 100644 --- a/src/main/java/com/lz/modules/performance/service/AssessManagerService.java +++ b/src/main/java/com/lz/modules/performance/service/AssessManagerService.java @@ -16,4 +16,6 @@ public interface AssessManagerService { PageUtils assessDetail(AssessDetailReq req); + + void accessDelete(FlowStart flowStart); } diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index 4e5eb8d0..cb2a0e6b 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -78,4 +78,12 @@ public class AssessManagerServiceImpl implements AssessManagerService { ); return pageUtils; } + + @Override + public void accessDelete(FlowStart flowStart) { + flowStart.setIsDelete(1); + flowStartMapper.updateFlowStartById(flowStart); + resultRecordMapper.batchDeleteByStartId(flowStart.getId()); + return ; + } }