--no commit message

app/member/src/main/java/com/zrqx/member/bg/feedback/controller/FeedbackController.java

@@ -18,6 +18,7 @@ import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.member.bg.feedback.service.FeedbackService;
+import com.zrqx.member.commons.form.bg.member.QueryFeedbackForm;
 import com.zrqx.member.commons.model.Feedback;
 
 import io.swagger.annotations.Api;
@@ -57,8 +58,8 @@ public class FeedbackController {
 
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping(value = "/page")
-	public CallBack<PageInfo<Feedback>> page(PageParam pageParam) {
-		PageInfo<Feedback> page = service.page(pageParam);
+	public CallBack<PageInfo<Feedback>> page(QueryFeedbackForm form,PageParam pageParam) {
+		PageInfo<Feedback> page = service.page(form,pageParam);
 		return CallBack.success(page);
 	}
 

app/member/src/main/java/com/zrqx/member/bg/feedback/mapper/FeedbackMapper.java

 package com.zrqx.member.bg.feedback.mapper;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
 import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.member.commons.form.bg.member.QueryFeedbackForm;
 import com.zrqx.member.commons.model.Feedback;
 /**
  * 意见反馈
  */
 public interface FeedbackMapper extends BaseMapper<Feedback>{
 
+    String NOT_BLANK = "@com.zrqx.core.util.datatype.StringUtils@isNotBlank";
+
+    String LIST_NOT_EMPTY = "@com.zrqx.core.util.datatype.ArrayUtils@isNotEmpty";
+    
+	/**
+	 * 查询列表
+	 * @param form
+	 * @return
+	 */
+	@Select("<script> "
+			+ " select * from m_feedback a where 1 =1 "
+			+ " <if test = '" + NOT_BLANK + "(form.beginTime)'> "
+            + " and a.createTime &gt;= concat(#{form.beginTime}, ' 00:00:00' ) "
+            + " </if> "
+            + " <if test = '" + NOT_BLANK + "(form.endTime)'> "
+            + " and a.createTime &lt;= concat(#{form.endTime}, ' 23:59:59') "
+            + " </if> "
+            + " like(a.memberName,form.account) "
+            + " order by a.createTime desc "
+			+ "</script>")
+	List<Feedback> page(@Param("form")QueryFeedbackForm form);
+
 }

app/member/src/main/java/com/zrqx/member/bg/feedback/service/FeedbackService.java

@@ -3,6 +3,7 @@ package com.zrqx.member.bg.feedback.service;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
+import com.zrqx.member.commons.form.bg.member.QueryFeedbackForm;
 import com.zrqx.member.commons.model.Feedback;
 /**
  * 意见反馈
@@ -14,6 +15,6 @@ public interface FeedbackService extends BaseService<Feedback, Integer>{
 	 * @param pageParam
 	 * @return
 	 */
-	PageInfo<Feedback> page(PageParam pageParam);
+	PageInfo<Feedback> page(QueryFeedbackForm form,PageParam pageParam);
 	
 }

app/member/src/main/java/com/zrqx/member/bg/feedback/service/FeedbackServiceImpl.java

@@ -8,6 +8,7 @@ import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.member.bg.feedback.mapper.FeedbackMapper;
+import com.zrqx.member.commons.form.bg.member.QueryFeedbackForm;
 import com.zrqx.member.commons.model.Feedback;
 /**
  * 意见反馈
@@ -27,9 +28,9 @@ public class FeedbackServiceImpl extends BaseServiceImpl<Feedback, Integer> impl
 	 * 分页查询意见反馈
 	 */
 	@Override
-	public PageInfo<Feedback> page(PageParam pageParam) {
+	public PageInfo<Feedback> page(QueryFeedbackForm form,PageParam pageParam) {
 		startPage(pageParam);
-		return new PageInfo<Feedback>(mapper.selectAll());
+		return new PageInfo<Feedback>(mapper.page(form));
 	}
 
 }

app/member/src/main/java/com/zrqx/member/commons/form/bg/member/QueryFeedbackForm.java

+package com.zrqx.member.commons.form.bg.member;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class QueryFeedbackForm {
+	@ApiModelProperty(value = "用户名称")
+	private String account;
+	@ApiModelProperty(value = "注册时间-开始日期")
+	private String beginTime;
+	@ApiModelProperty(value = "注册时间-结束日期")
+	private String endTime;
+}
\ No newline at end of file