From 7e4c46b5d47599f893a36ef856d074b4ddafdf1d Mon Sep 17 00:00:00 2001
From: lzy <qQ123456>
Date: Mon, 28 Feb 2022 15:26:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A2=85=E5=B7=9E=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/docus/bgts/entity/AfCollectTask.java     | 2 +-
 src/main/java/com/docus/bgts/entity/ReportDownDto.java     | 1 -
 .../com/docus/bgts/service/AfCollectTaskServiceImpl.java   | 7 ++++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/docus/bgts/entity/AfCollectTask.java b/src/main/java/com/docus/bgts/entity/AfCollectTask.java
index d7393e8..18abbab 100644
--- a/src/main/java/com/docus/bgts/entity/AfCollectTask.java
+++ b/src/main/java/com/docus/bgts/entity/AfCollectTask.java
@@ -26,7 +26,7 @@ public class AfCollectTask implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "id 雪花算法")
-    @TableId(value = "id", type = IdType.ID_WORKER_STR)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     @ApiModelProperty(value = "病案主键")
diff --git a/src/main/java/com/docus/bgts/entity/ReportDownDto.java b/src/main/java/com/docus/bgts/entity/ReportDownDto.java
index a689fa9..faf5fe8 100644
--- a/src/main/java/com/docus/bgts/entity/ReportDownDto.java
+++ b/src/main/java/com/docus/bgts/entity/ReportDownDto.java
@@ -21,5 +21,4 @@ public class ReportDownDto {
     @ApiModelProperty(value = "分类id")
     private String assortid;
 
-
 }
diff --git a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java
index 057a15f..1353c7e 100644
--- a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java
+++ b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java
@@ -99,7 +99,12 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
                 log.info("任务表操作出错");
                 throw new RuntimeException("插入病案任务表数据出错");
             }
-            scanfile.setTaskid(afCollectTask.getId());
+            if(afCollectTask.getId()!=null){
+                scanfile.setTaskid(afCollectTask.getId());
+            }else {
+                log.info("插入任务id为空！");
+                throw new RuntimeException("插入任务id为空");
+            }
         }
         reportDownDto.setScanfiles(scanfiles);
     }