Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java

@@ -1,5 +1,7 @@
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -24,6 +26,7 @@ public class IcVaccineEntity extends BaseEpmetEntity {
     /**
      * 客户Id customer.id
      */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String customerId;
 
     /**
@@ -84,6 +87,6 @@ public class IcVaccineEntity extends BaseEpmetEntity {
     /**
      * 备注
      */
-	private String remaek;
+	private String remark;
 
 }

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

@@ -171,7 +171,7 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
 
             IcVaccineExcelImportListener listener = new IcVaccineExcelImportListener(userId, agencyId, loginUserDetails.getOrgIdPath().replace(":".concat(agencyId), ""), this);
 
-            EasyExcel.read(filePath.toFile(), IcNatImportExcelData.class, listener).headRowNumber(2).sheet(0).doRead();
+            EasyExcel.read(filePath.toFile(), IcVaccineImportExcelData.class, listener).headRowNumber(2).sheet(0).doRead();
 
             Path errorDescFile = null;
             String errorDesFileUrl = null;
@@ -188,7 +188,7 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
             if (errorRows.size() > 0) {
                 try {
                     // 文件生成
-                    Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_nat", "import", "error_des");
+                    Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_vaccine", "import", "error_des");
                     String fileName = UUID.randomUUID().toString().concat(".xlsx");
                     errorDescFile = errorDescDir.resolve(fileName);