按照易知鸟修改 1

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/controller/CustomerPublicController.java

@@ -1,5 +1,8 @@
 package org.jeecg.modules.miliCustomer.controller;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.druid.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -50,8 +53,25 @@ public class CustomerPublicController extends JeecgController<CustomerPublic, IC
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		System.out.println("==========????==========");
 		QueryWrapper<CustomerPublic> queryWrapper = QueryGenerator.initQueryWrapper(customerPublic, req.getParameterMap());
+		// 判断日期段
+		if(req.getParameterMap().get("beginTime") !=null) {
+			String beginDate = req.getParameterMap().get("beginTime")[0];
+			String finishDate = req.getParameterMap().get("endTime")[0];
+			if (!StringUtils.isEmpty(beginDate) || StringUtils.isEmpty(finishDate)) {
+				DateTime beginOfDay = DateUtil.beginOfDay(DateUtil.parse(beginDate));
+				DateTime endOfDay = DateUtil.endOfDay(DateUtil.parse(finishDate));
+				queryWrapper.ge("create_time", beginOfDay).le("create_time", endOfDay);
+			}
+		}
+		//关键字查询
+		if(req.getParameterMap().get("keywords") !=null) {
+			String keywords = req.getParameterMap().get("keywords")[0];
+			queryWrapper.like("name", keywords).or().like("nickname", keywords)
+					.or().like("contact_phone", keywords) .or().like("mark" ,keywords)
+					.or().like("contact_name" ,keywords);
+		}
+
 		Page<CustomerPublic> page = new Page<CustomerPublic>(pageNo, pageSize);
 		IPage<CustomerPublic> pageList = customerPublicService.page(page, queryWrapper);
 		return Result.OK(pageList);