Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java

@@ -31,7 +31,6 @@ public class IcNatImportExcelData {
     @ExcelProperty("检测时间")
     private Date natTime;
 
-    @NotBlank(message = "检测地点为必填项")
     @ExcelProperty("检测地点")
     private String natAddress;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java

@@ -279,7 +279,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
         relationEntity.setCustomerId(formDTO.getCustomerId());
         relationEntity.setIcNatId(formDTO.getIcNatId());
         relationEntity.setAgencyId(staffInfo.getAgencyId());
-        relationEntity.setPids(StringUtils.isNotBlank(staffInfo.getAgencyPIds())?staffInfo.getAgencyPIds()+":"+formDTO.getAgencyId():staffInfo.getAgencyId());
+        relationEntity.setPids(StringUtils.isNotBlank(staffInfo.getAgencyPIds())?staffInfo.getAgencyPIds()+":"+staffInfo.getAgencyId():staffInfo.getAgencyId());
         relationEntity.setUserType("synchro");
         icNatRelationDao.insert(relationEntity);
     }
@@ -334,7 +334,8 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             // 合并到一起写入
             errorRows.addAll(otherRows);
 
-            // 生成并上传错误文件
+            // 生成并上传描述文件
+            if (errorRows.size() > 0) {
                 try {
                     // 文件生成
                     Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_nat", "import", "error_des");
@@ -346,17 +347,18 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
                     OutputStream os = fileItem.getOutputStream();
 
                     EasyExcel.write(os, IcNatImportExcelData.RowRemarkMessage.class).sheet("信息列表").doWrite(errorRows);
-
                     // 文件上传oss
                     Result<UploadImgResultDTO> errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem));
                     if (errorDesFileUploadResult.success()) {
                         errorDesFileUrl = errorDesFileUploadResult.getData().getUrl();
                     }
+
                 } finally {
                     if (Files.exists(errorDescFile)) {
                         Files.delete(errorDescFile);
                     }
                 }
+            }
 
             ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO();
             importFinishTaskForm.setTaskId(importTaskId);