--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/bg/omember/controller/OrganMemberController.java

 package com.zrqx.member.bg.omember.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 
+
+
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,21 +23,35 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+
+
+
+import com.github.pagehelper.PageHelper;
 import com.zrqx.core.constant.member.MemberRequestPath;
 import com.zrqx.core.enums.ResponseCodeEnum;
+import com.zrqx.core.enums.sysuser.member.MemberStatusEnum;
+import com.zrqx.core.enums.sysuser.organmember.OMType;
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.exception.ParameterValidateException;
 import com.zrqx.core.form.member.bg.omember.QueryOrganMemberForm;
 import com.zrqx.core.model.member.Member;
+import com.zrqx.core.util.bean.BeanUtils;
+import com.zrqx.core.util.bean.Copy;
 import com.zrqx.core.util.encry.MD5Util;
+import com.zrqx.core.util.excelutil.ExcelUtil;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
+import com.zrqx.core.vo.member.bg.member.ExportOrganMemberListVO;
+import com.zrqx.core.vo.member.bg.member.LoginLogListVO;
 import com.zrqx.core.vo.member.bg.member.OrganMemberListVO;
 import com.zrqx.core.vo.member.bg.member.OrganMemberVO;
 import com.zrqx.member.bg.member.service.MemberService;
 import com.zrqx.member.bg.omember.service.OrganMemberService;
 
+
+
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import tk.mybatis.mapper.entity.Example;
@@ -74,4 +98,19 @@ public class OrganMemberController {
 		}
 		return CallBack.success(service.page(form, pageParam));
 	}
+	@ApiOperation(value = "导出机构会员信息", notes = "导出机构会员信息")
+	@GetMapping(value = MemberRequestPath.EXPORT)
+	public void exportOrganMember(QueryOrganMemberForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		PageInfo<OrganMemberListVO> page = service.page(form, null);
+		List<ExportOrganMemberListVO> voList = new ArrayList<ExportOrganMemberListVO>();
+		page.getList().stream().forEach(li -> {
+			ExportOrganMemberListVO vo = new ExportOrganMemberListVO();
+			BeanUtils.copyProperties(li, vo);
+			vo.setStatus_zh(MemberStatusEnum.getDescription(li.getStatus()));
+			vo.setType_zh(OMType.getValue(li.getType()));
+			voList.add(vo);
+		});
+		
+		ExcelUtil.getInstance().exportExcel(voList, ExportOrganMemberListVO.class, "机构会员信息表.xls", response, request);
+	}
 }

com.zrqx.member/src/main/java/com/zrqx/member/bg/omember/service/OrganMemberServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.github.pagehelper.PageHelper;
 import com.zrqx.core.form.member.bg.omember.QueryOrganMemberForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.OrganMember;
@@ -29,7 +30,11 @@ public class OrganMemberServiceImpl extends BaseServiceImpl<OrganMember,Integer>
 	}
 	@Override
 	public PageInfo<OrganMemberListVO> page(QueryOrganMemberForm form, PageParam pageParam) {
-		startPage(pageParam);
+		if(pageParam != null){
+			startPage(pageParam);
+		}else{
+			PageHelper.orderBy("createTime desc");
+		}
 		List<OrganMemberListVO> list = mapper.page(form);
 		return new PageInfo<OrganMemberListVO>(list);
 	}