From cac84cbd813ae1ffdfe96375040d18ca818301ba Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Mon, 29 Apr 2024 15:44:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8B=B1=E5=BE=B7=E4=B8=AD=E5=8C=BB?= =?UTF-8?q?=E9=99=A2=EF=BC=8C=E4=BB=BB=E5=8A=A1=E4=BD=BF=E7=94=A8=E5=88=A0?= =?UTF-8?q?=E9=99=A4=EF=BC=8C=E4=B8=8D=E4=BD=BF=E7=94=A8=E4=BD=9C=E5=BA=9F?= =?UTF-8?q?=EF=BC=8C=E7=9B=B4=E6=8E=A5=E7=A7=BB=E5=8A=A8=E5=88=B0=E4=BD=9C?= =?UTF-8?q?=E5=BA=9F=E8=A1=A8=EF=BC=8C=E8=A1=A8=E7=BB=93=E6=9E=84=E7=9B=B8?= =?UTF-8?q?=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reportmanager/mapper/CollectTaskMapper.java | 4 ++++ .../YingDeZyyReportManagerServiceImpl.java | 4 +++- src/main/resources/mapper/CollectTaskMapper.xml | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/docus/server/reportmanager/mapper/CollectTaskMapper.java b/src/main/java/com/docus/server/reportmanager/mapper/CollectTaskMapper.java index 67ab3f8..47920c5 100644 --- a/src/main/java/com/docus/server/reportmanager/mapper/CollectTaskMapper.java +++ b/src/main/java/com/docus/server/reportmanager/mapper/CollectTaskMapper.java @@ -32,7 +32,11 @@ public interface CollectTaskMapper { */ int cancel(@Param("ids") List ids); + int del(@Param("ids") List ids); + String getCollectionState(); void updateTaskForRecollect(@Param("taskIds") List taskIds, @Param("operator") String operator,@Param("state") String state); + + int moveCancel(@Param("ids") List ids); } diff --git a/src/main/java/com/docus/server/reportmanager/webservice/YingDeZyyReportManagerServiceImpl.java b/src/main/java/com/docus/server/reportmanager/webservice/YingDeZyyReportManagerServiceImpl.java index aac447b..5114556 100644 --- a/src/main/java/com/docus/server/reportmanager/webservice/YingDeZyyReportManagerServiceImpl.java +++ b/src/main/java/com/docus/server/reportmanager/webservice/YingDeZyyReportManagerServiceImpl.java @@ -217,7 +217,9 @@ public class YingDeZyyReportManagerServiceImpl implements ReportManagerService { List fileIds = tasks.stream().map(AfCollectTask::getAfArchiveDetailId).collect(Collectors.toList()); List taskIds = tasks.stream().map(AfCollectTask::getId).collect(Collectors.toList()); scanAssortMapper.cancel(fileIds); - collectTaskMapper.cancel(taskIds); + // 任务移动作废表,删除任务 + collectTaskMapper.moveCancel(taskIds); + collectTaskMapper.del(taskIds); } private void cancelHuiZhenEMRReport(String patientId, String reportName) { diff --git a/src/main/resources/mapper/CollectTaskMapper.xml b/src/main/resources/mapper/CollectTaskMapper.xml index 4092131..fc9b8b4 100644 --- a/src/main/resources/mapper/CollectTaskMapper.xml +++ b/src/main/resources/mapper/CollectTaskMapper.xml @@ -3,6 +3,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + INSERT INTO `docus_archivefile`.`af_collect_task_cancel` + SELECT * FROM `docus_archivefile`.`af_collect_task` + WHERE `id` in + + #{id} + + UPDATE `docus_archivefile`.`af_collect_task` SET `state` = '4' @@ -23,6 +31,13 @@ #{taskId} + + DELETE FROM `docus_archivefile`.`af_collect_task` + WHERE `id` in + + #{id} + +