Merge branch 'yantai_zhengwu_master' into dev

# Conflicts:
#	epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java
#	epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java

@@ -134,8 +134,40 @@ public class CustomerStaffDTO implements Serializable {
      */
 	private String password;
 
-    private String idCard;
+    /**
+     * 烟台用：当前登录用户
+     */
+    private String currentUserId;
+
+    /**
+     * 烟台需求：党组织职务
+     */
+    private String partyPosition;
+
+    /**
+     * 烟台需求：村居委员职务
+     */
+    private String viliagePosition;
+
+    /**
+     * 烟台需求：工作职责
+     */
+    private String duty;
+
+    /**
+     * 烟台需求：备注
+     */
+    private String remark;
+    /**
+     * 文化程度
+     */
     private String culture;
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+
     private Date birthday;
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java

@@ -49,7 +49,30 @@ public class StaffDetailV2FormDTO implements Serializable {
     private List<String> szsqRoles;
     private String customerId;
 
-    private String idCard;
+    /**
+     * 烟台用：当前登录用户
+     */
+    private String currentUserId;
+
+    /**
+     * 烟台需求：党组织职务
+     */
+    private String partyPosition;
+
+    /**
+     * 烟台需求：村居委员职务
+     */
+    private String viliagePosition;
+
+    /**
+     * 烟台需求：工作职责
+     */
+    private String duty;
+
+    /**
+     * 烟台需求：备注
+     */
+    private String remark;
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
     /**
@@ -57,6 +80,15 @@ public class StaffDetailV2FormDTO implements Serializable {
      */
     private String culture;
     /**
+     * 身份证
+     */
+    private String idCard;
+
+    /**
+     * 居住地址
+     */
+    private String address;
+
      * 文化程度，中文
      */
     private String cultureDisplay;

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java

@@ -58,8 +58,34 @@ public class StaffInitResultDTO implements Serializable {
 	 */
 	private String agencyName;
 
+
+	/**
+	 * 烟台需求：党组织职务
+	 */
+	private String partyPosition;
+
+	/**
+	 * 烟台需求：村居委员职务
+	 */
+	private String viliagePosition;
+
+	/**
+	 * 烟台需求：工作职责
+	 */
+	private String duty;
+
+	/**
+	 * 烟台需求：备注
+	 */
+	private String remark;
+	/**
+	 * 文化程度
+	 */
 	private String culture;
 
+	private String address;
+
+
 	private String cultureDisplay;
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date birthday;

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

@@ -308,6 +308,12 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         resultDTO.setWorkType(customerStaffDTO.getWorkType());
         resultDTO.setIdCard(customerStaffDTO.getIdCard());
         resultDTO.setCustomerId(customerStaffDTO.getCustomerId());
+        resultDTO.setCulture(customerStaffDTO.getCulture());
+        resultDTO.setDuty(customerStaffDTO.getDuty());
+        resultDTO.setPartyPosition(customerStaffDTO.getPartyPosition());
+        resultDTO.setViliagePosition(customerStaffDTO.getViliagePosition());
+        resultDTO.setRemark(customerStaffDTO.getRemark());
+        resultDTO.setAddress(customerStaffDTO.getAddress());
         //获取角色列表
         GovStaffRoleDTO govStaffRoleDTO = new GovStaffRoleDTO();
         govStaffRoleDTO.setCustomerId(fromDTO.getCustomerId());
@@ -527,14 +533,17 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         staffEntity.setMobile(fromDTO.getMobile());
         staffEntity.setGender(fromDTO.getGender());
         staffEntity.setWorkType(fromDTO.getWorkType());
-        staffEntity.setCulture(fromDTO.getCulture());
+        staffEntity.setIdCard(customerStaffDTO.getIdCard());
-        staffEntity.setIdCard(fromDTO.getIdCard());
+        staffEntity.setCulture(customerStaffDTO.getCulture());
-
+        staffEntity.setDuty(customerStaffDTO.getDuty());
+        staffEntity.setPartyPosition(customerStaffDTO.getPartyPosition());
+        staffEntity.setViliagePosition(customerStaffDTO.getViliagePosition());
+        staffEntity.setRemark(customerStaffDTO.getRemark());
+        staffEntity.setAddress(customerStaffDTO.getAddress());
         if (StringUtils.isNotBlank(fromDTO.getIdCard())) {
             LocalDate birthday = IdCardRegexUtils.parse(fromDTO.getIdCard()).getParsedResult().getBirthday();
             staffEntity.setBirthday(DateUtils.localDate2Date(birthday));
         }
-        staffEntity.setCulture(fromDTO.getCulture());
         baseDao.updateById(staffEntity);
 
         //清空权限关联