From b3190b020a4d67d88cae9042fd6014fe0b4925d2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 15 Mar 2021 09:43:35 +0800
Subject: [PATCH] 包裹统计数据本周数据修改（新增状态status=3本周）
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
index 52e92e2..88bc7f7 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
@@ -44,6 +44,7 @@
if (null!=conditionVo.getStatus()) {
//获取数据
List<Object> objectList = getParcelData(conditionVo,PARCEL_CONTRABAND_URL,PARCEL_KEY,PARCEL_SECRET);
+ System.out.println("objectList = " + objectList);
Map<String,String> mapCode = new HashMap<>();
//遍历集合，存储所有的违禁包裹编码
for (Object object : objectList) {
@@ -63,7 +64,7 @@
if (value.equals(objectMap.get("objCode").toString())){
count+=Integer.parseInt(objectMap.get("objCount").toString());
map.put("name",objectMap.get("objName").toString());
- map.put("value",objectMap.get("objCount").toString());
+ map.put("value",count);
}
}
list.add(map);
@@ -170,6 +171,12 @@
startDate = DateUtils.getPastDate(6,now());
endDate = DateUtils.getToday();
}
+ //2.4查询本周的数据
+ if (conditionVo.getStatus() == 3) {
+ //3.获取过去6天及当天开始时间和结束时间
+ startDate = DateUtils.getWeekStart();
+ endDate = DateUtils.getWeekEnd();
+ }
//2.2查询本月的数据
if (conditionVo.getStatus() == 2) {
//3.获取本月开始时间和结束时间
@@ -199,19 +206,19 @@
//获取包裹数据
List<Object> parcelData = getParcelData(conditionVo, PARCEL_URL, PARCEL_KEY, PARCEL_SECRET);
//查询当天的包裹总数
- Integer checkCount = null;
Integer dangerCount = null;
+ Integer contrabandCount = null;
if (status == 0) {
for (Object object : parcelData) {
//取出list里面的值转为map
Map<String, Object> objectMap = (Map<String, Object>) object;
- checkCount = Integer.parseInt(objectMap.get("checkCount").toString()); //安检包裹数量
dangerCount = Integer.parseInt(objectMap.get("dangerCount").toString()); //违禁包裹数量
+ contrabandCount = Integer.parseInt(objectMap.get("contrabandCount").toString()); //违禁物品数量
}
}
//封装数据
- list.add(checkCount);
list.add(dangerCount);
+ list.add(contrabandCount);
//返回数据
return list;
}
--
Gitblit v1.9.3