From 529145876a560e2809f614369e3305a0ae537791 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Thu, 16 Dec 2021 18:46:38 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B2=BB=E7=90=86?=
=?UTF-8?q?=E6=8C=87=E6=95=B0=EF=BC=88=E5=A4=A9=EF=BC=89=E3=80=81=E7=BB=84?=
=?UTF-8?q?=E7=BB=87=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0=EF=BC=88=E5=A4=A9?=
=?UTF-8?q?=EF=BC=89=E5=A4=A7=E5=B1=8F=E8=A1=97=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../result/ScreenAgencyGovernDailyResultDTO.java | 14 ++++++++++++--
.../result/ScreenGridGovernDailyResultDTO.java | 12 +++++++++++-
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyGovernDailyResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyGovernDailyResultDTO.java
index f97b5ec..8dbea22 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyGovernDailyResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyGovernDailyResultDTO.java
@@ -120,7 +120,7 @@ public class ScreenAgencyGovernDailyResultDTO implements Serializable {
private Integer inGroupTopicUnResolvedCount;
/**
- * 11、未出当前组织的，结案项目数
+ * （改）13、当前组织内结案的项目中：由网格结案的项目总数
*/
private Integer gridSelfGovernProjectTotal;
@@ -135,7 +135,17 @@ public class ScreenAgencyGovernDailyResultDTO implements Serializable {
private Integer streetClosedCount;
/**
- * 当前组织内出来的项目：由区直部门(已解决+未解决)结案的项目总数
+ * （改）16、当前组织内结案的项目中：由区直部门结案的项目总数
*/
private Integer districtDeptClosedCount;
+
+ /**
+ * （新增）11、当前组织内：来源于事件的项目：结案已解决数
+ */
+ private Integer eventResolvedCount;
+
+ /**
+ * （新增）12、当前组织内：来源于事件的项目：结案无需解决数
+ */
+ private Integer eventUnResolvedCount;
}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridGovernDailyResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridGovernDailyResultDTO.java
index 1b75e4d..a48cc45 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridGovernDailyResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridGovernDailyResultDTO.java
@@ -135,7 +135,7 @@ public class ScreenGridGovernDailyResultDTO implements Serializable {
private Integer fromAgencyUnResolvedInGridCount;
/**
- * 15、未出当前网格的，结案项目数=11+12+13+14
+ * （改）17、当前网格内出来的项目：由网格结案(已解决+未解决)的项目总数
*/
private Integer gridSelfGovernProjectTotal;
@@ -153,4 +153,14 @@ public class ScreenGridGovernDailyResultDTO implements Serializable {
* 当前网格内出来的项目：由区直部门(已解决+未解决)结案的项目总数
*/
private Integer districtDeptClosedCount;
+
+ /**
+ * （新）15、当前网格内：来源于事件的项目：结案已解决数
+ */
+ private Integer eventResolvedCount;
+
+ /**
+ * （新）16、当前网格内：来源于事件的项目：结案无需解决数
+ */
+ private Integer eventUnResolvedCount;
}
From 6c6d07bd64ec115815c1d8dd7ce2d3ba2b97a49b Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Thu, 23 Dec 2021 14:09:48 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E5=85=8D=E6=A0=A1=E9=AA=8CPC=E7=94=A8?=
=?UTF-8?q?=E6=88=B7dto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epdc/dto/VerificationFreeUserDTO.java | 108 ++++++++++++++++++
1 file changed, 108 insertions(+)
create mode 100644 epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/VerificationFreeUserDTO.java
diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/VerificationFreeUserDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/VerificationFreeUserDTO.java
new file mode 100644
index 0000000..1bb5622
--- /dev/null
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/VerificationFreeUserDTO.java
@@ -0,0 +1,108 @@
+/**
+ * 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;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 免校验PC用户（针对隐私数据，免验证码校验）
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-12-22
+ */
+@Data
+public class VerificationFreeUserDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ private String id;
+
+ /**
+ * 用户管理表主键
+ */
+ private Long sysUserId;
+
+ /**
+ * 校验标识 0：否，1：是
+ */
+ private String verificationFlag;
+
+ /**
+ * 删除标识 0：未删除，1：已删除
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+ // sys_ser 关联属性
+
+ /**
+ * 用户名
+ */
+ private String username;
+
+ /**
+ * 姓名
+ */
+ private String realName;
+
+ /**
+ * 手机号
+ */
+ private String mobile;
+
+ /**
+ * 邮箱
+ */
+ private String email;
+
+ /**
+ * 所属部门
+ */
+ private String deptName;
+}
From ee100fd6340f915baf0f03eb7895d427a61a1d87 Mon Sep 17 00:00:00 2001
From: Jackwang
Date: Wed, 5 Jan 2022 16:36:11 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E7=82=B9=E4=BA=AE=E5=BE=BD=E7=AB=A0=20?=
=?UTF-8?q?=E5=88=A0=E9=99=A4=E9=9D=9E=E7=A9=BA=E6=8B=A6=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java
index 3caa982..2a1e667 100644
--- a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java
+++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java
@@ -1,9 +1,7 @@
package com.elink.esua.epdc.dto.epdc.form;
import lombok.Data;
-import lombok.NonNull;
-import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
@@ -19,7 +17,7 @@ public class EpdcAppShowIdentityFormDTO implements Serializable {
/**
*用户ID
*/
- @NotBlank(message = "用户id不为空")
+// @NotBlank(message = "用户id不为空")
private String userId;
/**
From 802a80267ed9fe176f8854c2d3134c76ffe3651b Mon Sep 17 00:00:00 2001
From: Jackwang
Date: Tue, 11 Jan 2022 09:48:29 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pc/epidemic/EpidemicUserSyncDTO.java | 47 +++++++++++++++++++
1 file changed, 47 insertions(+)
create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/EpidemicUserSyncDTO.java
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/EpidemicUserSyncDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/EpidemicUserSyncDTO.java
new file mode 100644
index 0000000..3b84d6a
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/EpidemicUserSyncDTO.java
@@ -0,0 +1,47 @@
+/**
+ * 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.analysis.pc.epidemic;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ *
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2022-01-11
+ */
+@Data
+public class EpidemicUserSyncDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 同步时间
+ */
+ private Date syncDate;
+
+}
From c7c5cf73dfa4105c28df2767fd7724d99b66cefc Mon Sep 17 00:00:00 2001
From: Jackwang
Date: Thu, 13 Jan 2022 11:13:06 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E6=8E=A8=E9=80=81=E5=8E=BF=E5=B9=B3=E5=8F=B0=E6=9B=B4=E6=96=B0?=
=?UTF-8?q?=E7=9A=84=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pc/epidemic/DsfUserInfoSyncDTO.java | 367 ++++++++++++++++++
.../pc/epidemic/DsfUserInfoSyncTotalDTO.java | 19 +
2 files changed, 386 insertions(+)
create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/DsfUserInfoSyncDTO.java
create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/DsfUserInfoSyncTotalDTO.java
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/DsfUserInfoSyncDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/DsfUserInfoSyncDTO.java
new file mode 100644
index 0000000..0538d6a
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/DsfUserInfoSyncDTO.java
@@ -0,0 +1,367 @@
+/**
+ * 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.analysis.pc.epidemic;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 基础信息同步记录表
+ *
+ * @author zhy qu@elink-cn.com
+ * @since v1.0.0 2022-01-07
+ */
+@Data
+public class DsfUserInfoSyncDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private Long id;
+
+ /**
+ * 姓名
+ */
+ private String userName;
+
+ /**
+ * 身份证号
+ */
+ private String idCard;
+
+ /**
+ * 户籍地code
+ */
+ private String householdRegisterCode;
+
+ /**
+ * 户籍地名称
+ */
+ private String householdRegisterName;
+
+ /**
+ * 户籍地详细地址
+ */
+ private String householdRegisterDetail;
+
+ /**
+ * 性别
+ */
+ private String gender;
+
+ /**
+ * 民族
+ */
+ private String nation;
+
+ /**
+ * 曾用名
+ */
+ private String formerName;
+
+ /**
+ * 出生年月
+ */
+ private String birthday;
+
+ /**
+ * 身高
+ */
+ private String height;
+
+ /**
+ * 文化程度
+ */
+ private String standardOfCulture;
+
+ /**
+ * 健康情况
+ */
+ private String health;
+
+ /**
+ * 婚姻状况
+ */
+ private String maritalStatus;
+
+ /**
+ * 与户主关系
+ */
+ private String relation;
+
+ /**
+ * 国籍
+ */
+ private String nationality;
+
+ /**
+ * 政治面貌
+ */
+ private String politicsStatus;
+
+ /**
+ * 宗教信仰
+ */
+ private String faith;
+
+ /**
+ * 毕业院校
+ */
+ private String graduateSchool;
+
+ /**
+ * 专业
+ */
+ private String professional;
+
+ /**
+ * 工作状态
+ */
+ private String workStatus;
+
+ /**
+ * 行业类别
+ */
+ private String industryCategory;
+
+ /**
+ * 工作单位（现/原）
+ */
+ private String workUnits;
+
+ /**
+ * 兵役状况
+ */
+ private String military;
+
+ /**
+ * 人口类别
+ */
+ private String peopleCategories;
+
+ /**
+ * 特殊人群
+ */
+ private String specialCrowd;
+
+ /**
+ * 有无车辆
+ */
+ private String car;
+
+ /**
+ * 车牌号
+ */
+ private String carNo;
+
+ /**
+ * 人户状况
+ */
+ private String hushaiStatus;
+
+ /**
+ * 籍贯
+ */
+ private String nativePlace;
+
+ /**
+ * 血型
+ */
+ private String bloodType;
+
+ /**
+ * 手机号或座机号
+ */
+ private String mobile;
+
+ /**
+ * 往返情况(1:在平阴 2在外地)
+ */
+ private String returnState;
+
+ /**
+ * 县内居住地code
+ */
+ private String liveAddressCode;
+
+ /**
+ * 县内居住地镇街
+ */
+ private String liveAddressName;
+
+ /**
+ * 县内居住地详细地址
+ */
+ private String liveAddressDetail;
+
+ /**
+ * 县内居住地关联人
+ */
+ private String relationPeople;
+
+ /**
+ * 县内居住地关联人手机号或座机号
+ */
+ private String relationPeopleMobile;
+
+ /**
+ * 现居住地code
+ */
+ private String outLiveAddressCode;
+
+ /**
+ * 现居住地名称
+ */
+ private String outLiveAddressName;
+
+ /**
+ * 现居住地详细地址
+ */
+ private String outLiveAddressDetail;
+
+ /**
+ * 现居住地疫情风险等级(1:低风险，2：中风险，3：高风险)
+ */
+ private String riskGrade;
+
+ /**
+ * 拟返回平阴时间
+ */
+ private String goBarkTime;
+
+ /**
+ * 拟离开平阴时间
+ */
+ private String leaveTime;
+
+ /**
+ * 拟去往目的地code
+ */
+ private String destinationAddressCode;
+
+ /**
+ * 拟去往目的地名称
+ */
+ private String destinationAddressName;
+
+ /**
+ * 拟去往目的地详细地址
+ */
+ private String destinationAddressDetail;
+
+ /**
+ *
+ */
+ private String communityId;
+
+ /**
+ * 社区/村庄
+ */
+ private String community;
+
+ /**
+ *
+ */
+ private String gridId;
+
+ /**
+ * 网格名称
+ */
+ private String gridName;
+
+ /**
+ * 小区
+ */
+ private String plot;
+
+ /**
+ * 楼号
+ */
+ private String buildingNo;
+
+ /**
+ * 单元
+ */
+ private String unit;
+
+ /**
+ * 房间号
+ */
+ private String roomNo;
+
+ /**
+ * 房屋性质
+ */
+ private String houseProperty;
+
+ /**
+ * 家庭保障情况
+ */
+ private String familySecurity;
+
+ /**
+ * 居住情况
+ */
+ private String livingSituation;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+ /**
+ * 逻辑删除标识
+ */
+ private String delFlag;
+
+ /**
+ * 同步时间
+ */
+ private String syncDate;
+
+ /**
+ * 同步状态，空：未同步，0同步成功，1同步失败
+ */
+ private String syncFlag;
+
+}
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/DsfUserInfoSyncTotalDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/DsfUserInfoSyncTotalDTO.java
new file mode 100644
index 0000000..c10027c
--- /dev/null
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/DsfUserInfoSyncTotalDTO.java
@@ -0,0 +1,19 @@
+package com.elink.esua.epdc.dto.analysis.pc.epidemic;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: epdc-cloud-analysis-pc-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2022-01-12 09:23
+ **/
+@Data
+public class DsfUserInfoSyncTotalDTO implements Serializable {
+
+
+ private List list;
+}
From 39a765ce9d8a0ff9f4de4d045f2ce0332582bb53 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Wed, 19 Jan 2022 14:56:47 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=96=AB=E6=83=85?=
=?UTF-8?q?=E9=98=B2=E6=8E=A7=E6=A8=A1=E5=9D=97=E6=95=B0=E6=8D=AE=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...cScreenEpidemicCommunityVaccinationStatisticsFormDTO.java | 2 --
...creenEpidemicCommunityVaccinationStatisticsResultDTO.java | 5 +++++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO.java
index f87aacb..7ae9c1e 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO.java
@@ -18,13 +18,11 @@ public class EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO implements
/**
*页码 -必传项
*/
- @NotNull(message = "页码 不能为空")
private Integer pageIndex;
/**
* 页容量 -必传项
*/
- @NotNull(message = "页容量 不能为空")
private Integer pageSize;
/**
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO.java
index 2b00938..e430e82 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO.java
@@ -63,4 +63,9 @@ public class EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO implement
*/
private String latitude;
+ /**
+ * 接种率
+ */
+ private String vaccinationRatio;
+
}
From bd690ea9e7ab54aea17783097623e4c42518160f Mon Sep 17 00:00:00 2001
From: Jackwang
Date: Thu, 20 Jan 2022 15:31:00 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epdc/dto/analysis/pc/epidemic/DsfUserInfoSyncDTO.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/DsfUserInfoSyncDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/DsfUserInfoSyncDTO.java
index 0538d6a..8e6e188 100644
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/DsfUserInfoSyncDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/DsfUserInfoSyncDTO.java
@@ -20,7 +20,6 @@ package com.elink.esua.epdc.dto.analysis.pc.epidemic;
import lombok.Data;
import java.io.Serializable;
-import java.util.Date;
/**
@@ -337,7 +336,7 @@ public class DsfUserInfoSyncDTO implements Serializable {
/**
* 创建时间
*/
- private Date createdTime;
+ private String createdTime;
/**
* 更新人
@@ -347,7 +346,7 @@ public class DsfUserInfoSyncDTO implements Serializable {
/**
* 更新时间
*/
- private Date updatedTime;
+ private String updatedTime;
/**
* 逻辑删除标识
From 7a523fc3289d1b4e739c9f14f73dd950bbc633e7 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Wed, 26 Jan 2022 09:19:03 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E7=AD=BE?=
=?UTF-8?q?=E5=88=B0=E5=AE=9E=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/elink/esua/epdc/dto/UserSignDTO.java | 92 +++++++++++++++++++
1 file changed, 92 insertions(+)
create mode 100644 epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserSignDTO.java
diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserSignDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserSignDTO.java
new file mode 100644
index 0000000..c7ab802
--- /dev/null
+++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserSignDTO.java
@@ -0,0 +1,92 @@
+/**
+ * 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;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 用户签到表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-07-21
+ */
+@Data
+public class UserSignDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 用户ID
+ */
+ private String userId;
+
+ /**
+ * 连续签到天数
+ */
+ private Integer consequentSignDays;
+
+ /**
+ * 最近签到时间
+ */
+ private Date lastSignTime;
+
+ /**
+ * 删除标记
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+ /**
+ * 用户认证网格
+ */
+ private Long gridId;
+
+}
\ No newline at end of file
From d8aa5bf6e97e37d255f84cc1d0645e92b9abd5dc Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Wed, 26 Jan 2022 09:45:07 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E5=8F=8D=E5=8F=82=EF=BC=9A=E7=94=A8=E6=88=B7=E4=BB=8A=E5=A4=A9?=
=?UTF-8?q?=E6=98=AF=E5=90=A6=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java
index 932dd01..6dbe5bc 100644
--- a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java
+++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java
@@ -36,4 +36,9 @@ public class EpdcUserInfoResultDTO implements Serializable {
*/
private String showIdentityFlag;
+ /**
+ * 用户今天是否签到
+ */
+ private Integer isSignUp;
+
}
From 1a2a620ec318725c7b20ede213d1da28dcac3feb Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Wed, 26 Jan 2022 13:30:49 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E5=A4=A7=E5=B1=8F-=E7=BD=91=E6=A0=BC?=
=?UTF-8?q?=E6=B2=BB=E7=90=86-=E6=96=B0=E5=A2=9E=E8=AE=AE=E9=A2=98?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java
index 25f683e..7a9586c 100644
--- a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java
+++ b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java
@@ -142,4 +142,4 @@ public class PointsLogsDTO implements Serializable {
*/
private String status;
-}
\ No newline at end of file
+}
From b0d9f3e79536d5f2b16fef9c8d72627148e3b3bf Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Wed, 26 Jan 2022 14:30:12 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95?=
=?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../elink/esua/epdc/dto/PointsLogsDTO.java | 29 +++++++++++++++++
.../epdc/dto/form/PointsLogsAddFormDTO.java | 31 ++++++++++++++++++-
2 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java
index 7a9586c..d833f05 100644
--- a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java
+++ b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java
@@ -142,4 +142,33 @@ public class PointsLogsDTO implements Serializable {
*/
private String status;
+ /**
+ * 网格
+ */
+ private String grid;
+
+ /**
+ * 网格ID
+ */
+ private Long gridId;
+
+ /**
+ * 父所有部门ID
+ */
+ private String parentDeptIds;
+
+ /**
+ * 父所有部门
+ */
+ private String parentDeptNames;
+
+ /**
+ * 所有部门ID
+ */
+ private String allDeptIds;
+
+ /**
+ * 所有部门
+ */
+ private String allDeptNames;
}
diff --git a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/form/PointsLogsAddFormDTO.java b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/form/PointsLogsAddFormDTO.java
index 870bde0..da4c7a1 100644
--- a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/form/PointsLogsAddFormDTO.java
+++ b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/form/PointsLogsAddFormDTO.java
@@ -92,4 +92,33 @@ public class PointsLogsAddFormDTO {
*/
private Integer lavePoints;
-}
\ No newline at end of file
+ /**
+ * 网格
+ */
+ private String grid;
+
+ /**
+ * 网格ID
+ */
+ private Long gridId;
+
+ /**
+ * 父所有部门ID
+ */
+ private String parentDeptIds;
+
+ /**
+ * 父所有部门
+ */
+ private String parentDeptNames;
+
+ /**
+ * 所有部门ID
+ */
+ private String allDeptIds;
+
+ /**
+ * 所有部门
+ */
+ private String allDeptNames;
+}
From 740ab6799d31eb31b8e7642fc75bf4c78c7b3e01 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Sat, 12 Feb 2022 17:16:35 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E7=A7=AF=E5=88=86=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/elink/esua/epdc/dto/PointsLogsDTO.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java
index d833f05..ed2560c 100644
--- a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java
+++ b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java
@@ -171,4 +171,14 @@ public class PointsLogsDTO implements Serializable {
* 所有部门
*/
private String allDeptNames;
+
+ /**
+ * 备注
+ */
+ private String remark;
+
+ /**
+ * 用户真实姓名
+ */
+ private String realName;
}
From d919a78617e83128f5e69428e10e89d22e2e6968 Mon Sep 17 00:00:00 2001
From: Jackwang
Date: Sun, 13 Feb 2022 14:38:23 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=89=8B=E6=9C=BA?=
=?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../esua/epdc/dto/PointsUpdateFormDTO.java | 29 +++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/PointsUpdateFormDTO.java
diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/PointsUpdateFormDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/PointsUpdateFormDTO.java
new file mode 100644
index 0000000..898ffc6
--- /dev/null
+++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/PointsUpdateFormDTO.java
@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: epdc-cloud-user-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2022-02-13 14:34
+ **/
+@Data
+public class PointsUpdateFormDTO implements Serializable {
+
+ /**
+ * 行为类型：
+ * 双十信息更新-double_info_update
+ * 网格巡查-grid_patrol
+ * 网格上报事件-grid_report_event
+ * 网格工作上传-grid_work_upload
+ */
+ private String behaviorType;
+
+ /**
+ * 手机号
+ */
+ private String mobile;
+}