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 from archive_detail - where MasterID = #{MasterID} AND flag=#{collectId} + where MasterID = #{MasterID} AND Source in (${collectId})