页面增加接种地查询，增加导出功能

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/controller/VaccinationInfoController.java

@@ -79,7 +79,7 @@ public class VaccinationInfoController {
     @GetMapping("export")
     @LogOperation("导出")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<VaccinationInfoDTO> list = vaccinationInfoService.list(params);
+        List<VaccinationInfoDTO> list = vaccinationInfoService.getVaccinationInfoList(params);
 
         ExcelUtils.exportExcelToTarget(response, null, list, VaccinationInfoExcel.class);
     }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/VaccinationInfoDTO.java

@@ -75,9 +75,11 @@ public class VaccinationInfoDTO implements Serializable {
 
 	// @ApiModelProperty(value = "生产企业id")
 	private Long companyId;
+	private String company;
 
 	// @ApiModelProperty(value = "接种单位/地点ID")
 	private Long siteId;
+	private String site;
 
 	// @ApiModelProperty(value = "疫苗生成批次、批号")
 	private String batchNo;

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/excel/VaccinationInfoExcel.java

@@ -13,8 +13,6 @@ import java.util.Date;
  */
 @Data
 public class VaccinationInfoExcel {
-    @Excel(name = "ID")
-    private Long id;
     @Excel(name = "真实姓名")
     private String realName;
     @Excel(name = "身份证号")
@@ -23,11 +21,9 @@ public class VaccinationInfoExcel {
     private String mobile;
     @Excel(name = "性别")
     private String sex;
-    @Excel(name = "接种人县/区")
     private String county;
     @Excel(name = "接种人街道/乡镇")
     private String street;
-    @Excel(name = "接种人街道/乡镇ID")
     private String streetId;
     @Excel(name = "接种人社区/村")
     private String community;
@@ -43,28 +39,18 @@ public class VaccinationInfoExcel {
     private Integer age;
     @Excel(name = "剂次，第几针")
     private Integer dose;
-    @Excel(name = "疫苗种类id")
+    private String vaccine;
     private Long vaccineId;
-    @Excel(name = "生产企业id")
+    @Excel(name = "生产企业")
+    private String company;
     private Long companyId;
-    @Excel(name = "接种单位/地点ID")
+    @Excel(name = "接种单位/地点")
+    private String site;
     private Long siteId;
     @Excel(name = "疫苗生成批次、批号")
     private String batchNo;
-    @Excel(name = "删除标识 0：未删除，1：已删除")
-    private String delFlag;
-    @Excel(name = "乐观锁")
-    private Integer revision;
-    @Excel(name = "创建人")
     private String createdBy;
-    @Excel(name = "创建时间")
     private Date createdTime;
-    @Excel(name = "更新人")
     private String updatedBy;
-    @Excel(name = "更新时间")
     private Date updatedTime;
-    @Excel(name = "创建人姓名")
-    private String creatorName;
-    @Excel(name = "是否接种",replace = { "未接种_0", "接种中_1", "接种完成_2"})
-    private Integer vaccinationState;
 }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/VaccinationInfoService.java

@@ -9,6 +9,7 @@ import com.elink.esua.epdc.vaccine.vim.entity.VaccinationInfoEntity;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 接种信息
@@ -28,6 +29,16 @@ public interface VaccinationInfoService extends CrudService<VaccinationInfoEntit
      */
     List<VaccinationInfoEntity> checkVaccination(VaccinationInfoDTO dto);
 
+    /**
+     * 获取接种信息
+     *
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO>
+     * @author zhy
+     * @date 2021/5/28 10:10
+     */
+    List<VaccinationInfoDTO> getVaccinationInfoList(Map<String, Object> params);
+
     /**
      * 删除前校验
      *

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java

@@ -88,10 +88,24 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
     @Override
     public PageData<VaccinationInfoDTO> page(Map<String, Object> params) {
         IPage<VaccinationInfoEntity> page = getPage(params, FieldConstant.CREATED_TIME, false);
-        List<VaccinationInfoDTO> list = baseDao.getVaccinationInfoList(params);
+        List<VaccinationInfoDTO> list = getVaccinationInfoList(params);
         return new PageData<>(list, page.getTotal());
     }
 
+    @Override
+    public List<VaccinationInfoDTO> getVaccinationInfoList(Map<String, Object> params) {
+        List<VaccineDto> companyList = vaccineCompanyService.compantyList();
+        Map<Long, String> companyMap = companyList.stream().collect(Collectors.toMap(VaccineDto::getValue, VaccineDto::getLabel, (key1, key2) -> key2));
+        List<VaccineDto> siteList = vaccinationSiteService.getSiteList();
+        Map<Long, String> siteMap = siteList.stream().collect(Collectors.toMap(VaccineDto::getValue, VaccineDto::getLabel, (key1, key2) -> key2));
+        List<VaccinationInfoDTO> list = baseDao.getVaccinationInfoList(params);
+        list.forEach(dto -> {
+            dto.setCompany(companyMap.get(dto.getCompanyId()));
+            dto.setSite(siteMap.get(dto.getSiteId()));
+        });
+        return list;
+    }
+
     @Override
     public List<VaccinationInfoEntity> checkVaccination(VaccinationInfoDTO dto) {
         return baseDao.checkVaccination(dto);
@@ -171,6 +185,7 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
         return new Result();
     }
 
+
     /**
      * 批量导入
      *

epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml

@@ -39,6 +39,9 @@
         <if test="companyId != null and companyId != ''">
             AND v.COMPANY_ID = #{companyId}
         </if>
+        <if test="siteId != null and siteId != ''">
+            AND v.SITE_ID = #{siteId}
+        </if>
         <if test="vaccTime != null and vaccTime != '' and vaccTime != 0">
             AND u.DEL_FLAG = '0'
             AND u.VACCINATION_STATE = 1