--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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
 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,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import tk.mybatis.mapper.entity.Example;
+
 import com.zrqx.core.constant.member.MemberRequestPath;
 import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.exception.BaseException;
@@ -20,17 +28,15 @@ 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.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.OrganMemberListVO;
 import com.zrqx.core.vo.member.bg.member.OrganMemberVO;
+import com.zrqx.core.vo.member.bg.organ.ExcelOrganMemberExportVo;
 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;
 /**
  * 机构用户信息 Controller
  */
@@ -74,4 +80,31 @@ public class OrganMemberController {
 		}
 		return CallBack.success(service.page(form, pageParam));
 	}
+	@ApiOperation("导出机构会员信息Excel")
+	@GetMapping(MemberRequestPath.EXPORT)
+	public CallBack<?> exportOrganMember(QueryOrganMemberForm query, HttpServletRequest request,
+			HttpServletResponse response) {
+		// 查询条件 query
+		List<ExcelOrganMemberExportVo> list = service.importOrganMember(query);
+		for (ExcelOrganMemberExportVo excelMemberExportVo : list) {
+			if("0".equals(excelMemberExportVo.getStatus())){
+				excelMemberExportVo.setStatus("禁用");
+			}else{
+				excelMemberExportVo.setStatus("启用");
+			}
+			if("1".equals(excelMemberExportVo.getType())){
+				excelMemberExportVo.setType("正式");
+			}else{
+				excelMemberExportVo.setType("试用");
+			}
+		}
+		try {
+			ExcelUtil.getInstance().exportExcel(list, ExcelOrganMemberExportVo.class,
+					"机构用户信息.xlsx", response, request);
+		} catch (Exception e) {
+			return CallBack.fail(e.getMessage());
+		}
+		return CallBack.success();
+	}
+	
 }

com.zrqx.member/src/main/java/com/zrqx/member/bg/omember/mapper/OrganMemberMapper.java

@@ -9,6 +9,7 @@ import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.OrganMember;
 import com.zrqx.core.vo.member.bg.member.OrganMemberListVO;
 import com.zrqx.core.vo.member.bg.member.OrganMemberVO;
+import com.zrqx.core.vo.member.bg.organ.ExcelOrganMemberExportVo;
 
 public interface OrganMemberMapper extends BaseMapper<OrganMember>{
 	@Select("select m.id,account,status,name,type,m.createTime,endTime,relatedResourceTypes from m_Member m "
@@ -48,4 +49,40 @@ public interface OrganMemberMapper extends BaseMapper<OrganMember>{
 			+ "</if>"
 			+ "</script>")
 	public List<OrganMemberListVO> page(QueryOrganMemberForm form);
+	
+	/**
+	 * 导出机构会员信息
+	 * @param query
+	 * @return
+	 */
+	@Select("<script> SELECT m.id,m.account,m.status,o.name,o.type,m.createTime,o.endTime from m_Organ_Member om "
+			+ "left join m_member m "
+			+ "on m.id = om.id "
+			+ "left join m_Organ o "
+			+ "on om.oid = o.id "
+			+ " where  status != 2"
+			+ "<if test = '"+NOTBLANK+"(account)' >"
+			+ " and m.account like concat(#{account},'%') "
+			+ "</if>"
+			+ "<if test = '"+NOTBLANK+"(name)' >"
+			+ " and o.name like concat(#{name},'%') "
+			+ "</if>"
+			+ "<if test = 'status != null' >"
+			+ " and m.status = #{status} "
+			+ "</if>"
+			+ "<if test = 'type != null' >"
+			+ " and o.type = #{type} "
+			+ "</if>"
+			+ "<if test = '"+NOTBLANK+"(beginTime)' >"
+			+ "<![CDATA["
+			+ " and date_format(m.createTime,'%Y-%m-%d') >= #{beginTime} "
+			+ "]]>"
+			+ "</if>"
+			+ "<if test = '"+NOTBLANK+"(endTime)' >"
+			+ "<![CDATA["
+			+ " and date_format(m.createTime,'%Y-%m-%d') <= #{endTime} "
+			+ "]]>"
+			+ "</if>"
+			+ "</script>")
+	public List<ExcelOrganMemberExportVo> list(QueryOrganMemberForm query);
 }

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

 package com.zrqx.member.bg.omember.service;
 
+import java.util.List;
+
 import com.zrqx.core.form.member.bg.omember.QueryOrganMemberForm;
 import com.zrqx.core.model.member.OrganMember;
 import com.zrqx.core.service.BaseService;
@@ -7,8 +9,10 @@ import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.member.bg.member.OrganMemberListVO;
 import com.zrqx.core.vo.member.bg.member.OrganMemberVO;
+import com.zrqx.core.vo.member.bg.organ.ExcelOrganMemberExportVo;
 
 public interface OrganMemberService extends BaseService<OrganMember, Integer> {
 	OrganMemberVO getById(Integer id);
 	PageInfo<OrganMemberListVO> page(QueryOrganMemberForm form,PageParam pageParam);
+	List<ExcelOrganMemberExportVo> importOrganMember(QueryOrganMemberForm query);
 }

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

@@ -13,6 +13,7 @@ import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.member.bg.member.OrganMemberListVO;
 import com.zrqx.core.vo.member.bg.member.OrganMemberVO;
+import com.zrqx.core.vo.member.bg.organ.ExcelOrganMemberExportVo;
 import com.zrqx.member.bg.omember.mapper.OrganMemberMapper;
 
 @Service
@@ -33,5 +34,12 @@ public class OrganMemberServiceImpl extends BaseServiceImpl<OrganMember,Integer>
 		List<OrganMemberListVO> list = mapper.page(form);
 		return new PageInfo<OrganMemberListVO>(list);
 	}
-
+	/**
+	 * 导出机构会员信息
+	 */
+	@Override
+	public List<ExcelOrganMemberExportVo> importOrganMember(
+			QueryOrganMemberForm query) {
+		return mapper.list(query);
+	}
 }