张延森 6 years ago
parent
commit
381c0bae08
22 changed files with 324 additions and 81 deletions
  1. 17
    16
      src/main/java/com.huiju.welcome/controller/TaCarRecordController.java
  2. 30
    21
      src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java
  3. 43
    38
      src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java
  4. 22
    0
      src/main/java/com.huiju.welcome/controller/TaVisitorAppointmentController.java
  5. 9
    1
      src/main/java/com.huiju.welcome/mapper/TaCarRecordMapper.java
  6. 12
    0
      src/main/java/com.huiju.welcome/mapper/TaFirstUsherRecordMapper.java
  7. 8
    0
      src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java
  8. 8
    0
      src/main/java/com.huiju.welcome/mapper/TaVisitorAppointmentMapper.java
  9. 19
    3
      src/main/java/com.huiju.welcome/model/TaCarRecord.java
  10. 10
    0
      src/main/java/com.huiju.welcome/model/TaFirstUsherRecord.java
  11. 16
    1
      src/main/java/com.huiju.welcome/service/ITaCarRecordService.java
  12. 7
    0
      src/main/java/com.huiju.welcome/service/ITaFirstUsherRecordService.java
  13. 7
    0
      src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java
  14. 8
    0
      src/main/java/com.huiju.welcome/service/ITaVisitorAppointmentService.java
  15. 14
    1
      src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java
  16. 12
    0
      src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java
  17. 10
    0
      src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java
  18. 14
    0
      src/main/java/com.huiju.welcome/service/impl/TaVisitorAppointmentServiceImpl.java
  19. 20
    0
      src/main/resources/mapper/TaCarRecordMapper.xml
  20. 16
    0
      src/main/resources/mapper/TaFirstUsherRecordMapper.xml
  21. 6
    0
      src/main/resources/mapper/TaMainUsherRecordMapper.xml
  22. 16
    0
      src/main/resources/mapper/TaVisitorAppointmentMapper.xml

+ 17
- 16
src/main/java/com.huiju.welcome/controller/TaCarRecordController.java View File

1
 package com.huiju.welcome.controller;
1
 package com.huiju.welcome.controller;
2
 
2
 
3
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
 import com.baomidou.mybatisplus.core.metadata.IPage;
3
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
4
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.huiju.welcome.common.base.BaseController;
5
 import com.huiju.welcome.common.base.BaseController;
10
 import org.slf4j.Logger;
9
 import org.slf4j.Logger;
11
 import org.slf4j.LoggerFactory;
10
 import org.slf4j.LoggerFactory;
12
 import org.springframework.beans.factory.annotation.Autowired;
11
 import org.springframework.beans.factory.annotation.Autowired;
12
+import org.springframework.format.annotation.DateTimeFormat;
13
 import org.springframework.web.bind.annotation.*;
13
 import org.springframework.web.bind.annotation.*;
14
 
14
 
15
+import java.util.Date;
16
+
15
 /**
17
 /**
16
  * <p>
18
  * <p>
17
     *  前端控制器
19
     *  前端控制器
112
     /**
114
     /**
113
      * 分页查询
115
      * 分页查询
114
      */
116
      */
115
-    @RequestMapping(value="/carRecord",method= RequestMethod.GET)
116
-    public ResponseBean list(
117
-        @RequestParam(defaultValue = "1") int pageNumber,
118
-        @RequestParam(defaultValue = "10") int pageSize
119
-    ){
117
+
118
+    @RequestMapping(value = "/carRecord", method = RequestMethod.GET)
119
+    public ResponseBean list(@RequestParam(value = "plateNumber", required = false) String plateNumber,
120
+                             @RequestParam(value = "recordDate", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date recordDate,
121
+                             @RequestParam(value = "customerName", required = false) String customerName,
122
+                             @RequestParam(value = "phone", required = false) String phone,
123
+                             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
124
+                             @RequestParam(value = "pageSize", defaultValue = "1") Integer pageSize) {
120
         ResponseBean responseBean = new ResponseBean();
125
         ResponseBean responseBean = new ResponseBean();
121
-        try {
122
-            IPage<TaCarRecord> pg = new Page<>(pageNumber, pageSize);
123
-            QueryWrapper<TaCarRecord> queryWrapper = new QueryWrapper<>();
124
-            queryWrapper.orderByDesc("create_date");
125
 
126
 
126
-            IPage<TaCarRecord> result = iTaCarRecordService.page(pg, queryWrapper);
127
-            responseBean.addSuccess(result);
128
-        }catch (Exception e){
129
-            logger.error("taCarRecordList -=- {}",e.toString());
130
-            responseBean.addError(e.getMessage());
131
-        }
127
+        IPage<TaCarRecord> page = new Page<>();
128
+        page.setCurrent(pageNum);
129
+        page.setSize(pageSize);
130
+
131
+        IPage<TaCarRecord> pageList = iTaCarRecordService.getPageList(page, plateNumber, recordDate, customerName, phone);
132
+        responseBean.addSuccess(pageList);
132
         return responseBean;
133
         return responseBean;
133
     }
134
     }
134
 }
135
 }

+ 30
- 21
src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java View File

14
 import org.springframework.beans.factory.annotation.Autowired;
14
 import org.springframework.beans.factory.annotation.Autowired;
15
 import org.springframework.web.bind.annotation.*;
15
 import org.springframework.web.bind.annotation.*;
16
 
16
 
17
+
17
 /**
18
 /**
18
  * <p>
19
  * <p>
19
     *  前端控制器
20
     *  前端控制器
123
         @RequestParam(defaultValue = "false") boolean done,
124
         @RequestParam(defaultValue = "false") boolean done,
124
         @RequestParam(defaultValue = "false") boolean onlyNew,
125
         @RequestParam(defaultValue = "false") boolean onlyNew,
125
         @RequestParam(defaultValue = "0") int fromRec
126
         @RequestParam(defaultValue = "0") int fromRec
126
-    ){
127
+    ) {
127
         ResponseBean responseBean = new ResponseBean();
128
         ResponseBean responseBean = new ResponseBean();
128
-        try {
129
-            IPage<TaFirstUsherRecord> pg = new Page<>(pageNumber, pageSize);
130
-            QueryWrapper<TaFirstUsherRecord> queryWrapper = new QueryWrapper<>();
131
-            queryWrapper.ge(today, "visite_date", DateUtils.morning());
132
-            queryWrapper.gt("rec_id", fromRec);
133
-
134
-            if (onlyNew) {
135
-                queryWrapper.eq("status", StatusUtils.Ready);
136
-                queryWrapper.orderByAsc("rec_id");
137
-            } else {
138
-                queryWrapper.ge("status", StatusUtils.Ready);
139
-                queryWrapper.lt(!done,"status", StatusUtils.BizDone);
140
-                queryWrapper.orderByDesc("rec_id");
141
-            }
142
 
129
 
143
-            IPage<TaFirstUsherRecord> result = iTaFirstUsherRecordService.page(pg, queryWrapper);
130
+        IPage<TaFirstUsherRecord> pg = new Page<>(pageNumber, pageSize);
131
+        QueryWrapper<TaFirstUsherRecord> queryWrapper = new QueryWrapper<>();
132
+        queryWrapper.ge(today, "visite_date", DateUtils.morning());
133
+        queryWrapper.gt("rec_id", fromRec);
134
+
135
+        if (onlyNew) {
136
+            queryWrapper.eq("status", StatusUtils.Ready);
137
+            queryWrapper.orderByAsc("rec_id");
138
+        } else {
139
+            queryWrapper.ge("status", StatusUtils.Ready);
140
+            queryWrapper.lt(!done, "status", StatusUtils.BizDone);
141
+            queryWrapper.orderByDesc("rec_id");
142
+        }
143
+
144
+        IPage<TaFirstUsherRecord> result = iTaFirstUsherRecordService.page(pg, queryWrapper);
144
 
145
 
145
 //            if (onlyNew) {
146
 //            if (onlyNew) {
146
 //               iTaFirstUsherRecordService.updateNormal(result.getRecords());
147
 //               iTaFirstUsherRecordService.updateNormal(result.getRecords());
147
 //            }
148
 //            }
149
+        responseBean.addSuccess(result);
150
+        return responseBean;
151
+    }
148
 
152
 
153
+    @RequestMapping(value="/firstUsherRecord",method= RequestMethod.GET)
154
+    public ResponseBean list(@RequestParam(defaultValue = "1") int pageNumber,
155
+                             @RequestParam(defaultValue = "10") int pageSize,
156
+                             @RequestParam(value = "plateNumber",required = false) String plateNumber,
157
+                             @RequestParam(value = "visiteDate",required = false) String visiteDate){
158
+            ResponseBean responseBean = new ResponseBean();
159
+            IPage<TaFirstUsherRecord> pg = new Page<>(pageNumber, pageSize);
160
+            IPage<TaFirstUsherRecord> result = iTaFirstUsherRecordService.taFirstUsherRecordlist(pg,plateNumber,visiteDate);
149
             responseBean.addSuccess(result);
161
             responseBean.addSuccess(result);
150
-        }catch (Exception e){
151
-            logger.error("taFirstUsherRecordList -=- {}",e.toString());
152
-            responseBean.addError(e.getMessage());
153
-        }
154
-        return responseBean;
162
+            return responseBean;
155
     }
163
     }
164
+
156
 }
165
 }

+ 43
- 38
src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java View File

153
         @RequestParam(defaultValue = "") String customer
153
         @RequestParam(defaultValue = "") String customer
154
     ){
154
     ){
155
         ResponseBean responseBean = new ResponseBean();
155
         ResponseBean responseBean = new ResponseBean();
156
-        try {
157
-            IPage<TaMainUsherRecord> pg = new Page<>(pageNumber, pageSize);
158
-            QueryWrapper<TaMainUsherRecord> queryWrapper = new QueryWrapper<>();
159
-            queryWrapper.ge(today, "visite_date", DateUtils.morning());
160
-            queryWrapper.gt("rec_id", fromRec);
161
-            queryWrapper.eq(null != customer && !"".equals(customer), "customer_id", customer);
162
-
163
-            if (onlyNew) {
164
-                queryWrapper.eq("status", StatusUtils.Ready);
165
-                queryWrapper.orderByAsc("rec_id");
166
-            } else {
167
-                queryWrapper.ge("status", StatusUtils.Ready);
168
-                queryWrapper.lt(!done,"status", StatusUtils.BizDone);
169
-                queryWrapper.orderByDesc("rec_id");
170
-            }
171
-
172
-            IPage<TaMainUsherRecord> result = iTaMainUsherRecordService.page(pg, queryWrapper);
173
-            List<TaMainUsherRecord> recs = result.getRecords();
174
-
175
-            if (null != recs && recs.size() > 0) {
176
-                for (TaMainUsherRecord rec: result.getRecords()) {
177
-                    QueryWrapper<TaFollowupRecord> wrapper = new QueryWrapper<>();
178
-                    wrapper.eq("rec_id", rec.getRecId());
179
-                    rec.setFollows(iTaFollowupRecordService.list(wrapper));
156
+        IPage<TaMainUsherRecord> pg = new Page<>(pageNumber, pageSize);
157
+        QueryWrapper<TaMainUsherRecord> queryWrapper = new QueryWrapper<>();
158
+        queryWrapper.ge(today, "visite_date", DateUtils.morning());
159
+        queryWrapper.gt("rec_id", fromRec);
160
+        queryWrapper.eq(null != customer && !"".equals(customer), "customer_id", customer);
161
+
162
+        if (onlyNew) {
163
+            queryWrapper.eq("status", StatusUtils.Ready);
164
+            queryWrapper.orderByAsc("rec_id");
165
+        } else {
166
+            queryWrapper.ge("status", StatusUtils.Ready);
167
+            queryWrapper.lt(!done,"status", StatusUtils.BizDone);
168
+            queryWrapper.orderByDesc("rec_id");
169
+        }
180
 
170
 
181
-                    // 上次来访
182
-                    QueryWrapper<TaMainUsherRecord> query = new QueryWrapper<>();
183
-                    query.lt("visite_date", rec.getVisiteDate());
184
-                    query.lt("customer_id", rec.getCustomerId());
185
-                    query.orderByDesc("visite_date");
186
-                    query.last("limit 1");
187
-                    rec.setLastRecord(iTaMainUsherRecordService.getOne(query));
188
-                }
171
+        IPage<TaMainUsherRecord> result = iTaMainUsherRecordService.page(pg, queryWrapper);
172
+        List<TaMainUsherRecord> recs = result.getRecords();
173
+
174
+        if (null != recs && recs.size() > 0) {
175
+            for (TaMainUsherRecord rec: result.getRecords()) {
176
+                QueryWrapper<TaFollowupRecord> wrapper = new QueryWrapper<>();
177
+                wrapper.eq("rec_id", rec.getRecId());
178
+                rec.setFollows(iTaFollowupRecordService.list(wrapper));
179
+
180
+                // 上次来访
181
+                QueryWrapper<TaMainUsherRecord> query = new QueryWrapper<>();
182
+                query.lt("visite_date", rec.getVisiteDate());
183
+                query.lt("customer_id", rec.getCustomerId());
184
+                query.orderByDesc("visite_date");
185
+                query.last("limit 1");
186
+                rec.setLastRecord(iTaMainUsherRecordService.getOne(query));
187
+            }
189
 
188
 
190
 //                if (onlyNew) {
189
 //                if (onlyNew) {
191
 //                    iTaMainUsherRecordService.updateNormal(recs);
190
 //                    iTaMainUsherRecordService.updateNormal(recs);
192
 //                }
191
 //                }
193
-            }
194
-
195
-            responseBean.addSuccess(result);
196
-        }catch (Exception e){
197
-            logger.error("taMainUsherRecordList -=- {}",e.toString());
198
-            responseBean.addError(e.getMessage());
199
         }
192
         }
193
+        responseBean.addSuccess(result);
194
+        return responseBean;
195
+    }
196
+
197
+    @RequestMapping(value="/mainUsherRecord",method= RequestMethod.GET)
198
+    public ResponseBean list(@RequestParam(defaultValue = "1") int pageNumber,
199
+                            @RequestParam(defaultValue = "10") int pageSize){
200
+        ResponseBean responseBean = new ResponseBean();
201
+
202
+        IPage<TaMainUsherRecord> pg = new Page<>(pageNumber, pageSize);
203
+        IPage<TaMainUsherRecord> result = iTaMainUsherRecordService.taMainUsherRecordList(pg);
204
+        responseBean.addSuccess(result);
200
         return responseBean;
205
         return responseBean;
201
     }
206
     }
202
 }
207
 }

+ 22
- 0
src/main/java/com.huiju.welcome/controller/TaVisitorAppointmentController.java View File

8
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
8
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
9
 import com.huiju.welcome.common.base.BaseController;
9
 import com.huiju.welcome.common.base.BaseController;
10
 import com.huiju.welcome.common.base.ResponseBean;
10
 import com.huiju.welcome.common.base.ResponseBean;
11
+import com.huiju.welcome.model.TaFirstUsherRecord;
11
 import com.huiju.welcome.model.TaVisitorAppointment;
12
 import com.huiju.welcome.model.TaVisitorAppointment;
12
 import com.huiju.welcome.service.ITaVisitorAppointmentService;
13
 import com.huiju.welcome.service.ITaVisitorAppointmentService;
13
 import com.huiju.welcome.utils.DateUtils;
14
 import com.huiju.welcome.utils.DateUtils;
14
 import com.huiju.welcome.utils.JWTUtils;
15
 import com.huiju.welcome.utils.JWTUtils;
15
 import com.huiju.welcome.utils.StatusUtils;
16
 import com.huiju.welcome.utils.StatusUtils;
16
 import com.huiju.welcome.utils.StringUtils;
17
 import com.huiju.welcome.utils.StringUtils;
18
+import io.swagger.annotations.Api;
19
+import io.swagger.annotations.ApiImplicitParam;
20
+import io.swagger.annotations.ApiImplicitParams;
21
+import io.swagger.annotations.ApiOperation;
17
 import org.springframework.beans.factory.annotation.Autowired;
22
 import org.springframework.beans.factory.annotation.Autowired;
18
 import org.apache.http.HttpStatus;
23
 import org.apache.http.HttpStatus;
19
 import org.springframework.web.bind.annotation.*;
24
 import org.springframework.web.bind.annotation.*;
116
             return ResponseBean.error("更新数据失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
121
             return ResponseBean.error("更新数据失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
117
         }
122
         }
118
     }
123
     }
124
+    @ApiOperation(value = "访客预约信息",httpMethod = "访客预约信息")
125
+    @RequestMapping(value="/visitorAppointmentList",method= RequestMethod.GET)
126
+    @ApiImplicitParams({
127
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "platNumber", value = "车牌"),
128
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "personName", value = "预约人姓名"),
129
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "预约人电话")})
130
+    public ResponseBean visitorAppointmentList(@RequestParam(defaultValue = "1") int pageNumber,
131
+                             @RequestParam(defaultValue = "10") int pageSize,
132
+                             @RequestParam(value = "platNumber",required = false) String platNumber,
133
+                             @RequestParam(value = "personName",required = false) String personName,
134
+                             @RequestParam(value = "phone",required = false) String phone){
135
+
136
+        IPage<TaVisitorAppointment> pg = new Page<>(pageNumber, pageSize);
137
+        ResponseBean result = taVisitorAppointmentService.visitorAppointmentList(pg,platNumber,personName,phone);
138
+        return result;
139
+    }
140
+
119
 }
141
 }

+ 9
- 1
src/main/java/com.huiju.welcome/mapper/TaCarRecordMapper.java View File

1
 package com.huiju.welcome.mapper;
1
 package com.huiju.welcome.mapper;
2
 
2
 
3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.huiju.welcome.model.TaCarRecord;
5
 import com.huiju.welcome.model.TaCarRecord;
5
 import org.apache.ibatis.annotations.Mapper;
6
 import org.apache.ibatis.annotations.Mapper;
7
+import org.apache.ibatis.annotations.Param;
8
+
9
+import java.time.LocalDate;
10
+import java.time.LocalDateTime;
11
+import java.util.Date;
6
 
12
 
7
 /**
13
 /**
8
  * <p>
14
  * <p>
10
  * </p>
16
  * </p>
11
  *
17
  *
12
  * @author jobob
18
  * @author jobob
13
- * @since 2019-06-11
19
+ * @since 2019-06-18
14
  */
20
  */
15
 @Mapper
21
 @Mapper
16
 public interface TaCarRecordMapper extends BaseMapper<TaCarRecord> {
22
 public interface TaCarRecordMapper extends BaseMapper<TaCarRecord> {
17
 
23
 
24
+    IPage<TaCarRecord> getPageList(IPage<TaCarRecord> page, @Param("plateNumber") String plateNumber, @Param("recordDate") Date recordDate, @Param("customerName") String customerName, @Param("phone") String phone);
25
+
18
 }
26
 }

+ 12
- 0
src/main/java/com.huiju.welcome/mapper/TaFirstUsherRecordMapper.java View File

1
 package com.huiju.welcome.mapper;
1
 package com.huiju.welcome.mapper;
2
 
2
 
3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.huiju.welcome.model.TaFirstUsherRecord;
5
 import com.huiju.welcome.model.TaFirstUsherRecord;
5
 import org.apache.ibatis.annotations.Mapper;
6
 import org.apache.ibatis.annotations.Mapper;
7
+import org.apache.ibatis.annotations.Param;
8
+
9
+import java.util.Date;
6
 
10
 
7
 /**
11
 /**
8
  * <p>
12
  * <p>
15
 @Mapper
19
 @Mapper
16
 public interface TaFirstUsherRecordMapper extends BaseMapper<TaFirstUsherRecord> {
20
 public interface TaFirstUsherRecordMapper extends BaseMapper<TaFirstUsherRecord> {
17
 
21
 
22
+    /**
23
+     * 分页查询安保记录
24
+     * @param pg
25
+     * @param plateNumber
26
+     * @param visiteDate
27
+     * @return
28
+     */
29
+    IPage<TaFirstUsherRecord> taFirstUsherRecordlist(IPage pg, @Param("plateNumber") String plateNumber, @Param("visiteDate")String visiteDate);
18
 }
30
 }

+ 8
- 0
src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java View File

1
 package com.huiju.welcome.mapper;
1
 package com.huiju.welcome.mapper;
2
 
2
 
3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.huiju.welcome.model.TaMainUsherRecord;
5
 import com.huiju.welcome.model.TaMainUsherRecord;
5
 import com.huiju.welcome.model.TaPerson;
6
 import com.huiju.welcome.model.TaPerson;
6
 import org.apache.ibatis.annotations.Mapper;
7
 import org.apache.ibatis.annotations.Mapper;
20
 @Mapper
21
 @Mapper
21
 public interface TaMainUsherRecordMapper extends BaseMapper<TaMainUsherRecord> {
22
 public interface TaMainUsherRecordMapper extends BaseMapper<TaMainUsherRecord> {
22
     Map<String,Object> getSummaryOfCustomer(@Param("customerId") Integer customerId);
23
     Map<String,Object> getSummaryOfCustomer(@Param("customerId") Integer customerId);
24
+
25
+    /**
26
+     * 分页查询大厅人员记录
27
+     * @param pg
28
+     * @return
29
+     */
30
+    IPage<TaMainUsherRecord> aMainUsherRecordList(IPage<TaMainUsherRecord> pg);
23
 }
31
 }

+ 8
- 0
src/main/java/com.huiju.welcome/mapper/TaVisitorAppointmentMapper.java View File

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

+ 19
- 3
src/main/java/com.huiju.welcome/model/TaCarRecord.java View File

1
 package com.huiju.welcome.model;
1
 package com.huiju.welcome.model;
2
 
2
 
3
 import com.baomidou.mybatisplus.annotation.IdType;
3
 import com.baomidou.mybatisplus.annotation.IdType;
4
-import com.baomidou.mybatisplus.annotation.TableId;
5
-import java.time.LocalDateTime;
6
 import java.io.Serializable;
4
 import java.io.Serializable;
5
+import com.baomidou.mybatisplus.annotation.TableField;
6
+import com.baomidou.mybatisplus.annotation.TableId;
7
+import com.baomidou.mybatisplus.annotation.TableName;
7
 import lombok.Data;
8
 import lombok.Data;
8
 import lombok.EqualsAndHashCode;
9
 import lombok.EqualsAndHashCode;
9
 import lombok.experimental.Accessors;
10
 import lombok.experimental.Accessors;
10
 
11
 
12
+import java.io.Serializable;
13
+import java.time.LocalDateTime;
14
+
11
 /**
15
 /**
12
  * <p>
16
  * <p>
13
  * 
17
  * 
14
  * </p>
18
  * </p>
15
  *
19
  *
16
  * @author jobob
20
  * @author jobob
17
- * @since 2019-06-11
21
+ * @since 2019-06-18
18
  */
22
  */
19
 @Data
23
 @Data
20
 @EqualsAndHashCode(callSuper = false)
24
 @EqualsAndHashCode(callSuper = false)
21
 @Accessors(chain = true)
25
 @Accessors(chain = true)
26
+@TableName("ta_car_record")
22
 public class TaCarRecord implements Serializable {
27
 public class TaCarRecord implements Serializable {
23
 
28
 
24
     private static final long serialVersionUID = 1L;
29
     private static final long serialVersionUID = 1L;
40
 
45
 
41
     private LocalDateTime createDate;
46
     private LocalDateTime createDate;
42
 
47
 
48
+    /**
49
+     * 客户姓名
50
+     */
51
+    @TableField(exist = false)
52
+    private String customerName;
53
+
54
+    /**
55
+     * 手机号
56
+     */
57
+    @TableField(exist = false)
58
+    private String phone;
43
 
59
 
44
 }
60
 }

+ 10
- 0
src/main/java/com.huiju.welcome/model/TaFirstUsherRecord.java View File

34
 
34
 
35
     private Integer personNum;
35
     private Integer personNum;
36
 
36
 
37
+    private String color;
38
+
39
+    private String channel;
40
+
41
+    private String purpose;
42
+
43
+    private String personName;
44
+
45
+    private String carImage;
46
+
37
     private Boolean appointment;
47
     private Boolean appointment;
38
 
48
 
39
     private LocalDateTime visiteDate;
49
     private LocalDateTime visiteDate;

+ 16
- 1
src/main/java/com.huiju.welcome/service/ITaCarRecordService.java View File

1
 package com.huiju.welcome.service;
1
 package com.huiju.welcome.service;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
3
 import com.baomidou.mybatisplus.extension.service.IService;
4
 import com.baomidou.mybatisplus.extension.service.IService;
4
 import com.huiju.welcome.model.TaCarRecord;
5
 import com.huiju.welcome.model.TaCarRecord;
5
 
6
 
7
+import java.time.LocalDate;
8
+import java.time.LocalDateTime;
9
+import java.util.Date;
10
+
6
 /**
11
 /**
7
  * <p>
12
  * <p>
8
  *  服务类
13
  *  服务类
9
  * </p>
14
  * </p>
10
  *
15
  *
11
  * @author jobob
16
  * @author jobob
12
- * @since 2019-06-11
17
+ * @since 2019-06-18
13
  */
18
  */
14
 public interface ITaCarRecordService extends IService<TaCarRecord> {
19
 public interface ITaCarRecordService extends IService<TaCarRecord> {
15
 
20
 
21
+    /**
22
+     * 根据条件查询
23
+     * @param page
24
+     * @param plateNumber
25
+     * @param recordDate
26
+     * @param customerName
27
+     * @param phone
28
+     * @return
29
+     */
30
+    IPage<TaCarRecord> getPageList(IPage<TaCarRecord> page, String plateNumber, Date recordDate, String customerName, String phone);
16
 }
31
 }

+ 7
- 0
src/main/java/com.huiju.welcome/service/ITaFirstUsherRecordService.java View File

1
 package com.huiju.welcome.service;
1
 package com.huiju.welcome.service;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
3
 import com.baomidou.mybatisplus.extension.service.IService;
4
 import com.baomidou.mybatisplus.extension.service.IService;
4
 import com.huiju.welcome.model.TaFirstUsherRecord;
5
 import com.huiju.welcome.model.TaFirstUsherRecord;
5
 
6
 
6
 import java.util.List;
7
 import java.util.List;
8
+import java.util.Date;
7
 
9
 
8
 /**
10
 /**
9
  * <p>
11
  * <p>
14
  * @since 2019-06-04
16
  * @since 2019-06-04
15
  */
17
  */
16
 public interface ITaFirstUsherRecordService extends IService<TaFirstUsherRecord> {
18
 public interface ITaFirstUsherRecordService extends IService<TaFirstUsherRecord> {
19
+    /**
20
+     * 查询安保记录
21
+     * @return
22
+     */
23
+    IPage<TaFirstUsherRecord> taFirstUsherRecordlist(IPage<TaFirstUsherRecord> pg,String plateNumber, String visiteDate);
17
 
24
 
18
     boolean updateNormal(List<TaFirstUsherRecord> records);
25
     boolean updateNormal(List<TaFirstUsherRecord> records);
19
 }
26
 }

+ 7
- 0
src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java View File

1
 package com.huiju.welcome.service;
1
 package com.huiju.welcome.service;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
3
 import com.baomidou.mybatisplus.extension.service.IService;
4
 import com.baomidou.mybatisplus.extension.service.IService;
4
 import com.huiju.welcome.model.TaCustomer;
5
 import com.huiju.welcome.model.TaCustomer;
5
 import com.huiju.welcome.model.TaMainUsherRecord;
6
 import com.huiju.welcome.model.TaMainUsherRecord;
19
     boolean updateNormal(List<TaMainUsherRecord> recs);
20
     boolean updateNormal(List<TaMainUsherRecord> recs);
20
 
21
 
21
     boolean newRecordByFront(TaCustomer taCustomer);
22
     boolean newRecordByFront(TaCustomer taCustomer);
23
+    /**
24
+     * 分页查询大厅记录
25
+     * @param pg
26
+     * @return
27
+     */
28
+    IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg);
22
 }
29
 }

+ 8
- 0
src/main/java/com.huiju.welcome/service/ITaVisitorAppointmentService.java View File

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

+ 14
- 1
src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java View File

1
 package com.huiju.welcome.service.impl;
1
 package com.huiju.welcome.service.impl;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
3
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4
 import com.huiju.welcome.mapper.TaCarRecordMapper;
5
 import com.huiju.welcome.mapper.TaCarRecordMapper;
5
 import com.huiju.welcome.model.TaCarRecord;
6
 import com.huiju.welcome.model.TaCarRecord;
6
 import com.huiju.welcome.service.ITaCarRecordService;
7
 import com.huiju.welcome.service.ITaCarRecordService;
8
+import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.stereotype.Service;
9
 import org.springframework.stereotype.Service;
8
 
10
 
11
+import java.time.LocalDate;
12
+import java.time.LocalDateTime;
13
+import java.util.Date;
14
+
9
 /**
15
 /**
10
  * <p>
16
  * <p>
11
  *  服务实现类
17
  *  服务实现类
12
  * </p>
18
  * </p>
13
  *
19
  *
14
  * @author jobob
20
  * @author jobob
15
- * @since 2019-06-11
21
+ * @since 2019-06-18
16
  */
22
  */
17
 @Service
23
 @Service
18
 public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCarRecord> implements ITaCarRecordService {
24
 public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCarRecord> implements ITaCarRecordService {
19
 
25
 
26
+    @Autowired
27
+    private TaCarRecordMapper taCarRecordMapper;
28
+
29
+    @Override
30
+    public IPage<TaCarRecord> getPageList(IPage<TaCarRecord> page, String plateNumber, Date recordDate, String customerName, String phone) {
31
+        return taCarRecordMapper.getPageList(page, plateNumber, recordDate, customerName, phone);
32
+    }
20
 }
33
 }

+ 12
- 0
src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java View File

1
 package com.huiju.welcome.service.impl;
1
 package com.huiju.welcome.service.impl;
2
 
2
 
3
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
3
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
 import com.huiju.welcome.mapper.TaFirstUsherRecordMapper;
6
 import com.huiju.welcome.mapper.TaFirstUsherRecordMapper;
6
 import com.huiju.welcome.model.TaFirstUsherRecord;
7
 import com.huiju.welcome.model.TaFirstUsherRecord;
11
 
12
 
12
 import java.util.ArrayList;
13
 import java.util.ArrayList;
13
 import java.util.List;
14
 import java.util.List;
15
+import java.text.SimpleDateFormat;
16
+import java.util.Date;
14
 
17
 
15
 /**
18
 /**
16
  * <p>
19
  * <p>
24
 public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecordMapper, TaFirstUsherRecord> implements ITaFirstUsherRecordService {
27
 public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecordMapper, TaFirstUsherRecord> implements ITaFirstUsherRecordService {
25
     @Autowired
28
     @Autowired
26
     TaFirstUsherRecordMapper taFirstUsherRecordMapper;
29
     TaFirstUsherRecordMapper taFirstUsherRecordMapper;
30
+    
31
+    @Autowired
32
+    private TaFirstUsherRecordMapper taFirstUsherRecordMapper;
27
 
33
 
28
     @Override
34
     @Override
29
     public boolean updateNormal(List<TaFirstUsherRecord> records) {
35
     public boolean updateNormal(List<TaFirstUsherRecord> records) {
41
         int row = taFirstUsherRecordMapper.update(new TaFirstUsherRecord(), wrapper);
47
         int row = taFirstUsherRecordMapper.update(new TaFirstUsherRecord(), wrapper);
42
         return row >= 0;
48
         return row >= 0;
43
     }
49
     }
50
+    
51
+    @Override
52
+    public IPage<TaFirstUsherRecord> taFirstUsherRecordlist(IPage pg,String plateNumber, String visiteDate) {
53
+        IPage<TaFirstUsherRecord> pageTaFirstUsherRecord= taFirstUsherRecordMapper.taFirstUsherRecordlist(pg,plateNumber,visiteDate);
54
+        return pageTaFirstUsherRecord;
55
+    }
44
 }
56
 }

+ 10
- 0
src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java View File

1
 package com.huiju.welcome.service.impl;
1
 package com.huiju.welcome.service.impl;
2
 
2
 
3
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
3
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
 import com.huiju.welcome.mapper.TaMainUsherRecordMapper;
6
 import com.huiju.welcome.mapper.TaMainUsherRecordMapper;
6
 import com.huiju.welcome.model.TaCustomer;
7
 import com.huiju.welcome.model.TaCustomer;
27
 public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordMapper, TaMainUsherRecord> implements ITaMainUsherRecordService {
28
 public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordMapper, TaMainUsherRecord> implements ITaMainUsherRecordService {
28
     @Autowired
29
     @Autowired
29
     TaMainUsherRecordMapper taMainUsherRecordMapper;
30
     TaMainUsherRecordMapper taMainUsherRecordMapper;
31
+    
32
+    @Autowired
33
+    private  TaMainUsherRecordMapper taMainUsherRecordMapper;
30
 
34
 
31
     @Override
35
     @Override
32
     public boolean updateNormal(List<TaMainUsherRecord> records) {
36
     public boolean updateNormal(List<TaMainUsherRecord> records) {
61
 
65
 
62
         return row > 0;
66
         return row > 0;
63
     }
67
     }
68
+    
69
+    @Override
70
+    public IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg) {
71
+        IPage<TaMainUsherRecord>  taMainUsherRecordList= taMainUsherRecordMapper.aMainUsherRecordList(pg);
72
+        return taMainUsherRecordList;
73
+    }
64
 }
74
 }

+ 14
- 0
src/main/java/com.huiju.welcome/service/impl/TaVisitorAppointmentServiceImpl.java View File

1
 package com.huiju.welcome.service.impl;
1
 package com.huiju.welcome.service.impl;
2
 
2
 
3
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
3
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
 import com.huiju.welcome.common.base.ResponseBean;
6
 import com.huiju.welcome.common.base.ResponseBean;
6
 import com.huiju.welcome.mapper.TaVisitorAppointmentMapper;
7
 import com.huiju.welcome.mapper.TaVisitorAppointmentMapper;
12
 import org.springframework.stereotype.Service;
13
 import org.springframework.stereotype.Service;
13
 
14
 
14
 import java.time.LocalDateTime;
15
 import java.time.LocalDateTime;
16
+import java.time.LocalDateTime;
17
+import java.util.Date;
15
 import java.util.List;
18
 import java.util.List;
16
 
19
 
17
 /**
20
 /**
26
 public class TaVisitorAppointmentServiceImpl extends ServiceImpl<TaVisitorAppointmentMapper, TaVisitorAppointment> implements ITaVisitorAppointmentService {
29
 public class TaVisitorAppointmentServiceImpl extends ServiceImpl<TaVisitorAppointmentMapper, TaVisitorAppointment> implements ITaVisitorAppointmentService {
27
     @Autowired
30
     @Autowired
28
     TaVisitorAppointmentMapper taVisitorAppointmentMapper;
31
     TaVisitorAppointmentMapper taVisitorAppointmentMapper;
32
+    
33
+    @Autowired
34
+    private TaVisitorAppointmentMapper taVisitorAppointmentMapper;
29
 
35
 
30
     @Override
36
     @Override
31
     public ResponseBean check(TaVisitorAppointment taVisitorAppointment) {
37
     public ResponseBean check(TaVisitorAppointment taVisitorAppointment) {
40
 
46
 
41
         return ResponseBean.success("");
47
         return ResponseBean.success("");
42
     }
48
     }
49
+    
50
+    @Override
51
+    public ResponseBean visitorAppointmentList(IPage pg, String platNumber, String personName,String phone) {
52
+       ResponseBean responseBean= new ResponseBean();
53
+        IPage<TaVisitorAppointment> list= taVisitorAppointmentMapper.visitorAppointmentList(pg,platNumber,personName,phone);
54
+        responseBean.addSuccess(list);
55
+        return responseBean;
56
+    }
43
 }
57
 }

+ 20
- 0
src/main/resources/mapper/TaCarRecordMapper.xml View File

2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
 <mapper namespace="com.huiju.welcome.mapper.TaCarRecordMapper">
3
 <mapper namespace="com.huiju.welcome.mapper.TaCarRecordMapper">
4
 
4
 
5
+    <select id="getPageList" resultType="com.huiju.welcome.model.TaCarRecord" >
6
+      select * from ta_car_record tcr left join ta_customer tc on tcr.driver_id = tc.customer_id
7
+      <where>
8
+          <trim prefixOverrides="or | and">
9
+              <if test="plateNumber != null and plateNumber != ''">
10
+                  and tcr.plate_number like concat('%', #{plateNumber},'%')
11
+              </if>
12
+              <if test="customerName != null and customerName != ''">
13
+                  and tc.customer_name like concat('%', #{customerName},'%')
14
+              </if>
15
+              <if test="phone != null and phone != ''">
16
+                  and tc.phone like concat('%', #{phone}, '%')
17
+              </if>
18
+              <if test="recordDate != null">
19
+                  and DATE_FORMAT( tcr.create_date, '%Y-%m-%d' ) = DATE_FORMAT(#{recordDate}, '%Y-%m-%d' )
20
+              </if>
21
+          </trim>
22
+      </where>
23
+    </select>
24
+
5
 </mapper>
25
 </mapper>

+ 16
- 0
src/main/resources/mapper/TaFirstUsherRecordMapper.xml View File

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

+ 6
- 0
src/main/resources/mapper/TaMainUsherRecordMapper.xml View File

10
         WHERE
10
         WHERE
11
             t.customer_id = #{customerId}
11
             t.customer_id = #{customerId}
12
     </select>
12
     </select>
13
+    <select id="aMainUsherRecordList" resultType="com.huiju.welcome.model.TaMainUsherRecord">
14
+        SELECT
15
+        *
16
+        FROM
17
+        ta_main_usher_record
18
+    </select>
13
 </mapper>
19
 </mapper>

+ 16
- 0
src/main/resources/mapper/TaVisitorAppointmentMapper.xml View File

14
         )
14
         )
15
         AND t.`status` &gt; 0
15
         AND t.`status` &gt; 0
16
     </select>
16
     </select>
17
+    <select id="visitorAppointmentList" resultType="com.huiju.welcome.model.TaVisitorAppointment">
18
+        select * from ta_visitor_appointment
19
+        <where>
20
+            <if test="personName !=null and personName !=''">
21
+                person_name LIKE CONCAT('%',#{personName},'%')
22
+            </if>
23
+            <if test="phone !=null and phone !=''">
24
+                phone LIKE CONCAT('%',#{phone},'%')
25
+            </if>
26
+            <if test="platNumber !=null and platNumber !=''">
27
+                plat_number LIKE CONCAT('%',#{platNumber},'%')
28
+            </if>
29
+        </where>
30
+        order by create_date desc
31
+    </select>
32
+
17
 </mapper>
33
 </mapper>