Merge branch 'yantai_zhengwu_master' into dev

# Conflicts:
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java

@@ -80,9 +80,36 @@ public class AddStaffV2FromDTO implements Serializable {
 	private String currentUserId;
 
 	/**
-	 * 文化程度。0小学及文盲,1初中,2高中,3大专,4本科,5硕士,6博士,7中专
+	 * 烟台需求：党组织职务
 	 */
-	private String culture;
+	private String partyPosition;
 
+	/**
+	 * 烟台需求：村居委员职务
+	 */
+	private String viliagePosition;
+
+	/**
+	 * 烟台需求：工作职责
+	 */
+	private String duty;
+
+	/**
+	 * 烟台需求：备注
+	 */
+	private String remark;
+	/**
+	 * 文化程度
+	 */
+	private String culture;
+	/**
+	 * 身份证
+	 */
 	private String idCard;
+
+	/**
+	 * 居住地址
+	 */
+	private String address;
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java

@@ -76,8 +76,34 @@ public class StaffSubmitFromDTO implements Serializable {
 	 */
 	private String deptType;
 
+	/**
+	 * 烟台需求：党组织职务
+	 */
+	private String partyPosition;
+
+	/**
+	 * 烟台需求：村居委员职务
+	 */
+	private String viliagePosition;
+
+	/**
+	 * 烟台需求：工作职责
+	 */
+	private String duty;
+
+	/**
+	 * 烟台需求：备注
+	 */
+	private String remark;
+	/**
+	 * 身份证
+	 */
 	private String idCard;
 
+	/**
+	 * 居住地址
+	 */
+	private String address;
 	/**
 	 * 文化程度。0小学及文盲,1初中,2高中,3大专,4本科,5硕士,6博士,7中专
 	 */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java

@@ -152,4 +152,29 @@ public class CustomerStaffDTO implements Serializable {
 	private String culture;
 	private Date birthday;
 
+	/**
+	 * 烟台需求：党组织职务
+	 */
+	private String partyPosition;
+
+	/**
+	 * 烟台需求：村居委员职务
+	 */
+	private String viliagePosition;
+
+	/**
+	 * 烟台需求：工作职责
+	 */
+	private String duty;
+
+	/**
+	 * 烟台需求：备注
+	 */
+	private String remark;
+	/**
+	 * 文化程度
+	 */
+	private String culture;
+
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java

@@ -112,13 +112,33 @@ public class CustomerStaffEntity extends BaseEpmetEntity {
 	 */
 	private String idCard;
 
+
 	/**
-	 * 出生日期
+	 * 烟台需求：党组织职务
 	 */
-	private Date birthday;
+	private String partyPosition;
+
+	/**
+	 * 烟台需求：村居委员职务
+	 */
+	private String viliagePosition;
+
+	/**
+	 * 烟台需求：工作职责
+	 */
+	private String duty;
 
 	/**
-	 * 文化程度。0小学及文盲,1初中,2高中,3大专,4本科,5硕士,6博士,7中专
+	 * 烟台需求：备注
+	 */
+	private String remark;
+	/**
+	 * 文化程度
 	 */
 	private String culture;
+
+	/**
+	 * 出生日期
+	 */
+	private Date birthday;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -388,14 +388,31 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         staffEntity.setWorkType(fromDTO.getWorkType());
         staffEntity.setEnableFlag(CustomerStaffConstant.ENABLE);
         staffEntity.setPassword(PasswordUtils.encode("12345678"));
-        staffEntity.setIdCard(fromDTO.getIdCard());
+        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());
+        }
         if (StringUtils.isNotBlank(fromDTO.getIdCard())) {
             LocalDate birthday = IdCardRegexUtils.parse(fromDTO.getIdCard()).getParsedResult().getBirthday();
             staffEntity.setBirthday(DateUtils.localDate2Date(birthday));
         }
-
-        staffEntity.setCulture(fromDTO.getCulture());
         baseDao.insert(staffEntity);
 
         //工作人员角色关联表