springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollByAdminDTO.java
@@ -5,6 +5,7 @@ import lombok.Data; import java.util.Date; import java.util.List; @Data @ApiModel("疫苗分类列表请求参数") @@ -36,4 +37,7 @@ @ApiModelProperty("疫苗名称") private String vaccines; @ApiModelProperty("导出id集合") private List<Long> ids; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesInoculationByAdminDTO.java
@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data @ApiModel("疫苗接种记录请求参数") public class VaccinesInoculationByAdminDTO { @@ -34,4 +36,7 @@ @ApiModelProperty("接种剂次") private String dosage; @ApiModelProperty("导出id集合") private List<Long> ids; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2641,4 +2641,11 @@ */ @PostMapping("/vaccines/admin/inoculation/export") R exportVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO); /** * 查询疫苗分类列表 * @return 疫苗分类列表 */ @PostMapping("/vaccines/admin/enroll/type/list") R getEnrollTypeListByAdmin(); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VaccinesApi.java
@@ -15,10 +15,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngPopulationExcelVo; import com.panzhihua.common.model.vos.community.ComMngPopulationVO; import com.panzhihua.common.model.vos.vaccines.ComMngVaccinesEnrollExcelVo; import com.panzhihua.common.model.vos.vaccines.ComMngVaccinesInoculationExcelVo; import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollByAdminVO; import com.panzhihua.common.model.vos.vaccines.VaccinesInoculationByAdminVO; import com.panzhihua.common.model.vos.vaccines.*; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.utlis.SFTPUtil; import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler; @@ -199,4 +196,10 @@ } } @ApiOperation(value = "疫苗分类列表") @PostMapping("/enroll/type/list") public R getEnrollTypeListByAdmin() { return communityService.getEnrollTypeListByAdmin(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VaccinesApi.java
@@ -139,4 +139,13 @@ public R exportVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO) { return comMngVaccinesInoculationRecordService.exportVaccinesInoculationListByAdmin(inoculationByAdminDTO); } /** * 疫苗分类列表 * @return 疫苗分类列表 */ @PostMapping("/admin/enroll/type/list") public R getEnrollTypeListByAdmin() { return comMngVaccinesService.getEnrollTypeListByAdmin(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesEnrollRecordDAO.java
@@ -57,6 +57,7 @@ " AND cmver.create_at <![CDATA[<=]]> #{vaccinesByAdminDTO.endTime} " + " </if> \n" + " </where>" + " order by cmver.create_at desc"+ " </script>") IPage<VaccinesEnrollByAdminVO> getVaccinesEnrollListByAdmin(Page page, @Param("vaccinesByAdminDTO") VaccinesEnrollByAdminDTO vaccinesByAdminDTO); @@ -66,6 +67,12 @@ " <where>" + "<if test='vaccinesByAdminDTO.communityId != null'>" + " and cmver.community_id = #{vaccinesByAdminDTO.communityId} "+ " </if> " + "<if test='inoculationByAdminDTO.ids != null and inoculationByAdminDTO.ids.size > 0'>" + " and cmvir.id in " + "<foreach item=\"item\" collection=\"inoculationByAdminDTO.ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n" + "#{item}" + "</foreach>" + " </if> " + "<if test='vaccinesByAdminDTO.vaccines != null and vaccinesByAdminDTO.vaccines != ""'>" + " and cmv.name = #{vaccinesByAdminDTO.vaccines} "+ @@ -86,6 +93,7 @@ " AND cmver.create_at <![CDATA[<=]]> #{vaccinesByAdminDTO.endTime} " + " </if> \n" + " </where>" + " order by cmver.create_at desc"+ " </script>") List<ComMngVaccinesEnrollExcelVo> exportVaccinesEnrollListByAdmin(@Param("vaccinesByAdminDTO") VaccinesEnrollByAdminDTO vaccinesByAdminDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesInoculationRecordDAO.java
@@ -64,6 +64,7 @@ " AND cmvir.inoculation_at <![CDATA[<=]]> #{inoculationByAdminDTO.endTime} " + " </if> \n" + " </where>" + " order by inoculation_at desc " + " </script>") IPage<VaccinesInoculationByAdminVO> getVaccinesInoculationListByAdmin(Page page, @Param("inoculationByAdminDTO") VaccinesInoculationByAdminDTO inoculationByAdminDTO); @@ -73,6 +74,12 @@ " <where>" + "<if test='inoculationByAdminDTO.communityId != null'>" + " and cmvir.community_id = #{inoculationByAdminDTO.communityId} "+ " </if> " + "<if test='inoculationByAdminDTO.ids != null and inoculationByAdminDTO.ids.size > 0'>" + " and cmvir.id in " + "<foreach item=\"item\" collection=\"inoculationByAdminDTO.ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n" + "#{item}" + "</foreach>" + " </if> " + "<if test='inoculationByAdminDTO.name != null and inoculationByAdminDTO.name != ""'>" + " and cmvir.name like concat('%',#{inoculationByAdminDTO.name},'%') "+ @@ -93,6 +100,7 @@ " AND cmvir.inoculation_at <![CDATA[<=]]> #{inoculationByAdminDTO.endTime} " + " </if> \n" + " </where>" + " order by inoculation_at desc " + " </script>") List<ComMngVaccinesInoculationExcelVo> exportVaccinesInoculationListByAdmin(@Param("inoculationByAdminDTO") VaccinesInoculationByAdminDTO inoculationByAdminDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVaccinesService.java
@@ -46,4 +46,10 @@ */ R deleteVaccinesByAdmin(Long id); /** * 疫苗分类列表 * @return 疫苗分类列表 */ R getEnrollTypeListByAdmin(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
@@ -207,6 +207,8 @@ if(comCvtServeDOS.size()==0 && errorInfo != null && errorInfo.size() > 0){ return R.fail("导入失败：" + errorInfo.toString()); } }else { return R.fail("导入失败：" + errorInfo.toString()); } return R.ok("共计导入服务数量："+comCvtServeDOS.size()); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesServiceImpl.java
@@ -114,4 +114,14 @@ } } /** * 疫苗分类列表 * @return 疫苗分类列表 */ public R getEnrollTypeListByAdmin(){ List<ComMngVaccinesDO> vaccinesDOList = this.baseMapper.selectList(new QueryWrapper<ComMngVaccinesDO>() .lambda().eq(ComMngVaccinesDO::getStatus,1)); return R.ok(vaccinesDOList); } }
