From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改
---
src/main/java/org/springblade/modules/information/controller/InformationsController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationsController.java b/src/main/java/org/springblade/modules/information/controller/InformationsController.java
index 6a4ec1b..18b19f5 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationsController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationsController.java
@@ -1,17 +1,29 @@
package org.springblade.modules.information.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.modules.information.excel.ExportInformationExcel;
+import org.springblade.modules.information.excel.ExportInformationSecurityStatistics;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.information.vo.InformationVO;
import org.springblade.modules.information.vo.ResponseVo;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.excel.UserExcel;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -182,7 +194,7 @@
for (ResponseVo responseVo : performanceGroupCountList) {
//辖区id相同则数量相加
if (responseVo.getId().equals(id)){
- count += performanceGroupCountList.get(i).getNum();
+ count += responseVo.getNum();
}
}
@@ -192,7 +204,7 @@
for (ResponseVo responseVo : examinationGroupCountList) {
//辖区id相同则数量相加
if (responseVo.getId().equals(id)){
- count += examinationGroupCountList.get(i).getNum();
+ count += responseVo.getNum();
}
}
@@ -201,7 +213,7 @@
for (ResponseVo responseVo : examPassingGroupCountList) {
//辖区id相同则数量相加
if (responseVo.getId().equals(id)){
- count += examPassingGroupCountList.get(i).getNum();
+ count += responseVo.getNum();
}
}
@@ -210,7 +222,7 @@
for (ResponseVo responseVo : holdGroupCountList) {
//辖区id相同则数量相加
if (responseVo.getId().equals(id)){
- count += holdGroupCountList.get(i).getNum();
+ count += responseVo.getNum();
}
}
@@ -219,7 +231,7 @@
for (ResponseVo responseVo : soidGroupCountList) {
//辖区id相同则数量相加
if (responseVo.getId().equals(id)){
- count += soidGroupCountList.get(i).getNum();
+ count += responseVo.getNum();
}
}
@@ -228,7 +240,7 @@
for (ResponseVo responseVo : dispatchGroupCountList) {
//辖区id相同则数量相加
if (responseVo.getId().equals(id)){
- count += dispatchGroupCountList.get(i).getNum();
+ count += responseVo.getNum();
}
}
@@ -241,5 +253,35 @@
return R.data(lists);
}
+ /**
+ * 保安员统计
+ */
+ @GetMapping("/export-security-statis-info")
+ public void exportSecurityStatisInfo(HttpServletResponse response,
+ String jurisdiction,
+ String deptid,
+ String stats,
+ String startTime,
+ String endTime)
+ {
+ List<ExportInformationSecurityStatistics> list = informationService.exportSecurityStatisInfo(jurisdiction, deptid, stats, startTime, endTime);
+ ExcelUtil.export(response, "保安员统计数据" + DateUtil.time(), "保安员统计数据表", list, ExportInformationSecurityStatistics.class);
+ }
+
+ /**
+ * 业务情况统计
+ */
+ @GetMapping("/export-business-statis")
+ public void exportBusinessStatis(HttpServletResponse response,
+ String jurisdiction,
+ String deptid,
+ String stats,
+ String startTime,
+ String endTime)
+ {
+ List<ExportInformationExcel> list = informationService.exportBusinessStatis(jurisdiction, deptid, stats, startTime, endTime);
+ ExcelUtil.export(response, "业务统计数据" + DateUtil.time(), "业务统计数据表", list, ExportInformationExcel.class);
+ }
+
}
--
Gitblit v1.9.3