疫苗接种点，核酸检测点 pc 管理

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

@@ -0,0 +1,33 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/28 10:30
+ * @DESC
+ */
+@Data
+public class PointHSYMFormDTO extends PageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -498378993902522370L;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 地点名称
+     */
+    private String name;
+
+    /**
+     * user所属组织ID
+     */
+    private String orgId;
+}

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

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -16,11 +17,16 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.constants.ImportTaskConstants;
+import com.epmet.dao.IcPointNucleicMonitoringDao;
 import com.epmet.dto.IcPointNucleicMonitoringDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.form.PointHSYMFormDTO;
+import com.epmet.dto.form.VaccinationListFormDTO;
 import com.epmet.dto.result.CommunityInfoResultDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.excel.IcPointNucleicMonitoringExcel;
+import com.epmet.excel.NatExportExcel;
+import com.epmet.excel.VaccinationExportExcel;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.service.IcPointNucleicMonitoringService;
@@ -57,6 +63,9 @@ public class IcPointNucleicMonitoringController {
     @Autowired
     private GovOrgFeignClient govOrgFeignClient;
 
+    @Autowired
+    private IcPointNucleicMonitoringDao icPointNucleicMonitoringDao;
+
     @RequestMapping("page")
     public Result<PageData<IcPointNucleicMonitoringDTO>> page(@RequestParam Map<String, Object> params){
 //        PageData<IcPointNucleicMonitoringDTO> page = icPointNucleicMonitoringService.page(params);
@@ -98,10 +107,26 @@ public class IcPointNucleicMonitoringController {
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IcPointNucleicMonitoringDTO> list = icPointNucleicMonitoringService.list(params);
+        List<IcPointNucleicMonitoringDTO> list = icPointNucleicMonitoringDao.getPhrasePage(params);
         ExcelUtils.exportExcelToTarget(response, null, list, IcPointNucleicMonitoringExcel.class);
     }
 
+    /**
+     * Desc: 【核酸检测点】导出
+     * @param response
+     * @param formDTO
+     * @param tokenDto
+     * @author wgf
+     * @date 2022/6/24 13:57
+     */
+    @PostMapping("point-export")
+    public void vaccinationExport(HttpServletResponse response, @RequestBody PointHSYMFormDTO formDTO, @LoginUser TokenDto tokenDto) throws Exception {
+        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
+        List<IcPointNucleicMonitoringDTO> list = icPointNucleicMonitoringDao.getPhrasePageByDTO(formDTO);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcPointNucleicMonitoringExcel.class);
+
+    }
+
     /**
      * 获取【发送通知】按钮显示隐藏状态
      * @param tokenDto

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

@@ -3,6 +3,7 @@ package com.epmet.controller;
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -15,9 +16,13 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.constants.ImportTaskConstants;
+import com.epmet.dao.IcPointVaccinesInoculationDao;
+import com.epmet.dto.IcPointNucleicMonitoringDTO;
 import com.epmet.dto.IcPointVaccinesInoculationDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.form.PointHSYMFormDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
+import com.epmet.excel.IcPointNucleicMonitoringExcel;
 import com.epmet.excel.IcPointVaccinesInoculationExcel;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcPointVaccinesInoculationService;
@@ -51,6 +56,9 @@ public class IcPointVaccinesInoculationController {
     @Autowired
     private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
 
+    @Autowired
+    private IcPointVaccinesInoculationDao icPointVaccinesInoculationDao;
+
     @RequestMapping("page")
     public Result<PageData<IcPointVaccinesInoculationDTO>> page(@RequestParam Map<String, Object> params){
 //        PageData<IcPointVaccinesInoculationDTO> page = icPointVaccinesInoculationService.page(params);
@@ -96,6 +104,22 @@ public class IcPointVaccinesInoculationController {
         ExcelUtils.exportExcelToTarget(response, null, list, IcPointVaccinesInoculationExcel.class);
     }
 
+    /**
+     * Desc: 【疫苗接种点】导出
+     * @param response
+     * @param formDTO
+     * @param tokenDto
+     * @author wgf
+     * @date 2022/6/24 13:57
+     */
+    @PostMapping("point-export")
+    public void vaccinationExport(HttpServletResponse response, @RequestBody PointHSYMFormDTO formDTO, @LoginUser TokenDto tokenDto) throws Exception {
+        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
+        List<IcPointVaccinesInoculationDTO> list = icPointVaccinesInoculationDao.getPhrasePageByDTO(formDTO);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcPointVaccinesInoculationExcel.class);
+
+    }
+
     /**
      * Desc: 【疫苗接种点】导入
      * @param

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java

@@ -3,6 +3,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IcPointNucleicMonitoringDTO;
 import com.epmet.dto.form.MapInfoFormDTO;
+import com.epmet.dto.form.PointHSYMFormDTO;
 import com.epmet.dto.result.MapInfoResultDTO;
 import com.epmet.entity.IcPointNucleicMonitoringEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -32,6 +33,13 @@ public interface IcPointNucleicMonitoringDao extends BaseDao<IcPointNucleicMonit
      */
     List<IcPointNucleicMonitoringDTO> getPhrasePage(Map<String, Object> params);
 
+    /**
+     * 条件查询
+     * @param formDTO
+     * @return
+     */
+    List<IcPointNucleicMonitoringDTO> getPhrasePageByDTO(PointHSYMFormDTO formDTO);
+
     /**
      * 获取地图信息
      * @param formDTO

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointVaccinesInoculationDao.java

@@ -3,6 +3,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IcPointVaccinesInoculationDTO;
 import com.epmet.dto.form.MapInfoFormDTO;
+import com.epmet.dto.form.PointHSYMFormDTO;
 import com.epmet.dto.result.MapInfoResultDTO;
 import com.epmet.entity.IcPointVaccinesInoculationEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -32,6 +33,13 @@ public interface IcPointVaccinesInoculationDao extends BaseDao<IcPointVaccinesIn
      */
     List<IcPointVaccinesInoculationDTO> getPhrasePage(Map<String, Object> params);
 
+    /**
+     * 条件查询
+     * @param formDTO
+     * @return
+     */
+    List<IcPointVaccinesInoculationDTO> getPhrasePageByDTO(PointHSYMFormDTO formDTO);
+
     /**
      * 获取地图信息
      * @param formDTO

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

@@ -14,24 +14,9 @@ import java.util.Date;
 @Data
 public class IcPointNucleicMonitoringExcel {
 
-    @Excel(name = "ID")
-    private String id;
-
-    @Excel(name = "客户ID")
-    private String customerId;
-
-    @Excel(name = "所属组织ID")
-    private String orgId;
-
     @Excel(name = "所属组织名称")
     private String orgName;
 
-    @Excel(name = "组织ID上级")
-    private String pid;
-
-    @Excel(name = "组织ID所有上级")
-    private String pids;
-
     @Excel(name = "核酸监测点名称")
     private String name;
 
@@ -50,23 +35,7 @@ public class IcPointNucleicMonitoringExcel {
     @Excel(name = "纬度")
     private String latitude;
 
-    @Excel(name = "")
-    private Integer 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;
 
 
 }

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

@@ -14,24 +14,6 @@ import java.util.Date;
 @Data
 public class IcPointVaccinesInoculationExcel {
 
-    @Excel(name = "ID")
-    private String id;
-
-    @Excel(name = "客户ID")
-    private String customerId;
-
-    @Excel(name = "所属组织ID")
-    private String orgId;
-
-    @Excel(name = "所属组织名称")
-    private String orgName;
-
-    @Excel(name = "组织ID上级")
-    private String pid;
-
-    @Excel(name = "组织ID所有上级")
-    private String pids;
-
     @Excel(name = "疫苗接种点名称")
     private String name;
 
@@ -50,7 +32,7 @@ public class IcPointVaccinesInoculationExcel {
     @Excel(name = "接种下午结束时间")
     private String afEndTime;
 
-    @Excel(name = "暂无疫苗（1：是；2：否）")
+    @Excel(name = "暂无疫苗", replace = {"是_1","否_2"})
     private String noAvailableVaccines;
 
     @Excel(name = "咨询电话")
@@ -59,29 +41,7 @@ public class IcPointVaccinesInoculationExcel {
     @Excel(name = "接种点地址")
     private String address;
 
-    @Excel(name = "经度")
-    private String longitude;
-
-    @Excel(name = "纬度")
-    private String latitude;
-
-    @Excel(name = "")
-    private Integer 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;
 
 
 }

epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml

@@ -65,6 +65,40 @@
         order by CREATED_TIME desc
     </select>
 
+    <select id="getPhrasePageByDTO" resultType="com.epmet.dto.IcPointNucleicMonitoringDTO" parameterType="com.epmet.dto.form.PointHSYMFormDTO">
+        select
+        ID,
+        CUSTOMER_ID,
+        ORG_ID,
+        ORG_NAME,
+        PID,
+        PIDS,
+        NAME,
+        SERVE_TIME,
+        MOBILE,
+        ADDRESS,
+        LONGITUDE,
+        LATITUDE,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        from ic_point_nucleic_monitoring
+        where DEL_FLAG = 0
+        <if test="name != null and name != ''">
+            and NAME like CONCAT('%' ,#{name}, '%')
+        </if>
+        <if test="mobile != null and mobile != ''">
+            and MOBILE like CONCAT('%', #{mobile}, '%')
+        </if>
+        <if test="orgId != null and orgId != ''">
+            and (ORG_ID = #{orgId} or FIND_IN_SET(#{orgId},PIDS))
+        </if>
+        order by CREATED_TIME desc
+    </select>
+
     <select id="getMapInfoList" parameterType="com.epmet.dto.form.MapInfoFormDTO"
             resultType="com.epmet.dto.result.MapInfoResultDTO">
         select

epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml

@@ -72,6 +72,42 @@
         order by CREATED_TIME desc
     </select>
 
+    <select id="getPhrasePageByDTO" resultType="com.epmet.dto.IcPointVaccinesInoculationDTO" parameterType="com.epmet.dto.form.PointHSYMFormDTO">
+        select
+        ID,
+        CUSTOMER_ID,
+        ORG_ID,
+        ORG_NAME,
+        PID,
+        PIDS,
+        NAME,
+        INOCULATION_DATE,
+        MO_START_TIME,
+        MO_END_TIME,
+        AF_START_TIME,
+        AF_END_TIME,
+        (case NO_AVAILABLE_VACCINES when '1' then '是' when '2' then '否' else '' end ) as NO_AVAILABLE_VACCINES,
+        MOBILE,
+        ADDRESS,
+        LONGITUDE,
+        LATITUDE,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        from ic_point_vaccines_inoculation
+        where DEL_FLAG = 0
+        <if test="name != null and name != ''">
+            and NAME like CONCAT('%' ,#{name}, '%')
+        </if>
+        <if test="mobile != null and mobile != ''">
+            and MOBILE like CONCAT('%', #{mobile}, '%')
+        </if>
+        order by CREATED_TIME desc
+    </select>
+
     <select id="getMapInfoList" parameterType="com.epmet.dto.form.MapInfoFormDTO"
             resultType="com.epmet.dto.result.MapInfoResultDTO">
         select