From 6ec18e9fa601f9115f79ea15c92ff56628cf0490 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 25 Aug 2022 14:50:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcVaccinePrarmeterServiceImpl.java   | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
index 83cb4a4f29..b7b681f6d1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
@@ -6,8 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.dto.result.CustomerStaffInfoCacheResult;
-import com.epmet.commons.tools.enums.RelationshipEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -17,7 +18,6 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.ExcelPoiUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constants.ImportTaskConstants;
@@ -28,7 +28,6 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.GridInfoByNameResultDTO;
 import com.epmet.dto.result.IcHouseInfoCollectResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
-import com.epmet.entity.IcResiCollectEntity;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.entity.IcUserChangeRecordEntity;
 import com.epmet.entity.IcVaccinePrarmeterEntity;
@@ -48,12 +47,12 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -71,22 +70,22 @@ import java.util.stream.Collectors;
 @Slf4j
 public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrarmeterDao, IcVaccinePrarmeterEntity> implements IcVaccinePrarmeterService {
 
-    @Autowired
+    @Resource
     private IcVaccinePrarmeterRedis icVaccinePrarmeterRedis;
 
-    @Autowired
+    @Resource
     private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
 
-    @Autowired
+    @Resource
     private OssFeignClient ossFeignClient;
 
-    @Autowired
+    @Resource
     private GovOrgFeignClient govOrgFeignClient;
 
-    @Autowired
+    @Resource
     private IcResiUserDao icResiUserDao;
 
-    @Autowired
+    @Resource
     private IcUserChangeRecordService icUserChangeRecordService;
 
     @Override
@@ -135,7 +134,14 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(IcVaccinePrarmeterDTO dto) {
+        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
+        if (null == agencyInfo) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取组织信息失败", "获取组织信息失败");
+        }
         IcVaccinePrarmeterEntity entity = ConvertUtils.sourceToTarget(dto, IcVaccinePrarmeterEntity.class);
+        entity.setCustomerId(agencyInfo.getCustomerId());
+        entity.setPids(agencyInfo.getPids());
+        entity.setCheckState(NumConstant.ZERO_STR);
         insert(entity);
     }