From d815fb3127702f9de6add66d4c81eb7455c6bcd1 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 7 Apr 2022 10:23:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E7=99=BB=E8=AE=B0=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/modules/epidemic/entity/PersonTestingEntity.java    | 5 +++++
 .../epidemic/service/impl/PersonTestingServiceImpl.java      | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/PersonTestingEntity.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/PersonTestingEntity.java
index a148ad1..be0660b 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/PersonTestingEntity.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/PersonTestingEntity.java
@@ -102,4 +102,9 @@ public class PersonTestingEntity extends BaseEpdcEntity {
 	 * 核酸检测点表，主键
 	 */
 	private String testingPointId;
+
+	/**
+	 * 创建人姓名
+	 */
+	private String createdByName;
 }
diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java
index e367bce..1cccdc1 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java
@@ -47,9 +47,7 @@ import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity;
 import com.elink.esua.epdc.vaccine.house.dao.PopulationInformationDao;
 import com.elink.esua.epdc.vaccine.house.entity.PopulationInformationEntity;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddressList;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -224,6 +222,7 @@ public class PersonTestingServiceImpl extends BaseServiceImpl<PersonTestingDao,
                 entity.setImgUrl(uploadResult.getData());
             }
         }
+        entity.setCreatedByName(SecurityUser.getUser().getUsername());
         insert(entity);
         return new Result().ok("录入成功");
     }
@@ -544,6 +543,7 @@ public class PersonTestingServiceImpl extends BaseServiceImpl<PersonTestingDao,
             PersonTestingEntity entity = ConvertUtils.sourceToTarget(dto, PersonTestingEntity.class);
             // 根据身份证号、核酸检测时间比对库里数据，有相同的更新这个人的这条核酸检测记录，匹配不到的插入
             String idPersonTesting = baseDao.getIdByIdCardAndTestingTime(entity.getIdcard(), entity.getTestingTime());
+            entity.setCreatedByName(SecurityUser.getUser().getUsername());
             if (null == idPersonTesting) {
                 insert(entity);
             } else {