新冠病毒疫苗接种人员信息台账--bug

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -926,6 +926,7 @@
         from customer_grid
         where DEL_FLAG = '0'
         and GRID_NAME = #{gridName}
+        and PID = #{agencyId}
         and CUSTOMER_ID = #{customerId}
         limit 1
     </select>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GridInfoVaccinePrarmeterFormDTO.java

@@ -26,6 +26,11 @@ public class GridInfoVaccinePrarmeterFormDTO implements Serializable {
      */
 	private String gridName;
 
+    /**
+     * 当前登录人组织ID
+     */
+	private String agencyId;
+
 
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java

@@ -51,7 +51,7 @@ public class IcVaccinePrarmeterExcel {
     private String isVaccination;
 
     @Excel(name = "第一次接种时间")
-    private Date firstVacTime;
+    private String firstVacTime;
 
     @Excel(name = "第一次接种地点")
     private String firstVacSite;

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

@@ -8,10 +8,12 @@ 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.ServiceConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
@@ -30,6 +32,7 @@ import com.epmet.dto.IcVaccinePrarmeterDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.GridInfoByNameResultDTO;
 import com.epmet.dto.result.IcHouseInfoCollectResultDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.entity.*;
 import com.epmet.entity.IcResiUserEntity;
@@ -38,6 +41,7 @@ import com.epmet.entity.IcVaccinePrarmeterEntity;
 import com.epmet.excel.IcVaccinePrarmeterImportExcel;
 import com.epmet.excel.error.IcVaccinePrarmeterImportErrorModel;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.feign.OssFeignClient;
 import com.epmet.redis.IcVaccinePrarmeterRedis;
@@ -52,6 +56,7 @@ 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;
@@ -100,6 +105,12 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
     @Resource
     private IcVaccineRelationDao icVaccineRelationDao;
 
+    @Autowired
+    private EpmetUserOpenFeignClient userOpenFeignClient;
+
+    @Autowired
+    private ResultDataResolver resultDataResolver;
+
     @Override
     public PageData<IcVaccinePrarmeterDTO> page(Map<String, Object> params) {
         IPage<IcVaccinePrarmeterEntity> page = baseDao.selectPage(
@@ -252,6 +263,15 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
      * @param tokenDto
      */
     public void checkInfo(List<IcVaccinePrarmeterImportExcel> list, List<IcVaccinePrarmeterImportErrorModel> errorInfo, TokenDto tokenDto){
+        LoginUserDetailsFormDTO form = new LoginUserDetailsFormDTO();
+        form.setUserId(tokenDto.getUserId());
+        form.setClient(tokenDto.getClient());
+        form.setApp(tokenDto.getApp());
+        LoginUserDetailsResultDTO userDetailsResultDTO = resultDataResolver.getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails(form), ServiceConstant.EPMET_USER_SERVER,
+                EpmetErrorCode.SERVER_ERROR.getCode(),
+                "获取当前登录人组织id失败",
+                null);
+
         for (int i = 0; i < list.size(); i++) {
             list.get(i).setNum(i+1);
             if (StringUtils.isBlank(list.get(i).getGridName()) && !list.get(i).getAddStatus()){
@@ -353,6 +373,7 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
             GridInfoVaccinePrarmeterFormDTO formDTO = new GridInfoVaccinePrarmeterFormDTO();
             formDTO.setGridName(list.get(i).getGridName());
             formDTO.setCustomerId(tokenDto.getCustomerId());
+            formDTO.setAgencyId(userDetailsResultDTO.getAgencyId());
             Result<GridInfoByNameResultDTO> resultDTOResult = govOrgFeignClient.getGridInfoByGridName(formDTO);
             GridInfoByNameResultDTO gridInfoByNameResultDTO = resultDTOResult.getData();
             if(gridInfoByNameResultDTO == null && !list.get(i).getAddStatus()){