From 642119e13713dcab1266522665c68aa407719be1 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 18:10:12 +0800
Subject: [PATCH] bug修改
---
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 +-
3 files changed, 5 insertions(+), 5 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/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