feats

src/main/java/com.huiju.welcome/controller/TaCarRecordController.java

@@ -1,6 +1,5 @@
 package com.huiju.welcome.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.common.base.BaseController;
@@ -10,8 +9,11 @@ import com.huiju.welcome.service.ITaCarRecordService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
+
 /**
  * <p>
     *  前端控制器
@@ -112,23 +114,22 @@ public class TaCarRecordController extends BaseController {
     /**
      * 分页查询
      */
-    @RequestMapping(value="/carRecord",method= RequestMethod.GET)
-    public ResponseBean list(
-        @RequestParam(defaultValue = "1") int pageNumber,
-        @RequestParam(defaultValue = "10") int pageSize
-    ){
+
+    @RequestMapping(value = "/carRecord", method = RequestMethod.GET)
+    public ResponseBean list(@RequestParam(value = "plateNumber", required = false) String plateNumber,
+                             @RequestParam(value = "recordDate", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date recordDate,
+                             @RequestParam(value = "customerName", required = false) String customerName,
+                             @RequestParam(value = "phone", required = false) String phone,
+                             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @RequestParam(value = "pageSize", defaultValue = "1") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
-        try {
-            IPage<TaCarRecord> pg = new Page<>(pageNumber, pageSize);
-            QueryWrapper<TaCarRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
 
-            IPage<TaCarRecord> result = iTaCarRecordService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
-            logger.error("taCarRecordList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
+        IPage<TaCarRecord> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+
+        IPage<TaCarRecord> pageList = iTaCarRecordService.getPageList(page, plateNumber, recordDate, customerName, phone);
+        responseBean.addSuccess(pageList);
         return responseBean;
     }
 }

src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java

@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+
 /**
  * <p>
     *  前端控制器
@@ -123,34 +124,42 @@ public class TaFirstUsherRecordController extends BaseController {
         @RequestParam(defaultValue = "false") boolean done,
         @RequestParam(defaultValue = "false") boolean onlyNew,
         @RequestParam(defaultValue = "0") int fromRec
-    ){
+    ) {
         ResponseBean responseBean = new ResponseBean();
-        try {
-            IPage<TaFirstUsherRecord> pg = new Page<>(pageNumber, pageSize);
-            QueryWrapper<TaFirstUsherRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.ge(today, "visite_date", DateUtils.morning());
-            queryWrapper.gt("rec_id", fromRec);
-
-            if (onlyNew) {
-                queryWrapper.eq("status", StatusUtils.Ready);
-                queryWrapper.orderByAsc("rec_id");
-            } else {
-                queryWrapper.ge("status", StatusUtils.Ready);
-                queryWrapper.lt(!done,"status", StatusUtils.BizDone);
-                queryWrapper.orderByDesc("rec_id");
-            }
 
-            IPage<TaFirstUsherRecord> result = iTaFirstUsherRecordService.page(pg, queryWrapper);
+        IPage<TaFirstUsherRecord> pg = new Page<>(pageNumber, pageSize);
+        QueryWrapper<TaFirstUsherRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge(today, "visite_date", DateUtils.morning());
+        queryWrapper.gt("rec_id", fromRec);
+
+        if (onlyNew) {
+            queryWrapper.eq("status", StatusUtils.Ready);
+            queryWrapper.orderByAsc("rec_id");
+        } else {
+            queryWrapper.ge("status", StatusUtils.Ready);
+            queryWrapper.lt(!done, "status", StatusUtils.BizDone);
+            queryWrapper.orderByDesc("rec_id");
+        }
+
+        IPage<TaFirstUsherRecord> result = iTaFirstUsherRecordService.page(pg, queryWrapper);
 
 //            if (onlyNew) {
 //               iTaFirstUsherRecordService.updateNormal(result.getRecords());
 //            }
+        responseBean.addSuccess(result);
+        return responseBean;
+    }
 
+    @RequestMapping(value="/firstUsherRecord",method= RequestMethod.GET)
+    public ResponseBean list(@RequestParam(defaultValue = "1") int pageNumber,
+                             @RequestParam(defaultValue = "10") int pageSize,
+                             @RequestParam(value = "plateNumber",required = false) String plateNumber,
+                             @RequestParam(value = "visiteDate",required = false) String visiteDate){
+            ResponseBean responseBean = new ResponseBean();
+            IPage<TaFirstUsherRecord> pg = new Page<>(pageNumber, pageSize);
+            IPage<TaFirstUsherRecord> result = iTaFirstUsherRecordService.taFirstUsherRecordlist(pg,plateNumber,visiteDate);
             responseBean.addSuccess(result);
-        }catch (Exception e){
-            logger.error("taFirstUsherRecordList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
+            return responseBean;
     }
+
 }

src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java

@@ -153,50 +153,55 @@ public class TaMainUsherRecordController extends BaseController {
         @RequestParam(defaultValue = "") String customer
     ){
         ResponseBean responseBean = new ResponseBean();
-        try {
-            IPage<TaMainUsherRecord> pg = new Page<>(pageNumber, pageSize);
-            QueryWrapper<TaMainUsherRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.ge(today, "visite_date", DateUtils.morning());
-            queryWrapper.gt("rec_id", fromRec);
-            queryWrapper.eq(null != customer && !"".equals(customer), "customer_id", customer);
-
-            if (onlyNew) {
-                queryWrapper.eq("status", StatusUtils.Ready);
-                queryWrapper.orderByAsc("rec_id");
-            } else {
-                queryWrapper.ge("status", StatusUtils.Ready);
-                queryWrapper.lt(!done,"status", StatusUtils.BizDone);
-                queryWrapper.orderByDesc("rec_id");
-            }
-
-            IPage<TaMainUsherRecord> result = iTaMainUsherRecordService.page(pg, queryWrapper);
-            List<TaMainUsherRecord> recs = result.getRecords();
-
-            if (null != recs && recs.size() > 0) {
-                for (TaMainUsherRecord rec: result.getRecords()) {
-                    QueryWrapper<TaFollowupRecord> wrapper = new QueryWrapper<>();
-                    wrapper.eq("rec_id", rec.getRecId());
-                    rec.setFollows(iTaFollowupRecordService.list(wrapper));
+        IPage<TaMainUsherRecord> pg = new Page<>(pageNumber, pageSize);
+        QueryWrapper<TaMainUsherRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge(today, "visite_date", DateUtils.morning());
+        queryWrapper.gt("rec_id", fromRec);
+        queryWrapper.eq(null != customer && !"".equals(customer), "customer_id", customer);
+
+        if (onlyNew) {
+            queryWrapper.eq("status", StatusUtils.Ready);
+            queryWrapper.orderByAsc("rec_id");
+        } else {
+            queryWrapper.ge("status", StatusUtils.Ready);
+            queryWrapper.lt(!done,"status", StatusUtils.BizDone);
+            queryWrapper.orderByDesc("rec_id");
+        }
 
-                    // 上次来访
-                    QueryWrapper<TaMainUsherRecord> query = new QueryWrapper<>();
-                    query.lt("visite_date", rec.getVisiteDate());
-                    query.lt("customer_id", rec.getCustomerId());
-                    query.orderByDesc("visite_date");
-                    query.last("limit 1");
-                    rec.setLastRecord(iTaMainUsherRecordService.getOne(query));
-                }
+        IPage<TaMainUsherRecord> result = iTaMainUsherRecordService.page(pg, queryWrapper);
+        List<TaMainUsherRecord> recs = result.getRecords();
+
+        if (null != recs && recs.size() > 0) {
+            for (TaMainUsherRecord rec: result.getRecords()) {
+                QueryWrapper<TaFollowupRecord> wrapper = new QueryWrapper<>();
+                wrapper.eq("rec_id", rec.getRecId());
+                rec.setFollows(iTaFollowupRecordService.list(wrapper));
+
+                // 上次来访
+                QueryWrapper<TaMainUsherRecord> query = new QueryWrapper<>();
+                query.lt("visite_date", rec.getVisiteDate());
+                query.lt("customer_id", rec.getCustomerId());
+                query.orderByDesc("visite_date");
+                query.last("limit 1");
+                rec.setLastRecord(iTaMainUsherRecordService.getOne(query));
+            }
 
 //                if (onlyNew) {
 //                    iTaMainUsherRecordService.updateNormal(recs);
 //                }
-            }
-
-            responseBean.addSuccess(result);
-        }catch (Exception e){
-            logger.error("taMainUsherRecordList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
         }
+        responseBean.addSuccess(result);
+        return responseBean;
+    }
+
+    @RequestMapping(value="/mainUsherRecord",method= RequestMethod.GET)
+    public ResponseBean list(@RequestParam(defaultValue = "1") int pageNumber,
+                            @RequestParam(defaultValue = "10") int pageSize){
+        ResponseBean responseBean = new ResponseBean();
+
+        IPage<TaMainUsherRecord> pg = new Page<>(pageNumber, pageSize);
+        IPage<TaMainUsherRecord> result = iTaMainUsherRecordService.taMainUsherRecordList(pg);
+        responseBean.addSuccess(result);
         return responseBean;
     }
 }

src/main/java/com.huiju.welcome/controller/TaVisitorAppointmentController.java

@@ -8,12 +8,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.TaFirstUsherRecord;
 import com.huiju.welcome.model.TaVisitorAppointment;
 import com.huiju.welcome.service.ITaVisitorAppointmentService;
 import com.huiju.welcome.utils.DateUtils;
 import com.huiju.welcome.utils.JWTUtils;
 import com.huiju.welcome.utils.StatusUtils;
 import com.huiju.welcome.utils.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
@@ -116,4 +121,21 @@ public class TaVisitorAppointmentController extends BaseController {
             return ResponseBean.error("更新数据失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
         }
     }
+    @ApiOperation(value = "访客预约信息",httpMethod = "访客预约信息")
+    @RequestMapping(value="/visitorAppointmentList",method= RequestMethod.GET)
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "platNumber", value = "车牌"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "personName", value = "预约人姓名"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "预约人电话")})
+    public ResponseBean visitorAppointmentList(@RequestParam(defaultValue = "1") int pageNumber,
+                             @RequestParam(defaultValue = "10") int pageSize,
+                             @RequestParam(value = "platNumber",required = false) String platNumber,
+                             @RequestParam(value = "personName",required = false) String personName,
+                             @RequestParam(value = "phone",required = false) String phone){
+
+        IPage<TaVisitorAppointment> pg = new Page<>(pageNumber, pageSize);
+        ResponseBean result = taVisitorAppointmentService.visitorAppointmentList(pg,platNumber,personName,phone);
+        return result;
+    }
+
 }

src/main/java/com.huiju.welcome/mapper/TaCarRecordMapper.java

@@ -1,8 +1,14 @@
 package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.TaCarRecord;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -10,9 +16,11 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author jobob
- * @since 2019-06-11
+ * @since 2019-06-18
  */
 @Mapper
 public interface TaCarRecordMapper extends BaseMapper<TaCarRecord> {
 
+    IPage<TaCarRecord> getPageList(IPage<TaCarRecord> page, @Param("plateNumber") String plateNumber, @Param("recordDate") Date recordDate, @Param("customerName") String customerName, @Param("phone") String phone);
+
 }

src/main/java/com.huiju.welcome/mapper/TaFirstUsherRecordMapper.java

@@ -1,8 +1,12 @@
 package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.TaFirstUsherRecord;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -15,4 +19,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaFirstUsherRecordMapper extends BaseMapper<TaFirstUsherRecord> {
 
+    /**
+     * 分页查询安保记录
+     * @param pg
+     * @param plateNumber
+     * @param visiteDate
+     * @return
+     */
+    IPage<TaFirstUsherRecord> taFirstUsherRecordlist(IPage pg, @Param("plateNumber") String plateNumber, @Param("visiteDate")String visiteDate);
 }

src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java

@@ -1,6 +1,7 @@
 package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.TaMainUsherRecord;
 import com.huiju.welcome.model.TaPerson;
 import org.apache.ibatis.annotations.Mapper;
@@ -20,4 +21,11 @@ import java.util.Map;
 @Mapper
 public interface TaMainUsherRecordMapper extends BaseMapper<TaMainUsherRecord> {
     Map<String,Object> getSummaryOfCustomer(@Param("customerId") Integer customerId);
+
+    /**
+     * 分页查询大厅人员记录
+     * @param pg
+     * @return
+     */
+    IPage<TaMainUsherRecord> aMainUsherRecordList(IPage<TaMainUsherRecord> pg);
 }

src/main/java/com.huiju.welcome/mapper/TaVisitorAppointmentMapper.java

@@ -1,6 +1,7 @@
 package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.TaVisitorAppointment;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -11,4 +12,11 @@ import java.util.List;
 @Mapper
 public interface TaVisitorAppointmentMapper extends BaseMapper<TaVisitorAppointment> {
     List<TaVisitorAppointment> getSameAppointments(@Param("platNumber") String platNumber, @Param("phone") String phone, @Param("day") String day);
+    /**
+     * 查询当前访客预约信息
+     * @param pg
+     * @param platNumber
+     * @return
+     */
+    IPage<TaVisitorAppointment> visitorAppointmentList(IPage pg, @Param("platNumber") String platNumber, @Param("personName")String personName, @Param("phone")String phone);
 }

src/main/java/com.huiju.welcome/model/TaCarRecord.java

@@ -1,24 +1,29 @@
 package com.huiju.welcome.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 
  * </p>
  *
  * @author jobob
- * @since 2019-06-11
+ * @since 2019-06-18
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
+@TableName("ta_car_record")
 public class TaCarRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -40,5 +45,16 @@ public class TaCarRecord implements Serializable {
 
     private LocalDateTime createDate;
 
+    /**
+     * 客户姓名
+     */
+    @TableField(exist = false)
+    private String customerName;
+
+    /**
+     * 手机号
+     */
+    @TableField(exist = false)
+    private String phone;
 
 }

src/main/java/com.huiju.welcome/model/TaFirstUsherRecord.java

@@ -34,6 +34,16 @@ public class TaFirstUsherRecord implements Serializable {
 
     private Integer personNum;
 
+    private String color;
+
+    private String channel;
+
+    private String purpose;
+
+    private String personName;
+
+    private String carImage;
+
     private Boolean appointment;
 
     private LocalDateTime visiteDate;

src/main/java/com.huiju.welcome/service/ITaCarRecordService.java

@@ -1,16 +1,31 @@
 package com.huiju.welcome.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.model.TaCarRecord;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+
 /**
  * <p>
  *  服务类
  * </p>
  *
  * @author jobob
- * @since 2019-06-11
+ * @since 2019-06-18
  */
 public interface ITaCarRecordService extends IService<TaCarRecord> {
 
+    /**
+     * 根据条件查询
+     * @param page
+     * @param plateNumber
+     * @param recordDate
+     * @param customerName
+     * @param phone
+     * @return
+     */
+    IPage<TaCarRecord> getPageList(IPage<TaCarRecord> page, String plateNumber, Date recordDate, String customerName, String phone);
 }

src/main/java/com.huiju.welcome/service/ITaFirstUsherRecordService.java

@@ -1,9 +1,11 @@
 package com.huiju.welcome.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.model.TaFirstUsherRecord;
 
 import java.util.List;
+import java.util.Date;
 
 /**
  * <p>
@@ -14,6 +16,11 @@ import java.util.List;
  * @since 2019-06-04
  */
 public interface ITaFirstUsherRecordService extends IService<TaFirstUsherRecord> {
+    /**
+     * 查询安保记录
+     * @return
+     */
+    IPage<TaFirstUsherRecord> taFirstUsherRecordlist(IPage<TaFirstUsherRecord> pg,String plateNumber, String visiteDate);
 
     boolean updateNormal(List<TaFirstUsherRecord> records);
 }

src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java

@@ -1,5 +1,6 @@
 package com.huiju.welcome.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaMainUsherRecord;
@@ -19,4 +20,10 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
     boolean updateNormal(List<TaMainUsherRecord> recs);
 
     boolean newRecordByFront(TaCustomer taCustomer);
+    /**
+     * 分页查询大厅记录
+     * @param pg
+     * @return
+     */
+    IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg);
 }

src/main/java/com.huiju.welcome/service/ITaVisitorAppointmentService.java

@@ -1,5 +1,6 @@
 package com.huiju.welcome.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaVisitorAppointment;
@@ -15,4 +16,11 @@ import com.huiju.welcome.model.TaVisitorAppointment;
 public interface ITaVisitorAppointmentService extends IService<TaVisitorAppointment> {
 
     ResponseBean check(TaVisitorAppointment taVisitorAppointment);
+    /**
+     *访客预约信息
+     * @param pg
+     * @param platNumber
+     * @return
+     */
+    ResponseBean visitorAppointmentList(IPage<TaVisitorAppointment> pg, String platNumber,String personName,String phone);
 }

src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java

@@ -1,20 +1,33 @@
 package com.huiju.welcome.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.mapper.TaCarRecordMapper;
 import com.huiju.welcome.model.TaCarRecord;
 import com.huiju.welcome.service.ITaCarRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+
 /**
  * <p>
  *  服务实现类
  * </p>
  *
  * @author jobob
- * @since 2019-06-11
+ * @since 2019-06-18
  */
 @Service
 public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCarRecord> implements ITaCarRecordService {
 
+    @Autowired
+    private TaCarRecordMapper taCarRecordMapper;
+
+    @Override
+    public IPage<TaCarRecord> getPageList(IPage<TaCarRecord> page, String plateNumber, Date recordDate, String customerName, String phone) {
+        return taCarRecordMapper.getPageList(page, plateNumber, recordDate, customerName, phone);
+    }
 }

src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huiju.welcome.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.mapper.TaFirstUsherRecordMapper;
 import com.huiju.welcome.model.TaFirstUsherRecord;
@@ -11,6 +12,8 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 /**
  * <p>
@@ -24,6 +27,9 @@ import java.util.List;
 public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecordMapper, TaFirstUsherRecord> implements ITaFirstUsherRecordService {
     @Autowired
     TaFirstUsherRecordMapper taFirstUsherRecordMapper;
+    
+    @Autowired
+    private TaFirstUsherRecordMapper taFirstUsherRecordMapper;
 
     @Override
     public boolean updateNormal(List<TaFirstUsherRecord> records) {
@@ -41,4 +47,10 @@ public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecor
         int row = taFirstUsherRecordMapper.update(new TaFirstUsherRecord(), wrapper);
         return row >= 0;
     }
+    
+    @Override
+    public IPage<TaFirstUsherRecord> taFirstUsherRecordlist(IPage pg,String plateNumber, String visiteDate) {
+        IPage<TaFirstUsherRecord> pageTaFirstUsherRecord= taFirstUsherRecordMapper.taFirstUsherRecordlist(pg,plateNumber,visiteDate);
+        return pageTaFirstUsherRecord;
+    }
 }

src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huiju.welcome.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.mapper.TaMainUsherRecordMapper;
 import com.huiju.welcome.model.TaCustomer;
@@ -27,6 +28,9 @@ import java.util.List;
 public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordMapper, TaMainUsherRecord> implements ITaMainUsherRecordService {
     @Autowired
     TaMainUsherRecordMapper taMainUsherRecordMapper;
+    
+    @Autowired
+    private  TaMainUsherRecordMapper taMainUsherRecordMapper;
 
     @Override
     public boolean updateNormal(List<TaMainUsherRecord> records) {
@@ -61,4 +65,10 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 
         return row > 0;
     }
+    
+    @Override
+    public IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg) {
+        IPage<TaMainUsherRecord>  taMainUsherRecordList= taMainUsherRecordMapper.aMainUsherRecordList(pg);
+        return taMainUsherRecordList;
+    }
 }

src/main/java/com.huiju.welcome/service/impl/TaVisitorAppointmentServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huiju.welcome.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.mapper.TaVisitorAppointmentMapper;
@@ -12,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,6 +29,9 @@ import java.util.List;
 public class TaVisitorAppointmentServiceImpl extends ServiceImpl<TaVisitorAppointmentMapper, TaVisitorAppointment> implements ITaVisitorAppointmentService {
     @Autowired
     TaVisitorAppointmentMapper taVisitorAppointmentMapper;
+    
+    @Autowired
+    private TaVisitorAppointmentMapper taVisitorAppointmentMapper;
 
     @Override
     public ResponseBean check(TaVisitorAppointment taVisitorAppointment) {
@@ -40,4 +46,12 @@ public class TaVisitorAppointmentServiceImpl extends ServiceImpl<TaVisitorAppoin
 
         return ResponseBean.success("");
     }
+    
+    @Override
+    public ResponseBean visitorAppointmentList(IPage pg, String platNumber, String personName,String phone) {
+       ResponseBean responseBean= new ResponseBean();
+        IPage<TaVisitorAppointment> list= taVisitorAppointmentMapper.visitorAppointmentList(pg,platNumber,personName,phone);
+        responseBean.addSuccess(list);
+        return responseBean;
+    }
 }

src/main/resources/mapper/TaCarRecordMapper.xml

@@ -2,4 +2,24 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.welcome.mapper.TaCarRecordMapper">
 
+    <select id="getPageList" resultType="com.huiju.welcome.model.TaCarRecord" >
+      select * from ta_car_record tcr left join ta_customer tc on tcr.driver_id = tc.customer_id
+      <where>
+          <trim prefixOverrides="or | and">
+              <if test="plateNumber != null and plateNumber != ''">
+                  and tcr.plate_number like concat('%', #{plateNumber},'%')
+              </if>
+              <if test="customerName != null and customerName != ''">
+                  and tc.customer_name like concat('%', #{customerName},'%')
+              </if>
+              <if test="phone != null and phone != ''">
+                  and tc.phone like concat('%', #{phone}, '%')
+              </if>
+              <if test="recordDate != null">
+                  and DATE_FORMAT( tcr.create_date, '%Y-%m-%d' ) = DATE_FORMAT(#{recordDate}, '%Y-%m-%d' )
+              </if>
+          </trim>
+      </where>
+    </select>
+
 </mapper>

src/main/resources/mapper/TaFirstUsherRecordMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.welcome.mapper.TaFirstUsherRecordMapper">
+<select id="taFirstUsherRecordlist" resultType="com.huiju.welcome.model.TaFirstUsherRecord">
+    select * from ta_first_usher_record
+    <where>
+        <if test="visiteDate != null and visiteDate!= ''">
+            date_format(visite_date, '%Y-%m-%d') <![CDATA[= ]]> date_format(#{visiteDate}, '%Y-%m-%d')
+        </if>
+        <if test="plateNumber != null and plateNumber!= ''">
+            plate_number LIKE CONCAT('%',#{plateNumber},'%')
+        </if>
+    </where>
+    ORDER BY visite_date desc
+</select>
+</mapper>

src/main/resources/mapper/TaMainUsherRecordMapper.xml

@@ -10,4 +10,10 @@
         WHERE
             t.customer_id = #{customerId}
     </select>
+    <select id="aMainUsherRecordList" resultType="com.huiju.welcome.model.TaMainUsherRecord">
+        SELECT
+        *
+        FROM
+        ta_main_usher_record
+    </select>
 </mapper>

src/main/resources/mapper/TaVisitorAppointmentMapper.xml

@@ -14,4 +14,20 @@
         )
         AND t.`status` > 0
     </select>
+    <select id="visitorAppointmentList" resultType="com.huiju.welcome.model.TaVisitorAppointment">
+        select * from ta_visitor_appointment
+        <where>
+            <if test="personName !=null and personName !=''">
+                person_name LIKE CONCAT('%',#{personName},'%')
+            </if>
+            <if test="phone !=null and phone !=''">
+                phone LIKE CONCAT('%',#{phone},'%')
+            </if>
+            <if test="platNumber !=null and platNumber !=''">
+                plat_number LIKE CONCAT('%',#{platNumber},'%')
+            </if>
+        </where>
+        order by create_date desc
+    </select>
+
 </mapper>