From ab2b3291cb9e21885ed878d60f5afd6640d830f3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 19 九月 2022 18:05:24 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageCountRPCResp.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageCountRPCResp.java b/incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageCountRPCResp.java
index 0ce3a41..1f41a12 100644
--- a/incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageCountRPCResp.java
+++ b/incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageCountRPCResp.java
@@ -6,17 +6,29 @@
public class IncidentManageCountRPCResp {
- // 时间
- private String time ;
+ // 时间 如果查的是年，返回的是月份 ，如果查的是月，返回的是天
+ private Integer time ;
+
+ // 年
+ private Integer year ;
+
+ // 月
+ private Integer month;
+
+ // 日
+ private Integer day;
+
+ // 数据类型 1 ：年 2：月
+ private Integer distType;
// 数据
private List<IncidentManageCountDetailRPCResp> detail;
- public String getTime() {
+ public Integer getTime() {
return time;
}
- public void setTime(String time) {
+ public void setTime(Integer time) {
this.time = time;
}
@@ -27,4 +39,36 @@
public void setDetail(List<IncidentManageCountDetailRPCResp> detail) {
this.detail = detail;
}
+
+ public Integer getYear() {
+ return year;
+ }
+
+ public void setYear(Integer year) {
+ this.year = year;
+ }
+
+ public Integer getMonth() {
+ return month;
+ }
+
+ public void setMonth(Integer month) {
+ this.month = month;
+ }
+
+ public Integer getDay() {
+ return day;
+ }
+
+ public void setDay(Integer day) {
+ this.day = day;
+ }
+
+ public Integer getDistType() {
+ return distType;
+ }
+
+ public void setDistType(Integer distType) {
+ this.distType = distType;
+ }
}
--
Gitblit v1.9.2