From 42cce7d9a859083818a0e10eb3b6c80385042e47 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 18 三月 2023 18:20:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml                |    2 +-
 ycl-platform/src/main/resources/mapper/unlawful/UnlawfulMapper.xml                   |    2 +-
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java |    6 +++---
 ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java                  |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java b/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
index 33b7dfd..6a98d88 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
@@ -48,7 +48,7 @@
      */
     @ApiModelProperty(value = "妗堜欢绛夌骇")
     @NotNull(message = "涓嶅厑璁告浠剁瓑绾т负绌�")
-    private Integer gradeId;
+    private Long gradeId;
 
     /**
      * 鎵�灞炶閬�
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index 7fcdf5c..1c62e64 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -170,11 +170,11 @@
     }
 
     @Override
-    public Page listViolationsPage(Page page, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime,Integer violationsTypeId) {
+    public Page listViolationsPage(Page page, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId) {
         Integer type = 01;
         Integer hours = 60;
         Integer day = 24;
-        Page<CasePoolViolationVO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource, code, categoryBig, categorySmall, street, site, startTime, endTime,violationsTypeId);
+        Page<CasePoolViolationVO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId);
         violationsPage.getRecords().stream().forEach(item -> {
             if (item.getCloseTime() == null) {
                 Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now());
@@ -206,7 +206,7 @@
         Integer value = 1;
         violations.setId(id);
         setDisposeRecord(id, violationParam.getLimitTime());
-        return violationsMapper.insert(violations) == value ? true : false;
+        return violationsMapper.insert(violations) == value;
     }
 
     private void setDisposeRecord(Long id, String limitTime) {
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index fc399d2..12be977 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -356,7 +356,7 @@
 
     </select>
     <select id="areaCount" resultType="com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO">
-        SELECT t2.region_name,
+        SELECT t2.region_name name,
                COUNT(1) AS count
         FROM
             `ums_base_case` t1
diff --git a/ycl-platform/src/main/resources/mapper/unlawful/UnlawfulMapper.xml b/ycl-platform/src/main/resources/mapper/unlawful/UnlawfulMapper.xml
index c7a5b02..b782959 100644
--- a/ycl-platform/src/main/resources/mapper/unlawful/UnlawfulMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/unlawful/UnlawfulMapper.xml
@@ -96,7 +96,7 @@
         GROUP BY
         DATE_FORMAT(ubc.alarm_time,'%Y-%m-%d')
         ORDER BY
-        DATE_FORMAT(ubc.alarm_time,'%Y-%m-%d')
+        DATE_FORMAT(ubc.alarm_time,'%Y-%m-%d') desc
     </select>
 
     <select id="getDataByPoint" resultType="com.ycl.dto.statistics.UnlawfulDto">

--
Gitblit v1.8.0