列表修改

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

@@ -151,12 +151,12 @@ public class TaFirstUsherRecordController extends BaseController {
     }
 
     @RequestMapping(value="/firstUsherRecord",method= RequestMethod.GET)
-    public ResponseBean list(@RequestParam(defaultValue = "1") int pageNumber,
+    public ResponseBean list(@RequestParam(defaultValue = "1") int pageNum,
                              @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> pg = new Page<>(pageNum, pageSize);
             IPage<TaFirstUsherRecord> result = iTaFirstUsherRecordService.taFirstUsherRecordlist(pg,plateNumber,visiteDate);
             responseBean.addSuccess(result);
             return responseBean;

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

@@ -195,12 +195,16 @@ public class TaMainUsherRecordController extends BaseController {
     }
 
     @RequestMapping(value="/mainUsherRecord",method= RequestMethod.GET)
-    public ResponseBean list(@RequestParam(defaultValue = "1") int pageNumber,
-                            @RequestParam(defaultValue = "10") int pageSize){
+    public ResponseBean list(@RequestParam(defaultValue = "1") int pageNum,
+                            @RequestParam(defaultValue = "10") int pageSize,
+                             @RequestParam(value = "phone",required = false) String phone,
+                             @RequestParam(value = "platNumber",required = false) String platNumber,
+                             @RequestParam(value = "personName",required = false) String personName,
+                             @RequestParam(value = "appointment",required = false) Integer appointment){
         ResponseBean responseBean = new ResponseBean();
 
-        IPage<TaMainUsherRecord> pg = new Page<>(pageNumber, pageSize);
-        IPage<TaMainUsherRecord> result = iTaMainUsherRecordService.taMainUsherRecordList(pg);
+        IPage<TaMainUsherRecord> pg = new Page<>(pageNum, pageSize);
+        IPage<TaMainUsherRecord> result = iTaMainUsherRecordService.taMainUsherRecordList(pg,phone,platNumber,personName,appointment);
         responseBean.addSuccess(result);
         return responseBean;
     }

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

@@ -121,19 +121,18 @@ public class TaVisitorAppointmentController extends BaseController {
             return ResponseBean.error("更新数据失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
         }
     }
-    @ApiOperation(value = "访客预约信息",httpMethod = "访客预约信息")
+    @ApiOperation(value = "访客预约信息",notes = "访客预约信息")
     @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);
+    public ResponseBean visitorAppointmentList(@RequestParam(defaultValue = "1") int pageNum,
+                                               @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<>(pageNum, pageSize);
         ResponseBean result = taVisitorAppointmentService.visitorAppointmentList(pg,platNumber,personName,phone);
         return result;
     }

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

@@ -25,5 +25,5 @@ public interface TaMainUsherRecordMapper extends BaseMapper<TaMainUsherRecord> {
      * @param pg
      * @return
      */
-    IPage<TaMainUsherRecord> aMainUsherRecordList(IPage<TaMainUsherRecord> pg);
+    IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg,@Param("phone")String phone,@Param("platNumber")String platNumber,@Param("personName")String personName,@Param("appointment")Integer appointment);
 }

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

@@ -26,7 +26,7 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
      * @param pg
      * @return
      */
-    IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg);
+    IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg,String phone,String platNumber,String personName,Integer appointment);
 
     /**
      * 查询客户列表

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

@@ -69,8 +69,8 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     }
     
     @Override
-    public IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg) {
-        IPage<TaMainUsherRecord>  taMainUsherRecordList= taMainUsherRecordMapper.aMainUsherRecordList(pg);
+    public IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg,String phone,String platNumber,String personName,Integer appointment) {
+        IPage<TaMainUsherRecord>  taMainUsherRecordList= taMainUsherRecordMapper.taMainUsherRecordList(pg,phone,platNumber,personName,appointment);
         return taMainUsherRecordList;
     }
 

src/main/resources/mapper/TaMainUsherRecordMapper.xml

@@ -10,10 +10,27 @@
         WHERE
             t.customer_id = #{customerId}
     </select>
-    <select id="aMainUsherRecordList" resultType="com.huiju.welcome.model.TaMainUsherRecord">
+    <select id="taMainUsherRecordList" resultType="com.huiju.welcome.model.TaMainUsherRecord">
         SELECT
         *
         FROM
         ta_main_usher_record
+        <where>
+            <if test="phone !=null and phone !=''">
+                phone LIKE CONCAT('%',#{phone},'%')
+            </if>
+            <if test="platNumber !=null and platNumber !=''">
+                plate_number LIKE CONCAT('%',#{platNumber},'%')
+            </if>
+
+            <if test="personName !=null and personName !=''">
+                person_name LIKE CONCAT('%',#{personName},'%')
+            </if>
+
+            <if test="appointment !=null">
+                appointment =#{appointment}
+            </if>
+        </where>
+        order by visite_date desc
     </select>
 </mapper>