feats

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

@@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -23,4 +24,5 @@ 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);
 
+    List<TaCarRecord> getCarRecordTimeLine(@Param("dayBegin") String dayBegin);
 }

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

@@ -225,11 +225,13 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
         LocalDateTime now = LocalDateTime.now();
         String dayBegin = DateUtils.localDatetime2day(now) + " 00:00:00";
 
-        QueryWrapper<TaCarRecord> query = new QueryWrapper<>();
-        query.ge("create_date", dayBegin);
-        query.groupBy("plate_number");
-        query.orderByDesc("create_date");
-        List<TaCarRecord> result = taCarRecordMapper.selectList(query);
+//        QueryWrapper<TaCarRecord> query = new QueryWrapper<>();
+//        query.ge("create_date", dayBegin);
+//        query.groupBy("plate_number");
+//        query.orderByDesc("create_date");
+//        List<TaCarRecord> result = taCarRecordMapper.selectList(query);
+
+        List<TaCarRecord> result = taCarRecordMapper.getCarRecordTimeLine(dayBegin);
 
         return result;
     }

src/main/resources/application.yml

@@ -1,12 +1,12 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-#    username: welcome
-#    password: s190QU2#z%hdU%^FPkY9qjls
-    url: jdbc:mysql://47.101.36.130:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-    username: root
-    password: Wt4q*/9}i00q@0a4jM{z6O#h129@F/
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+    username: welcome
+    password: s190QU2#z%hdU%^FPkY9qjls
+#    url: jdbc:mysql://47.101.36.130:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+#    username: root
+#    password: Wt4q*/9}i00q@0a4jM{z6O#h129@F/
   servlet:
     multipart:
       max-file-size: 1024MB

src/main/resources/mapper/TaCarRecordMapper.xml

@@ -22,4 +22,21 @@
       </where>
     </select>
 
+    <select id="getCarRecordTimeLine" resultType="com.huiju.welcome.model.TaCarRecord">
+        SELECT
+            t.*
+        FROM
+            ta_car_record t
+        JOIN ta_car s ON t.plate_number = s.plate_number
+        AND s.type_id = 'normal'
+        JOIN ta_first_usher_record m ON t.plate_number = m.plate_number
+        AND m.`status` &gt; -1
+        WHERE
+            t.create_date &gt;= #{dayBegin}
+        GROUP BY
+            t.plate_number
+        ORDER BY
+            t.create_date DESC
+    </select>
+
 </mapper>