From 201e33eb2576b5358359b57b55d97cfce2b535dc Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 10 Mar 2022 15:02:41 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../esua/epdc/dto/result/PointsLogsResultDTO.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsLogsResultDTO.java b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsLogsResultDTO.java
index ced14a9..3e21624 100644
--- a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsLogsResultDTO.java
+++ b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsLogsResultDTO.java
@@ -132,4 +132,14 @@ public class PointsLogsResultDTO implements Serializable {
*/
private Date updatedTime;
-}
\ No newline at end of file
+ /**
+ * 备注
+ */
+ private String remark;
+
+ /**
+ * 用户真实姓名
+ */
+ private String realName;
+
+}
From d1f42805fd9567b33c295344a53223eb4d32d7be Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 29 Mar 2022 17:23:22 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
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 | 5 +++++
1 file changed, 5 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 ed2560c..acabc59 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
@@ -181,4 +181,9 @@ public class PointsLogsDTO implements Serializable {
* 用户真实姓名
*/
private String realName;
+
+ /**
+ * 手机号
+ */
+ private String mobile;
}
From ba9218dd49c0443007e925385cec5660dae9d8a2 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 31 Mar 2022 15:00:51 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4?=
=?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epdc/dto/PointsAdjustmentTypeDTO.java | 91 +++++++++++
.../dto/PointsIntegralAdjustmentCheckDTO.java | 141 ++++++++++++++++++
2 files changed, 232 insertions(+)
create mode 100644 epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsAdjustmentTypeDTO.java
create mode 100644 epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java
diff --git a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsAdjustmentTypeDTO.java b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsAdjustmentTypeDTO.java
new file mode 100644
index 0000000..a188cf8
--- /dev/null
+++ b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsAdjustmentTypeDTO.java
@@ -0,0 +1,91 @@
+/**
+ * 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 java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 积分调整类型分值管理表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2022-03-31
+ */
+@Data
+public class PointsAdjustmentTypeDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ private String id;
+
+ /**
+ * 行为调整类型code
+ */
+ private String adjustmentTypeCode;
+
+ /**
+ * 行为调整类型名称
+ */
+ private String adjustmentTypeName;
+
+ /**
+ * 分数
+ */
+ private Integer point;
+
+ /**
+ * 备注
+ */
+ private String remark;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 逻辑删除标识
+ */
+ private String delFlag;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java
new file mode 100644
index 0000000..ffbec62
--- /dev/null
+++ b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java
@@ -0,0 +1,141 @@
+/**
+ * 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 java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 积分调整审核表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2022-03-31
+ */
+@Data
+public class PointsIntegralAdjustmentCheckDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ private String id;
+
+ /**
+ * 用户ID
+ */
+ private String userId;
+
+ /**
+ * 用户昵称
+ */
+ private String nickName;
+
+ /**
+ * 姓名
+ */
+ private String realName;
+
+ /**
+ * 用户头像
+ */
+ private String faceImg;
+
+ /**
+ * 性别(0-女，1-男)
+ */
+ private String sex;
+
+ /**
+ * 出生日期
+ */
+ private Date birthday;
+
+ /**
+ * 手机号
+ */
+ private String mobile;
+
+ /**
+ * 用户当前积分
+ */
+ private Integer points;
+
+ /**
+ * 调整原因
+ */
+ private String adjustReason;
+
+ /**
+ * 积分操作类型（0：减；1：加）
+ */
+ private String operationType;
+
+ /**
+ * 积分调整值
+ */
+ private Integer operatePoints;
+
+ /**
+ * 积分调整类型编码
+ */
+ private String pointOperateTypeCode;
+
+ /**
+ * 积分调整类型名称
+ */
+ private String pointOperateTypeName;
+
+ /**
+ * 工作人员ID
+ */
+ private String workUserId;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 逻辑删除标识
+ */
+ private String delFlag;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
From 8cb6e4ba6aa4977f761b7d07e2dc741d72eb52a3 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 31 Mar 2022 15:41:33 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4?=
=?UTF-8?q?=E7=AE=A1=E7=90=86dto=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dto/PointsIntegralAdjustmentCheckDTO.java | 29 +++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java
index ffbec62..b46f8fe 100644
--- a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java
+++ b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java
@@ -23,7 +23,7 @@ import lombok.Data;
/**
- * 积分调整审核表
+ * 积分调整审核表
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-03-31
@@ -108,6 +108,31 @@ public class PointsIntegralAdjustmentCheckDTO implements Serializable {
*/
private String workUserId;
+ /**
+ * 工作人员姓名
+ */
+ private String workUserName;
+
+ /**
+ * 工作人员部门ID
+ */
+ private String workUserDeptId;
+
+ /**
+ * 工作人员部门名称
+ */
+ private String workUserDeptName;
+
+ /**
+ * 审核状态（1：未审核；2：通过；3：不通过）
+ */
+ private Integer state;
+
+ /**
+ * 审核意见
+ */
+ private String checkOpinion;
+
/**
* 乐观锁
*/
@@ -138,4 +163,4 @@ public class PointsIntegralAdjustmentCheckDTO implements Serializable {
*/
private Date updatedTime;
-}
\ No newline at end of file
+}
From 32231c4d9554f87c204828bdcb4c15eb2420fafb Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 31 Mar 2022 16:36:29 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4?=
=?UTF-8?q?=E7=AE=A1=E7=90=86dto=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java
index b46f8fe..410461c 100644
--- a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java
+++ b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java
@@ -62,6 +62,7 @@ public class PointsIntegralAdjustmentCheckDTO implements Serializable {
* 性别(0-女，1-男)
*/
private String sex;
+ private String sexName;
/**
* 出生日期
@@ -87,6 +88,7 @@ public class PointsIntegralAdjustmentCheckDTO implements Serializable {
* 积分操作类型（0：减；1：加）
*/
private String operationType;
+ private String operationTypeName;
/**
* 积分调整值
@@ -127,6 +129,7 @@ public class PointsIntegralAdjustmentCheckDTO implements Serializable {
* 审核状态（1：未审核；2：通过；3：不通过）
*/
private Integer state;
+ private String stateName;
/**
* 审核意见
From c09ef9872fe9c06389ddff0c5a90363f8fe8ae3e Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 1 Apr 2022 14:33:47 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4?=
=?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java
index 410461c..cfe8006 100644
--- a/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java
+++ b/epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java
@@ -46,7 +46,7 @@ public class PointsIntegralAdjustmentCheckDTO implements Serializable {
/**
* 用户昵称
*/
- private String nickName;
+ private String nickname;
/**
* 姓名
From 07fc4ac09712e5291fef56122a0fb7e892a60713 Mon Sep 17 00:00:00 2001
From: Jackwang
Date: Sat, 2 Apr 2022 16:40:19 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B8=85=E9=9B=B6?=
=?UTF-8?q?=E7=94=A8=E6=88=B7=E7=A7=AF=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../elink/esua/epdc/dto/ResetPointsDTO.java | 26 +++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/ResetPointsDTO.java
diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/ResetPointsDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/ResetPointsDTO.java
new file mode 100644
index 0000000..8d30476
--- /dev/null
+++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/ResetPointsDTO.java
@@ -0,0 +1,26 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: epdc-cloud-user-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2022-04-02 14:59
+ **/
+@Data
+public class ResetPointsDTO implements Serializable {
+
+ /**
+ * 社区id
+ */
+ private String communityId;
+
+ /**
+ * 需要清零的用户
+ */
+ private List userList;
+}
From 0ff6aa6a23370f79efb920f47993590634394fb9 Mon Sep 17 00:00:00 2001
From: Jackwang
Date: Wed, 6 Apr 2022 17:03:22 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=A7=AF=E5=88=86?=
=?UTF-8?q?=E5=88=97=E8=A1=A8;=E6=8C=89=E7=A4=BE=E5=8C=BA=E6=B8=85?=
=?UTF-8?q?=E7=A9=BA=E4=BA=BA=E5=91=98=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../esua/epdc/dto/CommunityPointsDTO.java | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/CommunityPointsDTO.java
diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/CommunityPointsDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/CommunityPointsDTO.java
new file mode 100644
index 0000000..786b6b5
--- /dev/null
+++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/CommunityPointsDTO.java
@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: epdc-cloud-user-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2022-04-06 14:30
+ **/
+@Data
+public class CommunityPointsDTO implements Serializable {
+
+
+ private String communityId;
+
+
+ private String communityName;
+
+
+ private String points;
+}
From 85e3bd913fad5d2f6c46e7620d97464544709f0c Mon Sep 17 00:00:00 2001
From: Jackwang
Date: Thu, 7 Apr 2022 10:23:27 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E7=99=BB=E8=AE=B0=E8=B4=A6?=
=?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/elink/esua/epdc/dto/PersonTestingPageDTO.java | 5 +++++
1 file changed, 5 insertions(+)
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 18ca3a8..5dea0a8 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
@@ -91,6 +91,11 @@ public class PersonTestingPageDTO implements Serializable {
*/
private String createdBy;
+ /**
+ * 创建人姓名
+ */
+ private String createdByName;
+
/**
* 创建时间
*/