From 8e2586a0e5f2412c1bf8bc6f7a31b184ca9278ce Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Wed, 14 Aug 2024 16:25:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/CarMainController.java   | 23 ++++++++++--
 .../module/custom/mapper/CarMainMapper.java   | 12 ++++++-
 .../module/custom/service/CarMainService.java |  9 +++++
 .../service/impl/CarMainServiceImpl.java      | 14 ++++++++
 .../yudao/module/custom/vo/CarMainReqVO.java  |  4 +++
 .../yudao/module/custom/vo/CarMainRespVO.java | 15 +++++---
 .../resources/mapper/custom/CarMainMapper.xml | 35 +++++++++++++++++++
 7 files changed, 103 insertions(+), 9 deletions(-)

diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CarMainController.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CarMainController.java
index d6ce57a8..3a17ac25 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CarMainController.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CarMainController.java
@@ -120,14 +120,30 @@ public class CarMainController {
         return success(pageResult);
     }
 
+    /**
+     * 保险/年检/保养提醒列表
+     *
+     * @param pageReqVO CarMainReqVO（入参）
+     * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<com.baomidou.mybatisplus.core.metadata.IPage < cn.iocoder.yudao.module.custom.vo.CarMainRespVO>>
+     * @author PQZ
+     * @date 11:01 2024/8/14
+     **/
+    @GetMapping("/remindCarMainPage")
+    @Operation(summary = "获得车辆信息分页")
+    public CommonResult<IPage<CarMainRespVO>> remindCarMainPage(CarMainReqVO pageReqVO) {
+        IPage<CarMainRespVO> pageResult = carMainService.remindCarMainPage(pageReqVO);
+        return success(pageResult);
+    }
+
 
     /**
      * 测算车辆下一次保养/检测/保险时间
-     * @author PQZ
-     * @date 11:48 2024/8/13
+     *
      * @param pageReqVO CarMainReqVO
      * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<cn.iocoder.yudao.module.custom.vo.CarMainRespVO>
-    **/
+     * @author PQZ
+     * @date 11:48 2024/8/13
+     **/
     @PostMapping("/compute")
     @Operation(summary = "测算车辆下一次保养/检测/保险时间")
     public CommonResult<CarMainRespVO> compute(@RequestBody CarMainReqVO pageReqVO) {
@@ -135,6 +151,7 @@ public class CarMainController {
         return success(result);
     }
 
+
     /**
      * 导出车辆信息
      *
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/CarMainMapper.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/CarMainMapper.java
index f4223db8..088c12ff 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/CarMainMapper.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/CarMainMapper.java
@@ -29,6 +29,17 @@ public interface CarMainMapper extends BaseMapper<CarMain> {
      */
     IPage<CarMainRespVO> findPage(Page<CarMainReqVO> page, @Param("dto") CarMainReqVO pageReqVO);
 
+    /**
+     * 保险/年检/保养提醒列表
+     *
+     * @param page      Page<CarMainReqVO>
+     * @param pageReqVO CarMainReqVO
+     * @return com.baomidou.mybatisplus.core.metadata.IPage<cn.iocoder.yudao.module.custom.vo.CarMainRespVO>
+     * @author PQZ
+     * @date 9:12 2024/8/14
+     **/
+    IPage<CarMainRespVO> remindCarMainPage(Page<CarMainReqVO> page, @Param("entity") CarMainReqVO pageReqVO);
+
     /**
      * 获得车辆信息分页
      *
@@ -38,7 +49,6 @@ public interface CarMainMapper extends BaseMapper<CarMain> {
     CarMainRespVO findOne(@Param("id") String id);
 
 
-
     /**
      * 车牌号，车架号，发动机号码 查重
      *
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CarMainService.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CarMainService.java
index bfed4318..42ade09f 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CarMainService.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CarMainService.java
@@ -60,6 +60,15 @@ public interface CarMainService extends IService<CarMain> {
      */
     IPage<CarMainRespVO> getCarMainPage(CarMainReqVO pageReqVO);
 
+    /**
+     * 保险/年检/保养提醒列表
+     * @author PQZ
+     * @date 9:08 2024/8/14
+     * @param pageReqVO 查询条件
+     * @return com.baomidou.mybatisplus.core.metadata.IPage<cn.iocoder.yudao.module.custom.vo.CarMainRespVO>
+    **/
+    IPage<CarMainRespVO> remindCarMainPage(CarMainReqVO pageReqVO);
+
 
     /**
      * 绑定车辆信息
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java
index e1c95b42..765acafe 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java
@@ -190,6 +190,20 @@ public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> impl
         return baseMapper.findPage(page, pageReqVO);
     }
 
+    /**
+     * 保险/年检/保养提醒列表
+     *
+     * @param pageReqVO 查询条件
+     * @return com.baomidou.mybatisplus.core.metadata.IPage<cn.iocoder.yudao.module.custom.vo.CarMainRespVO>
+     * @author PQZ
+     * @date 9:08 2024/8/14
+     **/
+    @Override
+    public IPage<CarMainRespVO> remindCarMainPage(CarMainReqVO pageReqVO) {
+        Page<CarMainReqVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+        return baseMapper.remindCarMainPage(page,pageReqVO);
+    }
+
     /**
      * 绑定客户信息
      *
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainReqVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainReqVO.java
index cc30d480..96bfd65e 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainReqVO.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainReqVO.java
@@ -41,4 +41,8 @@ public class CarMainReqVO extends CarMain {
     List<BusiLabel> labelList;
     /**车辆品牌型号数组*/
     List<String> brandAndModel;
+    /**客户名称*/
+    String cusName;
+    /**查询标识(01:年检临期；02：保养临期；03：保险临期)*/
+    String selectSign;
 }
\ No newline at end of file
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainRespVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainRespVO.java
index 6f9e3ff0..535a4951 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainRespVO.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainRespVO.java
@@ -17,9 +17,6 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ExcelIgnoreUnannotated
 public class CarMainRespVO extends CarMain {
 
-
-
-
     /**是否车主（0否1是）*/
     @Schema(description = "是否车主（0否1是）")
     private String isOwner;
@@ -33,8 +30,16 @@ public class CarMainRespVO extends CarMain {
     String brandStr;
     /**型号字符*/
     String modelStr;
-
-
+    /**客户名称*/
+    String cusName;
+    /**电话号码*/
+    String phoneNumber;
+    /**年检剩余*/
+    String njCont;
+    /**保险剩余*/
+    String byCont;
+    /**保险剩余*/
+    String bxCont;
     /**车辆品牌型号数组*/
     List<String> brandAndModel;
 
diff --git a/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml b/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml
index 708155b5..b70414c2 100644
--- a/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml
+++ b/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml
@@ -109,5 +109,40 @@
         </if>
 
     </select>
+    <select id="remindCarMainPage" resultType="cn.iocoder.yudao.module.custom.vo.CarMainRespVO">
+        SELECT
+            <include refid="baseCarMainColumn"></include>,
+            bcc.is_owner AS isOwner,
+            bcm.cus_name AS cusName,
+            bcm.phone_number AS phoneNumber,
+            bcb.brand_name AS brandStr,
+            bcmm.model_name AS modelStr,
+            DATEDIFF(tbcm.next_inspection_date, CURDATE()) AS njCont,
+            DATEDIFF(tbcm.next_maintenance_date, CURDATE()) AS byCont,
+            DATEDIFF(tbcm.insurance_expiry_date, CURDATE()) AS bxCont
+        FROM
+            base_car_main tbcm
+                LEFT JOIN base_customer_car bcc ON tbcm.id = bcc.car_id AND bcc.deleted = 0
+                LEFT JOIN base_customer_main bcm ON bcc.cus_id = bcm.id AND bcm.deleted = 0
+                LEFT JOIN base_car_brand bcb ON bcb.deleted = 0 AND tbcm.car_brand = bcb.id
+                LEFT JOIN base_car_model bcmm ON bcmm.deleted = 0 AND tbcm.car_model = bcmm.id
+        WHERE
+            tbcm.deleted = 0
+        <if test="entity.licenseNumber != null and entity.licenseNumber != ''">
+            AND tbcm.license_number LIKE CONCAT('%',#{entity.licenseNumber},'%')
+        </if>
+        <if test="entity.cusName != null and entity.cusName != ''">
+            AND bcm.cus_name LIKE CONCAT('%',#{entity.cusName},'%')
+        </if>
+        <if test="entity.selectSign == '01'">
+            AND tbcm.next_inspection_date BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 3 MONTH)
+        </if>
+        <if test="entity.selectSign == '02'">
+            AND tbcm.next_maintenance_date BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 6 MONTH)
+        </if>
+        <if test="entity.selectSign == '03'">
+            AND tbcm.insurance_expiry_date BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 45 DAY)
+        </if>
+    </select>
 
 </mapper>
\ No newline at end of file