Merge remote-tracking branch 'origin/master'

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysPropertyUserDTO.java

@@ -0,0 +1,61 @@
+/**
+ * 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 qu qu@elink-cn.com
+ * @since v1.0.0 2021-09-10
+ */
+@Data
+public class SysPropertyUserDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+	private Long id;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 业务项目id
+     */
+	private String projectId;
+
+    /**
+     * 创建者
+     */
+	private String creator;
+
+    /**
+     * 创建日期
+     */
+	private Date createDate;
+
+}

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java

@@ -60,6 +60,9 @@ public class SysUserDTO implements Serializable {
     @ApiModelProperty(value = "箴言")
     private String proverbs;
 
+    @ApiModelProperty(value = "物业Id")
+    private String projectId;
+
     @ApiModelProperty(value = "性别   0：男   1：女    2：保密", required = true)
     @Range(min = 0, max = 2, message = "{sysuser.gender.range}", groups = DefaultGroup.class)
     private Integer gender;

epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenItemListResultDTO.java

@@ -31,4 +31,9 @@ public class EpdcScreenItemListResultDTO implements Serializable {
      * 经度
      */
     private String issueLongitude;
+
+    /**
+     * 项目状态：0-处理中，5-已关闭，10-已结案
+     */
+    private Integer itemState;
 }

epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/suggestion/SuggestionTypeDTO.java

@@ -18,8 +18,14 @@
 package com.elink.esua.epdc.dto.suggestion;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
+
+import com.elink.esua.epdc.commons.tools.utils.TreeNode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.poi.ss.formula.functions.T;
 
 
 /**
@@ -93,4 +99,13 @@ public class SuggestionTypeDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 上级部门名称
+     */
+    private String parentName;
+
+    /**
+     * 子节点列表
+     */
+    private List<SuggestionTypeDTO> children = new ArrayList<>();
 }