diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
index 3d5d9d588..8f2381470 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
@@ -67,6 +67,18 @@ public class SysDeptDTO extends TreeNode implements Serializable {
*/
private String partyCode;
+ @ApiModelProperty(value = "地址")
+ private String address;
+
+ @ApiModelProperty(value = "联系方式")
+ private String mobile;
+
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+
public String getPartyCode() {
return partyCode;
}
@@ -134,4 +146,36 @@ public class SysDeptDTO extends TreeNode implements Serializable {
public void setPid(Long pid) {
this.pid = pid;
}
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public String getMobile() {
+ return mobile;
+ }
+
+ public void setMobile(String mobile) {
+ this.mobile = mobile;
+ }
+
+ public String getLongitude() {
+ return longitude;
+ }
+
+ public void setLongitude(String longitude) {
+ this.longitude = longitude;
+ }
+
+ public String getLatitude() {
+ return latitude;
+ }
+
+ public void setLatitude(String latitude) {
+ this.latitude = latitude;
+ }
}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
index 5e90ca0f5..336b07de3 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -79,4 +80,24 @@ public class SysDeptEntity extends BaseEntity {
*/
private String partyCode;
+ /**
+ * 地址
+ */
+ private String address;
+
+ /**
+ * 联系方式
+ */
+ private String mobile;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml
index 608a988a4..045e510a2 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml
@@ -8,9 +8,9 @@ spring:
datasource:
druid:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://epdc-shibei.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: epdc
- password: Elink@833066
+ url: jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: root
+ password: Abc@123456
#Oracle
# driver-class-name: oracle.jdbc.OracleDriver
# url: jdbc:oracle:thin:@localhost:1521:xe
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
index 958359548..f0fb3a28b 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
@@ -165,15 +165,15 @@
9065
2
- 47.104.224.45
- 6379
- elink@888
+ 118.190.232.100
+ 9603
+ epdc!redis@master1405
-
+
- epdc
- elink833066
+ root
+ Abc@123456
false
47.104.224.45:8848
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
index aedb8e61d..eb6eaac27 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
@@ -106,4 +106,39 @@ public class PartyMembersDTO implements Serializable {
*/
private String allDeptIdsStr;
+ /**
+ * 入党时间
+ */
+ private Date joinDate;
+ /**
+ * 职务(字典项)
+ */
+ private String position;
+
+ /**
+ * 职务名称
+ */
+ private String positionName;
+ /**
+ * 是否是流动性党员 0否1是
+ */
+ private String isMobility;
+ /**
+ * 流动党员证号
+ */
+ private String mobilityNum;
+ /**
+ * 文化程度(字典项)
+ */
+ private String education;
+ /**
+ * 备注
+ */
+ private String note;
+
+ /**
+ * 地址
+ */
+ private String address;
+
}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
index 71efb5180..b242a2a9b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
@@ -139,21 +139,21 @@
9068
2
- 47.104.224.45
- 6379
- elink@888
+ 118.190.232.100
+ 9603
+ epdc!redis@master1405
-
+
- epdc
- Elink@833066
+ root
+ Abc@123456
-
+
- epdc
- Elink@833066
+ root
+ Abc@123456
false
47.104.224.45:8848
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java
index 5fe55571d..c11e6a84f 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java
@@ -87,4 +87,39 @@ public class PartyMembersEntity extends DeptScope {
*/
private String partyOrganization;
+ /**
+ * 入党时间
+ */
+ private Date joinDate;
+ /**
+ * 职务(字典项)
+ */
+ private String position;
+ /**
+ * 职务名称
+ */
+ private String positionName;
+ /**
+ * 是否是流动性党员 0否1是
+ */
+ private String isMobility;
+ /**
+ * 流动党员证号
+ */
+ private String mobilityNum;
+ /**
+ * 文化程度(字典项)
+ */
+ private String education;
+ /**
+ * 备注
+ */
+ private String note;
+
+ /**
+ * 地址
+ */
+ private String address;
+
+
}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
index 479241af6..33de2bdaa 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
@@ -195,6 +195,14 @@ public class PartyMembersServiceImpl extends BaseServiceImpl parentResult = null;
if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);