From c4c47f2888494e6f7a080c3afd8500562db1883a Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Wed, 15 Sep 2021 15:29:45 +0800 Subject: [PATCH 1/3] 1 --- .../epdc/dto/suggestion/SuggestionTypeDTO.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/suggestion/SuggestionTypeDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/suggestion/SuggestionTypeDTO.java index 1b2288a..4445280 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/suggestion/SuggestionTypeDTO.java +++ b/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 children = new ArrayList<>(); } From 075acc4d5ff14abccaa41821cf5503c3bcf5e834 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 15 Sep 2021 16:11:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=A7=E5=B1=8F-=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E6=B2=BB=E7=90=86-=E5=9C=B0=E5=9B=BE=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E9=A1=B9=E7=9B=AE=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pc/screen/result/EpdcScreenItemListResultDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenItemListResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenItemListResultDTO.java index 28a936c..dffda50 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenItemListResultDTO.java +++ b/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; } From 57ab135c26f287bbfba92f6c16ef5020d2d68b56 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Wed, 15 Sep 2021 17:24:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E5=A4=A7=E5=B1=8F=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=A9=E4=B8=9A=E7=94=A8=E6=88=B7=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=20admin=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/SysPropertyUserDTO.java | 61 +++++++++++++++++++ .../com/elink/esua/epdc/dto/SysUserDTO.java | 3 + 2 files changed, 64 insertions(+) create mode 100644 epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysPropertyUserDTO.java diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysPropertyUserDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysPropertyUserDTO.java new file mode 100644 index 0000000..b73f73f --- /dev/null +++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysPropertyUserDTO.java @@ -0,0 +1,61 @@ +/** + * 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 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; + +} \ No newline at end of file diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java index d447952..5b1f702 100644 --- a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java +++ b/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;