--no commit message

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/controller/message/MessageRecordController.java

@@ -18,6 +18,7 @@ import com.zrqx.core.constant.member.MemberRequestPath;
 import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.form.member.bg.member.member.QueryMemberForm;
+import com.zrqx.core.form.member.bg.message.QueryMemberPageForm;
 import com.zrqx.core.form.member.bg.message.QueryMessageRecordForm;
 import com.zrqx.core.model.member.message.Message;
 import com.zrqx.core.model.member.message.MessageRecord;
@@ -84,9 +85,9 @@ public class MessageRecordController {
 		return messageRecordService.deleteByIds(ids) ? CallBack.success(true) : CallBack.fail();
 	}
 	
-	@ApiOperation(value = "指定会员分页查询", notes = "根据账号与手机号模糊分页查询")
+	@ApiOperation(value = "指定会员分页查询", notes = "根据账号、手机号、机构名称模糊分页查询")
 	@GetMapping(value = MemberRequestPath.PAGE+MemberRequestPath.MEMBER)
-	public CallBack<PageInfo<MemberVo>> getMemberPage(PageParam pageParam,QueryMemberForm form) {
+	public CallBack<PageInfo<MemberVo>> getMemberPage(PageParam pageParam,QueryMemberPageForm form) {
 		return CallBack.success(messageRecordService.page(pageParam,form));
 	}
 	

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/mapper/member/MemberMapper.java

@@ -52,7 +52,7 @@ public interface MemberMapper extends BaseMapper<Member>{
 	 
 	
 	/**
-	 * 样书券发放下的用户列表(站内信公用)
+	 * 样书券发放下的用户列表
 	 * @param query
 	 * @return
 	 * @author zzg
@@ -80,6 +80,9 @@ public interface MemberMapper extends BaseMapper<Member>{
 			+ " </script> ")
 	List<MemberInfoVo> page(@Param("query")QueryMemberListForm query);
 	
+	
+	
+	
 	 /**
 	 * 通过学校id查询学校下的用户
 	 * @param relationId

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/mapper/message/MessageRecordMapper.java

@@ -4,9 +4,14 @@ import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+
+import com.zrqx.core.form.member.bg.member.member.QueryMemberListForm;
+import com.zrqx.core.form.member.bg.message.QueryMemberPageForm;
 import com.zrqx.core.form.member.bg.message.QueryMessageRecordForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.message.MessageRecord;
+import com.zrqx.core.vo.member.member.MemberInfoVo;
+import com.zrqx.core.vo.member.member.MemberVo;
 @Mapper
 public interface MessageRecordMapper extends BaseMapper<MessageRecord>{
 
@@ -24,5 +29,33 @@ public interface MessageRecordMapper extends BaseMapper<MessageRecord>{
 		    + " </if> " 
 		    + " </script> ")
 	List<MessageRecord> list(@Param("query") QueryMessageRecordForm query);
+	
+	
+	 /**
+	  * 发送站内信下可选择的用户列表
+	 * @param query
+	 * @return
+	 * @author zzg
+	 * @date: 2019年5月13日 下午6:21:24
+	 */
+	@Select(" <script> "
+			+ " select m.id as memberId,m.name,m.relationId, m.phone,m.type,s.name as schoolName, s.address, p.name as pressName,m.createTime from me_member m "
+			+ " left join me_school s on m.relationId = s.id "
+			+ " left join me_press p on m.relationId = p.id "
+			+ " WHERE  1=1"
+			+ "<if test = '" + NOTBLANK + "(query.relationName)'> "  
+		    + " and s.name like concat(#{query.relationName},'%') "
+		    + " </if> " 
+		    + "<if test = '" + NOTBLANK + "(query.relationName)'> "  
+		    + " or p.name like concat(#{query.relationName},'%') "
+		    + " </if> " 
+		    + "<if test = '" + NOTBLANK + "(query.userName)'> "  
+		    + " and m.name like concat(#{query.userName},'%') "
+		    + " </if> " 
+		    + " <if test = '" + NOTBLANK + "(query.phone)'> "  
+		    + " and m.phone like concat(#{query.phone},'%') "
+		    + " </if> " 
+		    + " </script> ")
+	List<MemberVo> page(@Param("query")QueryMemberPageForm query);
 
 }

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/service/message/MessageRecordService.java

@@ -4,6 +4,7 @@ package com.zrqx.bg.member.service.message;
 import java.util.List;
 
 import com.zrqx.core.form.member.bg.member.member.QueryMemberForm;
+import com.zrqx.core.form.member.bg.message.QueryMemberPageForm;
 import com.zrqx.core.form.member.bg.message.QueryMessageRecordForm;
 import com.zrqx.core.model.member.message.MessageRecord;
 import com.zrqx.core.service.BaseService;
@@ -57,7 +58,7 @@ public interface MessageRecordService extends BaseService<MessageRecord,Integer>
 	 * @author zzg
 	 * @date: 2019年4月20日 下午3:50:57
 	 */
-	PageInfo<MemberVo> page(PageParam pageParam,QueryMemberForm form);
+	PageInfo<MemberVo> page(PageParam pageParam,QueryMemberPageForm form);
 	
 	
 

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/service/message/MessageRecordServiceImpl.java

@@ -18,6 +18,7 @@ import com.zrqx.core.enums.member.message.MessageRecordGroupTypeEnum;
 import com.zrqx.core.enums.member.message.MessageRecordSendTypeEnum;
 import com.zrqx.core.enums.member.message.MessageRecordTypeEnum;
 import com.zrqx.core.form.member.bg.member.member.QueryMemberForm;
+import com.zrqx.core.form.member.bg.message.QueryMemberPageForm;
 import com.zrqx.core.form.member.bg.message.QueryMessageRecordForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.message.Message;
@@ -201,12 +202,12 @@ public class MessageRecordServiceImpl extends BaseServiceImpl<MessageRecord,Inte
 		return "";
 	}
 	@Override
-	public PageInfo<MemberVo> page(PageParam pageParam, QueryMemberForm form) {
+	public PageInfo<MemberVo> page(PageParam pageParam, QueryMemberPageForm form) {
 		if (StringUtils.isBlank(pageParam.getOrderBy())) {
-			pageParam.setOrderBy(" createTime desc ");
+			pageParam.setOrderBy(" m.createTime desc ");
 		}
 		startPage(pageParam);
-		List<MemberVo> voList = memberMapper.list(form);
+		List<MemberVo> voList = messageRecordMapper.page(form);
 		voList.forEach( v -> {
 			String relationName = this.getRelationName(v.getRelationId(), v.getType());
 			if(StringUtils.isNoneBlank(relationName)){

com.zrqx.core/src/main/java/com/zrqx/core/form/member/bg/message/QueryMemberPageForm.java

+package com.zrqx.core.form.member.bg.message;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+ /** 
+  * 查询发送站内信下的可选择的用户表单
+ * @author zzg
+ * @date 2019年5月13日下午6:14:32
+ */
+@Data
+@ApiModel(value = "QueryMessageForm", description = "查询发送站内信下的可选择的用户表单")
+public class QueryMemberPageForm {
+
+	@ApiModelProperty("机构名称")
+	private String relationName;
+	@ApiModelProperty("用户名")
+	private String userName;
+	@ApiModelProperty("手机号")
+	private String phone;
+	
+
+}