好办导出新增字段

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -518,6 +518,11 @@ public class StaffController extends WebBaseController {
             vo.setPosition(staffDTO.getPostion());
             vo.setDepartmentName(departmentMap.get(staffDTO.getDepartmentIds()) == null ? null : departmentMap.get(staffDTO.getDepartmentIds()).getDepartmentName());
             vo.setRelationFlag((Objects.isNull(staffDTO.getRelationFlag()) || staffDTO.getRelationFlag() == 0) ? "未关联" : "已关联");
+            vo.setWxUserId(staffDTO.getWxUserId());
+            vo.setWxOpenUseId(staffDTO.getWxOpenUseId());
+            vo.setActiveTime(staffDTO.getActiveTime() == null ? null : DateUtil.dateToStr(staffDTO.getActiveTime(),DateUtil.FORMAT_DATETIME_19));
+            vo.setExpireTime(staffDTO.getExpireTime() == null ? null : DateUtil.dateToStr(staffDTO.getExpireTime(),DateUtil.FORMAT_DATETIME_19));
+            vo.setPermitState(staffDTO.getPermitState());
             if (flag){
                 List<String> enterpriseNameList = staffDTO.getEnterpriseNameList();
                 if (CollUtil.isNotEmpty(enterpriseNameList)){
@@ -537,14 +542,24 @@ public class StaffController extends WebBaseController {
         }
         mergeClerkInfo(voList, wxEnterpriseId);
         String fileName = wxEnterpriseName + "通讯录" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATE_8);
-        List<String> titleList =new ArrayList<>();
-        List<String> fileList = new ArrayList<>();
+        List<String> titleList =Arrays.asList("姓名", "职务", "部门", "手机号", "关联状态", "关联导购");
+        List<String> fileList = Arrays.asList("staffName", "position", "departmentName", "phoneNumber", "relationFlag", "clerkName");
         if (flag){
-            titleList = Arrays.asList("姓名", "职务", "部门", "手机号", "关联状态", "关联导购","所属商户");
-            fileList = Arrays.asList("staffName", "position", "departmentName", "phoneNumber", "relationFlag", "clerkName","enterpriseName");
-        }else {
-            titleList = Arrays.asList("姓名", "职务", "部门", "手机号", "关联状态", "关联导购");
-            fileList = Arrays.asList("staffName", "position", "departmentName", "phoneNumber", "relationFlag", "clerkName");
+            titleList.add("所属商户");
+            fileList.add("enterpriseName");
+        }
+        //针对未升级好办独立应用的企业，导出表格增加导出字段：成员明文userid、成员加密userid、许可状态、许可激活时间、许可到期时间
+        if(enterprise != null && enterprise.getWxSecurityType() != 5){
+            titleList.add("成员明文userid");
+            titleList.add("成员加密userid");
+            titleList.add("许可状态");
+            titleList.add("许可激活时间");
+            titleList.add("许可到期时间");
+            fileList.add("wxUserId");
+            fileList.add("wxOpenUseId");
+            fileList.add("status");
+            fileList.add("activeTime");
+            fileList.add("expireTime");
         }
         try {
             ExcelUtils.xls(response, request, fileName, voList, fileList, titleList);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/StaffExportVO.java

@@ -31,6 +31,87 @@ public class StaffExportVO implements Serializable{
 	 * gic品牌名称
 	 */
 	private String enterpriseName;
+	/**
+	 * 微信用户id
+	 */
+	private String wxUserId;
+	/**
+	 * 微信用户加密id
+	 */
+	private String wxOpenUseId;
+	/**
+	 * 许可激活时间
+	 */
+	private String activeTime;
+	/**
+	 * 许可过期时间
+	 */
+	private String expireTime;
+	/**
+	 * 许可状态  0 未激活，1 正常有效，2 即将过期，3 已过期
+	 */
+	private Integer permitState;
+	/**
+	 * 许可状态  0 未激活，1 正常有效，2 即将过期，3 已过期
+	 */
+	private String status;
+
+	public Integer getPermitState() {
+		return permitState;
+	}
+
+	public void setPermitState(Integer permitState) {
+		this.permitState = permitState;
+	}
+
+	public String getStatus() {
+		if (this.permitState == 0){
+			status = "未激活";
+		}else if (this.permitState == 1){
+			status = "正常有效";
+		}else if (this.permitState == 2){
+			status = "即将过期";
+		}else if (this.permitState == 3){
+			status = "已过期";
+		}
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getWxUserId() {
+		return wxUserId;
+	}
+
+	public void setWxUserId(String wxUserId) {
+		this.wxUserId = wxUserId;
+	}
+
+	public String getWxOpenUseId() {
+		return wxOpenUseId;
+	}
+
+	public void setWxOpenUseId(String wxOpenUseId) {
+		this.wxOpenUseId = wxOpenUseId;
+	}
+
+	public String getActiveTime() {
+		return activeTime;
+	}
+
+	public void setActiveTime(String activeTime) {
+		this.activeTime = activeTime;
+	}
+
+	public String getExpireTime() {
+		return expireTime;
+	}
+
+	public void setExpireTime(String expireTime) {
+		this.expireTime = expireTime;
+	}
 
 	public String getEnterpriseName() {
 		return enterpriseName;