合并

whole-estate/src/main/java/com/example/wholeestate/controller/CustomerController.java

@@ -31,14 +31,10 @@ public class CustomerController extends BaseController {
 
     @ApiOperation(value = "会员列表", notes = "会员列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "pageNum:分页第几页" +
-                    "pageSize:每页长度,phone:手机号，name：姓名"
-
-            )
-
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "pageNum:分页第几页,pageSize:每页长度,phone:手机号，name：姓名，beginDate:开始时间，endDate:结束时间")
     })
 //    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
-    @RequestMapping(value = "/customerList", method = RequestMethod.GET)
+    @RequestMapping(value = "/customerList", method = RequestMethod.POST)
     public ResponseBean buildingList(@RequestBody String parameter, HttpSession session){
         ResponseBean  responseBean = iCustomerService.customerList(parameter);
         return responseBean;

whole-estate/src/main/java/com/example/wholeestate/dao/CustomerMapper.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.wholeestate.model.Customer;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
+
 /**
  * <p>
  *  Mapper 接口
@@ -21,5 +23,5 @@ public interface CustomerMapper extends BaseMapper<Customer> {
      * @param page
      * @return
      */
-    IPage<Customer> customerList(Page<Customer> page, @Param("Name") String name,@Param("phone")String phone);
+    IPage<Customer> customerList(Page<Customer> page, @Param("Name") String name, @Param("phone")String phone, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
 }

whole-estate/src/main/java/com/example/wholeestate/service/impl/CustomerServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -40,6 +41,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     public ResponseBean customerList(String parameter) {
         ResponseBean response= new ResponseBean();
         JSONObject object= JSONObject.parseObject(parameter);
+        Date beginDate = object.getDate("beginDate");
+        Date endDate = object.getDate("endDate");
         String phone = object.getString("phone");
         String name = object.getString("name");
         Integer pageNum = object.getInteger("pageNum");
@@ -48,7 +51,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         Page<Customer> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        IPage<Customer> customer= customerMapper.customerList(page,name,phone);
+        IPage<Customer> customer= customerMapper.customerList(page,name,phone,beginDate,endDate);
         List<Customer> customerList=customer.getRecords();
 
         HashMap hashMap= new HashMap<>();

whole-estate/src/main/resources/mapper/CustomerMapper.xml

@@ -2,8 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.wholeestate.dao.CustomerMapper">
     <select id="customerList" resultType="com.example.wholeestate.model.Customer">
-        select * from ta_customer;
-        <where>
+        select * from ta_customer
             <where>
                 status > -1
                 <if test="Name != null and Name != ''">
@@ -12,8 +11,12 @@
                 <if test="phone != null and phone != ''">
                     and  ta_customer.phone like concat('%',#{phone,jdbcType=VARCHAR},'%')
                 </if>
+                <if test="beginDate != null and endDate != null">
+                    AND date_format(create_date, '%Y-%m-%d') <![CDATA[>= ]]> date_format(#{beginDate}, '%Y-%m-%d')
+                    AND date_format(create_date, '%Y-%m-%d')<![CDATA[<= ]]>  date_format(#{endDate}, '%Y-%m-%d')
+                </if>
+
             </where>
-        </where>
     </select>
 
 </mapper>