【fix】：成员导出新增参数，修改导出数据

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

@@ -475,7 +475,7 @@ public class StaffController extends WebBaseController {
      * @Description 会员导出
      */
     @RequestMapping("staff-export")
-    public HaobanResponse staffExport(HttpServletRequest request, HttpServletResponse response, String departmentId, Integer activeFlag, String keyWord, BasePageInfo pageInfo) {
+    public HaobanResponse staffExport(HttpServletRequest request, HttpServletResponse response, String departmentId, Integer activeFlag, Integer relationFlag, String keyWord, BasePageInfo pageInfo) {
         pageInfo.setPageSize(Integer.MAX_VALUE);
         List<String> departmentIdSet = new ArrayList<>();
         departmentIdSet.add(departmentId);
@@ -484,7 +484,7 @@ public class StaffController extends WebBaseController {
         List<DepartmentDTO> relationList = departmentApiService.listSonByDepartmentIds(departmentIdSet, wxEnterpriseId);
         Map<String, DepartmentDTO> departmentMap = relationList.stream().collect(Collectors.toMap(DepartmentDTO::getDepartmentId, s -> s));
         List<String> departmentIds = relationList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
-        Page<StaffDTO> page = staffApiService.pageStaff(departmentIds, activeFlag, keyWord, pageInfo, null);
+        Page<StaffDTO> page = staffApiService.pageStaff(departmentIds, activeFlag, keyWord, pageInfo, relationFlag);
         List<StaffDTO> list = page.getResult();
         List<StaffExportVO> voList = new ArrayList<>();
         for (StaffDTO staffDTO : list) {
@@ -494,7 +494,7 @@ public class StaffController extends WebBaseController {
             vo.setStaffName(staffDTO.getStaffName());
             vo.setPosition(staffDTO.getPostion());
             vo.setDepartmentName(departmentMap.get(staffDTO.getDepartmentIds()) == null ? null : departmentMap.get(staffDTO.getDepartmentIds()).getDepartmentName());
-            vo.setActiveFlag((staffDTO.getActiveFlag() == null || staffDTO.getActiveFlag() == 0) ? "否" : "是");
+            vo.setRelationFlag((Objects.isNull(staffDTO.getRelationFlag()) || staffDTO.getRelationFlag() == 0) ? "未关联" : "已关联");
             voList.add(vo);
         }
         //拼接导购信息
@@ -505,8 +505,8 @@ public class StaffController extends WebBaseController {
         }
         mergeClerkInfo(voList, wxEnterpriseId);
         String fileName = wxEnterpriseName + "通讯录" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATE_8);
-        List<String> titleList = Arrays.asList("姓名", "职务", "部门", "手机号", "使用状态", "关联导购");
-        List<String> fileList = Arrays.asList("staffName", "position", "departmentName", "phoneNumber", "activeFlag", "clerkName");
+        List<String> titleList = Arrays.asList("姓名", "职务", "部门", "手机号", "关联状态", "关联导购");
+        List<String> fileList = Arrays.asList("staffName", "position", "departmentName", "phoneNumber", "relationFlag", "clerkName");
         try {
             ExcelUtils.xls(response, request, fileName, voList, fileList, titleList);
         } catch (Exception e) {

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

@@ -22,6 +22,12 @@ public class StaffExportVO implements Serializable{
 
 	private String clerkName;
 
+	/**
+	 * 关联状态 1 已关联 0 未关联
+	 * 关联状态为 员工是否关联某门店导购
+	 */
+	private String relationFlag;
+
 	public String getActiveFlag() {
 		return activeFlag;
 	}
@@ -87,5 +93,11 @@ public class StaffExportVO implements Serializable{
 		this.clerkName = clerkName;
 	}
 
+	public String getRelationFlag() {
+		return relationFlag;
+	}
 
+	public void setRelationFlag(String relationFlag) {
+		this.relationFlag = relationFlag;
+	}
 }