Merge remote-tracking branch 'origin/master'

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;
+
     /**
      * 创建时间
      */

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsAdjustmentTypeDTO.java

@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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;
+
+}

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsIntegralAdjustmentCheckDTO.java

@@ -0,0 +1,169 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 String sexName;
+
+    /**
+     * 出生日期
+     */
+	private Date birthday;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 用户当前积分
+     */
+	private Integer points;
+
+    /**
+     * 调整原因
+     */
+	private String adjustReason;
+
+    /**
+     * 积分操作类型（0：减；1：加）
+     */
+	private String operationType;
+    private String operationTypeName;
+
+    /**
+     * 积分调整值
+     */
+	private Integer operatePoints;
+
+    /**
+     * 积分调整类型编码
+     */
+	private String pointOperateTypeCode;
+
+    /**
+     * 积分调整类型名称
+     */
+	private String pointOperateTypeName;
+
+    /**
+     * 工作人员ID
+     */
+	private String workUserId;
+
+    /**
+     * 工作人员姓名
+     */
+    private String workUserName;
+
+    /**
+     * 工作人员部门ID
+     */
+    private String workUserDeptId;
+
+    /**
+     * 工作人员部门名称
+     */
+    private String workUserDeptName;
+
+    /**
+     * 审核状态（1：未审核；2：通过；3：不通过）
+     */
+    private Integer state;
+    private String stateName;
+
+    /**
+     * 审核意见
+     */
+    private String checkOpinion;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 逻辑删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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;
 }

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;
 
-}
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 用户真实姓名
+     */
+    private String realName;
+
+}

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;
+}

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<UserDTO> userList;
+}