疫苗接种 方法提交

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java

@@ -17,14 +17,11 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constants.ImportTaskConstants;
-import com.epmet.dto.IcNatDTO;
-import com.epmet.dto.form.AddIcNatFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.form.VaccineListFormDTO;
+import com.epmet.dto.result.IcVaccineListCommonExcelResultDTO;
 import com.epmet.dto.result.IcVaccineListResultDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
-import com.epmet.dto.result.NatListCommonExcelResultDTO;
-import com.epmet.dto.result.NatListResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcVaccineService;
 import lombok.extern.slf4j.Slf4j;
@@ -196,23 +193,22 @@ public class IcVaccineController  implements ResultDataResolver {
         try {
             // 这里 需要指定写用哪个class去写
             String fileName = "疫苗接种信息.xlsx";
-            if ("all".equals(formDTO.getOrgType())) {
-                excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), NatListResultDTO.class).build();
+            if ("all".equals(formDTO.getSearchType())) {
+                excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcVaccineListResultDTO.class).build();
             }else {
-                excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), NatListCommonExcelResultDTO.class).build();
+                excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcVaccineListCommonExcelResultDTO.class).build();
             }
 
             WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").build();
-            PageData<NatListResultDTO> data = null;
+            PageData<IcVaccineListResultDTO> data = null;
             do {
                 data = icVaccineService.icVaccineList(formDTO);
                 data.getList().forEach(o-> {
-                    o.setNatResult(NumConstant.ONE_STR.equals(o.getNatResult()) ? "阳性" : "阴性");
                     o.setIsResiUser(NumConstant.ONE_STR.equals(o.getIsResiUser()) ? "是" : "否");
                 });
                 formDTO.setPageNo(++pageNo);
-                if ("current".equals(formDTO.getOrgType())) {
-                    List<NatListResultDTO> list = ConvertUtils.sourceToTarget(data.getList(), NatListResultDTO.class);
+                if ("current".equals(formDTO.getSearchType())) {
+                    List<IcVaccineListResultDTO> list = ConvertUtils.sourceToTarget(data.getList(), IcVaccineListResultDTO.class);
                     excelWriter.write(list, writeSheet);
                 }else{
                     excelWriter.write(data.getList(), writeSheet);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java

@@ -2,13 +2,10 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.IcNatDTO;
-import com.epmet.dto.form.AddIcNatFormDTO;
 import com.epmet.dto.form.MyNatListFormDTO;
 import com.epmet.dto.form.VaccineListFormDTO;
 import com.epmet.dto.result.IcVaccineListResultDTO;
 import com.epmet.dto.result.MyNatListResultDTO;
-import com.epmet.dto.result.NatListDTO;
 import com.epmet.entity.IcVaccineEntity;
 
 import java.nio.file.Path;

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

@@ -10,20 +10,15 @@ 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.exception.RenException;
 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;
-import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcNatRelationDao;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcVaccineDao;
 import com.epmet.dao.UserBaseInfoDao;
-import com.epmet.dto.IcNatDTO;
-import com.epmet.dto.IcNoticeDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcNatRelationEntity;
@@ -41,7 +36,6 @@ import com.epmet.service.UserService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
@@ -57,7 +51,6 @@ import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 疫苗接种记录
@@ -72,8 +65,6 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
     @Autowired
     private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
     @Autowired
-    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
-    @Autowired
     private IcNoticeService icNoticeService;
     @Autowired
     private OssFeignClient ossFeignClient;
@@ -166,7 +157,8 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
     /**
      * @Author sun
      * @Description 【疫苗】疫苗接种信息取消同步
-     **/
+     *
+     * @param formDTO*/
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void cancelSynchro(VaccineListFormDTO formDTO) {