From 473e2887cd265c44eb1106979acd7b93913e875a Mon Sep 17 00:00:00 2001
From: linjj <850658129@qq.com>
Date: Tue, 25 Mar 2025 15:03:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/duplicate/controller/param/updateTaskDto.java  | 7 +++++++
 .../example/duplicate/service/impl/TaskServiceImpl.java    | 6 +++---
 src/main/resources/application.yml                         | 3 +++
 src/main/resources/mapper/ArchiveDetailMapper.xml          | 2 +-
 src/main/resources/mapper/ArchiveOtherExtMapper.xml        | 6 ++++++
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/example/duplicate/controller/param/updateTaskDto.java b/src/main/java/com/example/duplicate/controller/param/updateTaskDto.java
index 1789ec1..2e5c39c 100644
--- a/src/main/java/com/example/duplicate/controller/param/updateTaskDto.java
+++ b/src/main/java/com/example/duplicate/controller/param/updateTaskDto.java
@@ -28,5 +28,12 @@ public class updateTaskDto {
     @ApiModelProperty(value="备注",name="pinResult", required=true)
     private String pinResult;
 
+    @ApiModelProperty(value="异常信息",name="errorInfo", required=true)
+    private String errorInfo;
+
+    @ApiModelProperty(value="异常信息",name="errorImage", required=true)
+    private String errorImage;
+
+
 
 }
diff --git a/src/main/java/com/example/duplicate/service/impl/TaskServiceImpl.java b/src/main/java/com/example/duplicate/service/impl/TaskServiceImpl.java
index 65d5bd4..f0c88f9 100644
--- a/src/main/java/com/example/duplicate/service/impl/TaskServiceImpl.java
+++ b/src/main/java/com/example/duplicate/service/impl/TaskServiceImpl.java
@@ -172,12 +172,12 @@ public class TaskServiceImpl implements TaskService {
             //根据患者masterId，collectId删除
             boolean stactic = archiveDetailMapper.delFileBySource(masterId, collectId);
             if (stactic) {
-                return CommonResult.success("删除成功,masterId:" + masterId);
+                return CommonResult.success("删除成功,masterId:" + masterId+"删除分类："+collectId);
             }
         } catch (Exception e) {
-            return CommonResult.failed("删除失败,masterId:" + masterId);
+            return CommonResult.failed("删除失败,masterId:" + masterId+"删除分类："+collectId);
         }
-        return CommonResult.failed("删除失败,masterId:" + masterId);
+        return CommonResult.failed("删除失败,masterId:" + masterId+"删除分类："+collectId);
     }
 
     @Override
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9cf7302..8eec33f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -6,6 +6,9 @@ spring:
     url: jdbc:sqlserver://db.docus.cn:1433;DatabaseName=emr_record
     username: sa
     password: docus@702
+    #    url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=gm_record
+    #    username: sa
+    #    password: admin123
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     type: com.alibaba.druid.pool.DruidDataSource
   #加快springboot初始化，延缓初始化加载
diff --git a/src/main/resources/mapper/ArchiveDetailMapper.xml b/src/main/resources/mapper/ArchiveDetailMapper.xml
index 22cfbbf..73e6ae0 100644
--- a/src/main/resources/mapper/ArchiveDetailMapper.xml
+++ b/src/main/resources/mapper/ArchiveDetailMapper.xml
@@ -80,7 +80,7 @@
     </delete>
     <delete id="delFileBySource">
         delete from archive_detail
-        where MasterID = #{MasterID} AND flag=#{collectId}
+        where MasterID = #{MasterID} AND Source in (${collectId})
     </delete>
 
     <select id="getDetailBySerialNumber" resultType="com.example.duplicate.controller.param.ArchiveDetailDto">
diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml
index 42db202..7a82227 100644
--- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml
+++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml
@@ -95,6 +95,12 @@
             <if test="pinResult != null" >
                 pResult = #{pinResult},
             </if>
+            <if test="errorInfo != null" >
+                errorInfo = #{errorInfo},
+            </if>
+            <if test="errorImage != null" >
+                errorImage = #{errorImage},
+            </if>
         </set>
         where MID = #{mid} and  sysFlag=#{sysFlag}
     </update>