灵山项目：增加工作人员信息，修改编辑工作人员错误的问题；

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

@@ -58,4 +58,14 @@ public class StaffsByOrgAndRoleRstDTO {
      */
     private String idCard;
 
+    /**
+     * 是否两委委员  0 否  1 是
+     */
+    private Integer member;
+    /**
+     * 是否调解员 0 否  1 是
+     */
+    private Integer mediator;
+
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/CustomerStaffEntity.java

@@ -102,4 +102,18 @@ public class CustomerStaffEntity extends BaseEpmetEntity {
      */
 	private String password;
 
+	/**
+	 * 是否两委委员  0 否  1 是
+	 */
+	private Integer member;
+	/**
+	 * 是否调解员 0 否  1 是
+	 */
+	private Integer mediator;
+
+	/**
+	 * 政治面貌
+	 */
+	private String political;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml

@@ -227,7 +227,9 @@
             cs.ADDRESS,
             cs.WORK_TYPE AS workType,
             cs.HEAD_PHOTO AS headPhoto
-            cs.ID_CARD AS idCard
+            cs.ID_CARD AS idCard,
+            cs.MEMBER,
+            cs.MEDIATOR
         FROM (
                 SELECT DISTINCT srr.STAFF_ID
                 FROM staff_role srr

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

@@ -109,8 +109,17 @@ public class StaffSubmitFromDTO implements Serializable {
 	 */
 	private String culture;
 
-	// /**
-	//  * 出生日期
-	//  */
-	// private Date birthday;
+	 /**
+	  * 出生日期
+	  */
+	 private Date birthday;
+
+	/**
+	 * 是否两委委员  0 否  1 是
+	 */
+	private Integer member;
+	/**
+	 * 是否调解员 0 否  1 是
+	 */
+	private Integer mediator;
 }

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

@@ -15,41 +15,81 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 public class StaffDetailResultDTO implements Serializable {
-	private static final long serialVersionUID = 1L;
-	/**
-	 * 人员ID
-	 */
-	private String staffId;
-	/**
-	 * 姓名
-	 */
-	private String name;
-	/**
-	 * 手机号
-	 */
-	private String mobile;
-	/**
-	 * 头像
-	 */
-	private String headPhoto;
-	/**
-	 * 激活状态：inactive未激活，active已激活
-	 */
-	private String activeFlag;
-	/**
-	 * 激活时间
-	 */
-	private Date activeTime;
-	/**
-	 * 性别
-	 */
-	private Integer gender;
-	/**
-	 * 是否禁用(未禁用enable,已禁用disabled)
-	 */
-	private String enableFlag;
+    private static final long serialVersionUID = 1L;
+    /**
+     * 人员ID
+     */
+    private String staffId;
+    /**
+     * 姓名
+     */
+    private String name;
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 头像
+     */
+    private String headPhoto;
+    /**
+     * 激活状态：inactive未激活，active已激活
+     */
+    private String activeFlag;
+    /**
+     * 激活时间
+     */
+    private Date activeTime;
+    /**
+     * 性别
+     */
+    private Integer gender;
+    /**
+     * 是否禁用(未禁用enable,已禁用disabled)
+     */
+    private String enableFlag;
+    /**
+     * 职责名称列表
+     */
+    private List<String> roles;
+
+    private String culture;
+
+    /**
+     * 是否两委委员  0 否  1 是
+     */
+    private Integer member;
+    /**
+     * 是否调解员 0 否  1 是
+     */
+    private Integer mediator;
+
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+    private Date birthday;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+
+    /**
+     * fulltime专职parttime兼职
+     */
+    private String workType;
+
+    /**
+     * 地址
+     */
+    private String address;
+
 	/**
-	 * 职责名称列表
+	 * 政治面貌
 	 */
-	private List<String> roles;
+	private String political;
+
 }

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

@@ -175,5 +175,19 @@ public class CustomerStaffDTO implements Serializable {
 	 */
 	private String culture;
 
+	/**
+	 * 是否两委委员  0 否  1 是
+	 */
+	private Integer member;
+	/**
+	 * 是否调解员 0 否  1 是
+	 */
+	private Integer mediator;
+
+	/**
+	 * 政治面貌
+	 */
+	private String political;
+
 
-}
+}

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

@@ -702,6 +702,13 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         resultDTO.setActiveFlag(customerStaffDTO.getActiveFlag());
         resultDTO.setActiveTime(customerStaffDTO.getActiveTime());
         resultDTO.setEnableFlag(customerStaffDTO.getEnableFlag());
+        resultDTO.setWorkType(customerStaffDTO.getWorkType());
+        resultDTO.setAddress(customerStaffDTO.getAddress());
+        resultDTO.setCulture(customerStaffDTO.getCulture());
+        resultDTO.setMember(customerStaffDTO.getMember());
+        resultDTO.setMediator(customerStaffDTO.getMediator());
+        resultDTO.setBirthday(customerStaffDTO.getBirthday());
+        resultDTO.setPolitical(customerStaffDTO.getPolitical());
 
         //获取工作人员角色
         List<GovStaffRoleEntity> staffRoles = govStaffRoleService.listRolesByStaffId(fromDTO.getStaffId(), fromDTO.getAgencyId());

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -146,7 +146,6 @@
             customer_staff
         WHERE
             DEL_FLAG = '0'
-          AND CUSTOMER_ID = #{customerId}
           AND USER_ID = #{staffId}
     </select>
     <select id="selectDepartmentStaffList" resultType="com.epmet.dto.result.DepartInStaffListResultDTO">