20 changed files with 586 additions and 67 deletions
@ -0,0 +1,22 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 社区居民信息登记-查询 |
|||
*/ |
|||
@Data |
|||
public class LatestSubmitCollectFormDTO implements Serializable { |
|||
public interface AddUserInternalGroup { |
|||
} |
|||
|
|||
@NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class) |
|||
private String userId; |
|||
@NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) |
|||
private String customerId; |
|||
@NotBlank(message = "gridId不能为空", groups = AddUserInternalGroup.class) |
|||
private String gridId; |
|||
} |
@ -0,0 +1,105 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.Valid; |
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.NotEmpty; |
|||
import javax.validation.constraints.NotNull; |
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 社区居民信息登记-提交 入参 |
|||
*/ |
|||
@Data |
|||
public class ResiCollectFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -4026681095438180447L; |
|||
|
|||
public interface AddUserInternalGroup { |
|||
} |
|||
|
|||
public interface InternalShowGroup extends CustomerClientShowGroup { |
|||
} |
|||
|
|||
/** |
|||
* 客户Id customer.id |
|||
*/ |
|||
@NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 网格ID_后端接口赋值 |
|||
*/ |
|||
@NotBlank(message = "gridId不能为空", groups = AddUserInternalGroup.class) |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 组织Id_后端接口赋值 |
|||
*/ |
|||
@NotBlank(message = "agencyId不能为空", groups = AddUserInternalGroup.class) |
|||
private String agencyId; |
|||
|
|||
/** |
|||
* 组织的pid_后端接口赋值 |
|||
*/ |
|||
private String pids; |
|||
|
|||
/** |
|||
* 所属小区ID |
|||
*/ |
|||
@NotBlank(message = "小区不能为空", groups = InternalShowGroup.class) |
|||
private String villageId; |
|||
|
|||
/** |
|||
* 所属楼宇Id |
|||
*/ |
|||
@NotBlank(message = "楼栋不能为空", groups = InternalShowGroup.class) |
|||
private String buildId; |
|||
|
|||
/** |
|||
* 单元id |
|||
*/ |
|||
@NotBlank(message = "单元不能为空", groups = InternalShowGroup.class) |
|||
private String unitId; |
|||
|
|||
/** |
|||
* 所属家庭Id |
|||
*/ |
|||
@NotBlank(message = "家庭不能为空", groups = InternalShowGroup.class) |
|||
private String homeId; |
|||
|
|||
/** |
|||
* 详细地址 |
|||
*/ |
|||
@NotBlank(message = "家庭地址不能为空", groups = {InternalShowGroup.class}) |
|||
private String address; |
|||
|
|||
/** |
|||
* 1自有0租住 |
|||
*/ |
|||
@NotBlank(message = "房子属于自有还是租住?", groups = {InternalShowGroup.class}) |
|||
private String houseType; |
|||
|
|||
/** |
|||
* 户主姓名 |
|||
*/ |
|||
@NotBlank(message = "户主姓名不能为空", groups = {InternalShowGroup.class}) |
|||
private String houseHolderName; |
|||
|
|||
/** |
|||
* 居住成员人数 |
|||
*/ |
|||
@NotNull(message = "居住成员人数不能为空", groups = {InternalShowGroup.class}) |
|||
private Integer totalResi; |
|||
|
|||
@Valid |
|||
@NotEmpty(message = "成员信息不能为空", groups = {InternalShowGroup.class}) |
|||
private List<IcResiCollectMemFormDTO> memberList; |
|||
|
|||
@NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class) |
|||
private String userId; |
|||
|
|||
} |
@ -0,0 +1,82 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.epmet.dto.form.IcResiCollectMemFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.Valid; |
|||
import java.io.Serializable; |
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 社区居民信息登记-返参 |
|||
*/ |
|||
@Data |
|||
public class LatestCollectResDTO implements Serializable { |
|||
private String resiCollectId; |
|||
private String agencyId; |
|||
private String agencyName; |
|||
private String pids; |
|||
private String gridId; |
|||
private String customerId; |
|||
/** |
|||
* 所属小区ID |
|||
*/ |
|||
private String villageId; |
|||
|
|||
/** |
|||
* 所属楼宇Id |
|||
*/ |
|||
private String buildId; |
|||
|
|||
/** |
|||
* 单元id |
|||
*/ |
|||
private String unitId; |
|||
|
|||
/** |
|||
* 所属家庭Id |
|||
*/ |
|||
private String homeId; |
|||
|
|||
/** |
|||
* 详细地址 |
|||
*/ |
|||
private String address; |
|||
|
|||
/** |
|||
* 1自有0租住 |
|||
*/ |
|||
private String houseType; |
|||
|
|||
/** |
|||
* 户主姓名 |
|||
*/ |
|||
private String houseHolderName; |
|||
|
|||
/** |
|||
* 居住成员人数 |
|||
*/ |
|||
private Integer totalResi; |
|||
|
|||
@Valid |
|||
private List<IcResiCollectMemFormDTO> memberList; |
|||
|
|||
public LatestCollectResDTO() { |
|||
this.resiCollectId = ""; |
|||
this.agencyId = ""; |
|||
this.agencyName = ""; |
|||
this.pids = ""; |
|||
this.gridId = ""; |
|||
this.customerId = ""; |
|||
this.villageId = ""; |
|||
this.buildId = ""; |
|||
this.unitId=""; |
|||
this.homeId=""; |
|||
this.address=""; |
|||
this.houseType=""; |
|||
this.houseHolderName=""; |
|||
this.totalResi=0; |
|||
this.memberList=new ArrayList<>(); |
|||
} |
|||
} |
@ -0,0 +1,35 @@ |
|||
package com.epmet.excel; |
|||
|
|||
import cn.afterturn.easypoi.excel.annotation.Excel; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/3/29 10:24 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class NatExportExcel { |
|||
|
|||
@Excel(name = "排序",width = 10) |
|||
private Integer sort; |
|||
|
|||
@Excel(name = "姓名",width = 20) |
|||
private String name; |
|||
|
|||
@Excel(name = "电话",width = 20) |
|||
private String mobile; |
|||
|
|||
@Excel(name = "身份证",width = 30) |
|||
private String idCard; |
|||
|
|||
@Excel(name = "备注",width = 40) |
|||
private String remark; |
|||
|
|||
@Excel(name = "关注原因",width = 40) |
|||
private String reason; |
|||
|
|||
@Excel(name = "最近一次通知时间",width = 20) |
|||
private String lastInformTime; |
|||
|
|||
} |
@ -0,0 +1,35 @@ |
|||
package com.epmet.excel; |
|||
|
|||
import cn.afterturn.easypoi.excel.annotation.Excel; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/3/29 10:24 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class VaccinationExportExcel { |
|||
|
|||
@Excel(name = "排序",width = 10) |
|||
private Integer sort; |
|||
|
|||
@Excel(name = "姓名",width = 20) |
|||
private String name; |
|||
|
|||
@Excel(name = "电话",width = 20) |
|||
private String mobile; |
|||
|
|||
@Excel(name = "身份证",width = 30) |
|||
private String idCard; |
|||
|
|||
@Excel(name = "备注",width = 40) |
|||
private String remark; |
|||
|
|||
@Excel(name = "接种针次",width = 10) |
|||
private Integer vaccinationCount; |
|||
|
|||
@Excel(name = "最近一次通知时间",width = 20) |
|||
private String lastInformTime; |
|||
|
|||
} |
@ -0,0 +1,47 @@ |
|||
CREATE TABLE `ic_nat` ( |
|||
`ID` varchar(64) NOT NULL COMMENT 'ID', |
|||
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', |
|||
`AGENCY_ID` varchar(64) NOT NULL COMMENT '居民端上报时存储用户所在网格的组织id.居民信息的人存储居民所在组织id.单个新增或者导入的存储登录用户所属的组织id', |
|||
`PIDS` varchar(255) NOT NULL COMMENT '组织pids', |
|||
`USER_ID` varchar(64) DEFAULT NULL COMMENT '居民端小程序的用户id、数字社区的icResiUserId、其他情况无值', |
|||
`USER_TYPE` varchar(32) NOT NULL COMMENT '居民端小程序的人:resi;数字社区的居民:icresi;导入的:import;同步的:synchro', |
|||
`NAME` varchar(64) NOT NULL COMMENT '人员姓名', |
|||
`MOBILE` varchar(11) NOT NULL COMMENT '手机号', |
|||
`ID_CARD` varchar(18) NOT NULL COMMENT '身份证号', |
|||
`NAT_TIME` datetime NOT NULL COMMENT '检测时间,精确到分钟', |
|||
`NAT_RESULT` varchar(1) DEFAULT NULL COMMENT '检测结果(0:阴性 1:阳性)', |
|||
`NAT_ADDRESS` varchar(128) DEFAULT NULL COMMENT '检测地点', |
|||
`FILE_NAME` varchar(255) DEFAULT NULL COMMENT '文件名', |
|||
`ATTACHMENT_TYPE` varchar(64) NOT NULL COMMENT '附件类型((图片 - image、 视频 - video、 语音 - voice、 文档 - doc))', |
|||
`ATTACHMENT_URL` varchar(255) NOT NULL COMMENT '附件地址', |
|||
`DEL_FLAG` int(11) NOT NULL COMMENT '删除标识', |
|||
`REVISION` int(11) NOT NULL COMMENT '乐观锁', |
|||
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', |
|||
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间', |
|||
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', |
|||
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', |
|||
PRIMARY KEY (`ID`) USING BTREE |
|||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='核酸上报记录'; |
|||
|
|||
-- ---------------------------- |
|||
-- Table structure for ic_notice |
|||
-- ---------------------------- |
|||
|
|||
CREATE TABLE `ic_notice` ( |
|||
`ID` varchar(64) NOT NULL COMMENT '唯一标识', |
|||
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id', |
|||
`CHANNEL` varchar(10) NOT NULL COMMENT '通知渠道 0小程序通知,1短信通知', |
|||
`ORIGIN` varchar(64) NOT NULL COMMENT '通知来源 0行程上报,1疫苗接种,2核酸检测', |
|||
`USER_ID` varchar(64) DEFAULT NULL COMMENT '用户ID 居民端用户时有值', |
|||
`MOBILE` varchar(11) NOT NULL COMMENT '手机号', |
|||
`ID_CARD` varchar(64) NOT NULL COMMENT '被通知人身份证号', |
|||
`CONTENT` varchar(500) NOT NULL COMMENT '通知内容', |
|||
`ORG_NAME` varchar(64) DEFAULT NULL COMMENT '发送通知的社区', |
|||
`DEL_FLAG` int(11) NOT NULL COMMENT '删除标识:0.未删除 1.已删除', |
|||
`REVISION` int(11) NOT NULL COMMENT '乐观锁', |
|||
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', |
|||
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间', |
|||
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', |
|||
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', |
|||
PRIMARY KEY (`ID`) USING BTREE |
|||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='防疫通知'; |
Loading…
Reference in new issue