diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/PersonTestingDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/PersonTestingDTO.java index 8c64f3c..9a361c4 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/PersonTestingDTO.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/PersonTestingDTO.java @@ -134,4 +134,13 @@ public class PersonTestingDTO implements Serializable { */ private String delFlag; -} \ No newline at end of file + /** + * 核酸检测点表,主键 + */ + private String testingPointId; + + /** + * 核酸检测点,名称 + */ + private String testingPointName; +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/PersonTestingPageDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/PersonTestingPageDTO.java index c325897..18ca3a8 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/PersonTestingPageDTO.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/PersonTestingPageDTO.java @@ -110,4 +110,14 @@ public class PersonTestingPageDTO implements Serializable { * 逻辑删除标识 */ private String delFlag; -} \ No newline at end of file + + /** + * 核酸检测点表,主键 + */ + private String testingPointId; + + /** + * 核酸检测点,名称 + */ + private String testingPointName; +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/epidemic/TestingPointDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/epidemic/TestingPointDTO.java new file mode 100644 index 0000000..0cf3d4b --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/epidemic/TestingPointDTO.java @@ -0,0 +1,113 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.epidemic; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 核酸检测点 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-09-09 + */ +@Data +public class TestingPointDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 监测点名称 + */ + private String testingPointName; + + /** + * 位置 + */ + private String address; + + /** + * 经度 + */ + private BigDecimal longitude; + + /** + * 纬度 + */ + private BigDecimal latitude; + + /** + * 负责人 + */ + private String contacts; + + /** + * 联系电话 + */ + private String tel; + + /** + * 逻辑删除标识 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 监测点介绍 + */ + private String introduce; + + // 以下字段为虚字段 + + /** + * 核酸检测人数 + */ + private Integer testNum; +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/epidemic/result/TestingPointSelectionResultDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/epidemic/result/TestingPointSelectionResultDTO.java new file mode 100644 index 0000000..88ddfab --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/epidemic/result/TestingPointSelectionResultDTO.java @@ -0,0 +1,25 @@ +package com.elink.esua.epdc.dto.epidemic.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @description: 下拉选择 监测点名称 + * @author: zy + * @create: 2021-09-14 17:38 + **/ +@Data +public class TestingPointSelectionResultDTO implements Serializable { + + + /** + * 监测点名称 + */ + private String tagName; + + /** + * 监测点 id + */ + private String tagValue; +}