From d131fd9581086e0aa9ad7d7dacdc015a228b1df0 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Sat, 6 May 2023 10:52:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=83=9F=E5=8F=B0=E9=9C=80=E6=B1=82=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/AddStaffV2FromDTO.java | 34 +++++++++++++++++++
 .../epmet/dto/form/StaffSubmitFromDTO.java    | 33 ++++++++++++++++++
 .../java/com/epmet/dto/CustomerStaffDTO.java  | 25 ++++++++++++++
 .../com/epmet/entity/CustomerStaffEntity.java | 28 +++++++++++++++
 .../impl/CustomerStaffServiceImpl.java        | 24 +++++++++++++
 5 files changed, 144 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java
index 7bc3b93076..4250c5ca61 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java
@@ -78,4 +78,38 @@ public class AddStaffV2FromDTO implements Serializable {
 	 * 烟台用：当前登录用户
 	 */
 	private String currentUserId;
+
+	/**
+	 * 烟台需求：党组织职务
+	 */
+	private String partyPosition;
+
+	/**
+	 * 烟台需求：村居委员职务
+	 */
+	private String viliagePosition;
+
+	/**
+	 * 烟台需求：工作职责
+	 */
+	private String duty;
+
+	/**
+	 * 烟台需求：备注
+	 */
+	private String remark;
+	/**
+	 * 文化程度
+	 */
+	private String culture;
+	/**
+	 * 身份证
+	 */
+	private String idCard;
+
+	/**
+	 * 居住地址
+	 */
+	private String address;
+
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java
index f39bde7aab..a3ecf0f06f 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java
@@ -74,4 +74,37 @@ public class StaffSubmitFromDTO implements Serializable {
 	 * 社会自组织:  community_org
 	 */
 	private String deptType;
+
+	/**
+	 * 烟台需求：党组织职务
+	 */
+	private String partyPosition;
+
+	/**
+	 * 烟台需求：村居委员职务
+	 */
+	private String viliagePosition;
+
+	/**
+	 * 烟台需求：工作职责
+	 */
+	private String duty;
+
+	/**
+	 * 烟台需求：备注
+	 */
+	private String remark;
+	/**
+	 * 文化程度
+	 */
+	private String culture;
+	/**
+	 * 身份证
+	 */
+	private String idCard;
+
+	/**
+	 * 居住地址
+	 */
+	private String address;
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java
index cd042877ab..fddf4fc83d 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java
@@ -150,4 +150,29 @@ public class CustomerStaffDTO implements Serializable {
 	 */
 	private String idCard;
 
+	/**
+	 * 烟台需求：党组织职务
+	 */
+	private String partyPosition;
+
+	/**
+	 * 烟台需求：村居委员职务
+	 */
+	private String viliagePosition;
+
+	/**
+	 * 烟台需求：工作职责
+	 */
+	private String duty;
+
+	/**
+	 * 烟台需求：备注
+	 */
+	private String remark;
+	/**
+	 * 文化程度
+	 */
+	private String culture;
+
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java
index aa19464f9e..3d26a85c76 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java
@@ -111,4 +111,32 @@ public class CustomerStaffEntity extends BaseEpmetEntity {
 	 * 身份证号
 	 */
 	private String idCard;
+
+
+	/**
+	 * 烟台需求：党组织职务
+	 */
+	private String partyPosition;
+
+	/**
+	 * 烟台需求：村居委员职务
+	 */
+	private String viliagePosition;
+
+	/**
+	 * 烟台需求：工作职责
+	 */
+	private String duty;
+
+	/**
+	 * 烟台需求：备注
+	 */
+	private String remark;
+	/**
+	 * 文化程度
+	 */
+	private String culture;
+
+
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index 1ff4560c99..0212da4168 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -370,6 +370,30 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         staffEntity.setWorkType(fromDTO.getWorkType());
         staffEntity.setEnableFlag(CustomerStaffConstant.ENABLE);
         staffEntity.setPassword(PasswordUtils.encode("12345678"));
+        if (StringUtils.isNotBlank(fromDTO.getRemark())){
+            staffEntity.setRemark(fromDTO.getRemark());
+        }
+        if (StringUtils.isNotBlank(fromDTO.getAddress())){
+            staffEntity.setAddress(fromDTO.getAddress());
+        }
+        if (StringUtils.isNotBlank(fromDTO.getPartyPosition())){
+            staffEntity.setPartyPosition(fromDTO.getPartyPosition());
+        }
+        if (StringUtils.isNotBlank(fromDTO.getViliagePosition())){
+            staffEntity.setViliagePosition(fromDTO.getViliagePosition());
+        }
+        if (StringUtils.isNotBlank(fromDTO.getDuty())){
+            staffEntity.setDelFlag(fromDTO.getDuty());
+        }
+        if (StringUtils.isNotBlank(fromDTO.getIdCard())){
+            staffEntity.setIdCard(fromDTO.getIdCard());
+        }
+        if (StringUtils.isNotBlank(fromDTO.getCulture())){
+            staffEntity.setCulture(fromDTO.getCulture());
+        }
+
+
+
         baseDao.insert(staffEntity);
 
         //工作人员角色关联表