From dd202fbaa4caea48aa5a0df620b87a6e41dba429 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 12 Mar 2021 16:24:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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..7fa25d0 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
@@ -199,19 +199,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