From 21db6e4c4c11099eb053c837a0a207a537bb6453 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期一, 18 一月 2021 16:31:12 +0800
Subject: [PATCH] 添加危废全年统计接口
---
src/main/java/com/nanometer/smartlab/api/ApiAction.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
index 9f38637..c13f87d 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -1576,7 +1576,7 @@
*/
@ResponseBody
@RequestMapping("hazardousWaste/getWasteInfo")
- public Object getLabAndUser(@RequestParam(required=true) int adminFlag,@RequestParam(required=true) String name,@RequestParam(required=false) String status
+ public Object getWasteInfo(@RequestParam(required=true) int adminFlag,@RequestParam(required=true) String name,@RequestParam(required=false) String status
,@RequestParam(required=false) String starttime,@RequestParam(required=false) String endtime){
try {
if (StringUtils.isBlank(name)){
@@ -1601,7 +1601,7 @@
*/
@ResponseBody
@RequestMapping("hazardousWaste/changeStatus")
- public Object getLabAndUser(@RequestParam(required=true) String tid,@RequestParam(required=true) String status,
+ public Object changeStatus(@RequestParam(required=true) String tid,@RequestParam(required=true) String status,
@RequestParam(required=true) String updator){
try {
if (StringUtils.isBlank(tid) || StringUtils.isBlank(status)){
@@ -1688,4 +1688,33 @@
}
+ /**
+ * 根据用户名获取危废全年统计列表
+ *
+ */
+ @ResponseBody
+ @RequestMapping("hazardousWaste/getWasteStatistics")
+ public Object getWasteStatistics(@RequestParam(required=true) int adminFlag,@RequestParam(required=true) String name){
+ try {
+ if (StringUtils.isBlank(name)){
+ return ResponseModel.getErrInstance("姓名不能为空");
+ }
+ Calendar calendar = Calendar.getInstance();
+ int year = calendar.get(Calendar.YEAR);
+ String status = "已确认";
+ String starttime = year+"-01-01 00:00:00";
+ String endtime = year+"-12-31 23:59:59";
+ List<HazardousWaste> hazardousWasters = new ArrayList<>();
+ if (adminFlag == 2){
+ hazardousWasters = hazardousWasteService.setAllWasterCount(starttime,endtime,status,null);
+ }else if (adminFlag == 1) {
+ hazardousWasters = hazardousWasteService.setAllWasterCount(starttime,endtime,status,name);
+ }
+ return ResponseModel.getOkInstence(hazardousWasters);
+ }catch (Exception e){
+ e.printStackTrace();
+ logger.info(e);
+ return ResponseModel.getErrInstance("系统出错");
+ }
+ }
}
--
Gitblit v1.9.2