From b95631c2bc82e9befd8bb1e863ca955afdd24720 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 7 Nov 2022 16:16:48 +0800
Subject: [PATCH] epmetuser/icEpidemicSpecialAttention/vaccination-update

---
 .../IcEpidemicSpecialAttentionServiceImpl.java     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
index 0a76221ff0..31acd1ec00 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -349,6 +350,19 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
         e.setReason(formDTO.getReason());
         e.setRemark(formDTO.getRemark());
         e.setIsolatedState(formDTO.getIsolatedState());
+        //需求来源于磐石： http://zentao.elinkservice.cn/story-view-713.html
+        e.setGkStartTime(StringUtils.isNotBlank(formDTO.getGkStartTime()) ? formDTO.getGkStartTime() : StrConstant.EPMETY_STR);
+        e.setGkEndTime(StringUtils.isNotBlank(formDTO.getGkEndTime()) ? formDTO.getGkEndTime() : StrConstant.EPMETY_STR);
+        e.setGbName(StringUtils.isNotBlank(formDTO.getGbName()) ? formDTO.getGbName() : StrConstant.EPMETY_STR);
+        e.setGbMobile(StringUtils.isNotBlank(formDTO.getGbMobile()) ? formDTO.getGbMobile() : StrConstant.EPMETY_STR);
+        e.setGridManager(StringUtils.isNotBlank(formDTO.getGridManager()) ? formDTO.getGridManager() : StrConstant.EPMETY_STR);
+        e.setGridManagerMobile(StringUtils.isNotBlank(formDTO.getGridManagerMobile()) ? formDTO.getGridManagerMobile() : StrConstant.EPMETY_STR);
+        e.setHealthWorker(StringUtils.isNotBlank(formDTO.getHealthWorker()) ? formDTO.getHealthWorker() : StrConstant.EPMETY_STR);
+        e.setHealthWorkerMobile(StringUtils.isNotBlank(formDTO.getHealthWorkerMobile()) ? formDTO.getHealthWorkerMobile() : StrConstant.EPMETY_STR);
+        e.setPoliceName(StringUtils.isNotBlank(formDTO.getPoliceName()) ? formDTO.getPoliceName() : StrConstant.EPMETY_STR);
+        e.setPoliceMobile(StringUtils.isNotBlank(formDTO.getPoliceMobile()) ? formDTO.getPoliceMobile() : StrConstant.EPMETY_STR);
+        e.setVolunteerName(StringUtils.isNotBlank(formDTO.getVolunteerName()) ? formDTO.getVolunteerName() : StrConstant.EPMETY_STR);
+        e.setVolunteerMobile(StringUtils.isNotBlank(formDTO.getVolunteerMobile()) ? formDTO.getVolunteerMobile() : StrConstant.EPMETY_STR);
         update(e,w);
         if (CollectionUtils.isNotEmpty(formDTO.getChannel())){
             SendNoticeFormDTO dto = new SendNoticeFormDTO();