柱状图

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceInputController.java

@@ -188,17 +188,33 @@ public class StorageDeviceInputController {
     	//入库数量
     	List<Map<String, Object>> queryCountByType = deviceInputService.queryCountByType();
     	String sumCount = "";
+    	String useCount = "";
     	if(queryCountByType.size()>0 && queryCountByType!=null){
     		for (Map<String, Object> map : queryCountByType) {
-        		int useCount = Integer.parseInt(map.get("userCounts").toString());
-        		sumCount = sumCount + useCount+",";
+        		/*int useCount = Integer.parseInt(map.get("userCounts").toString());
+        		sumCount = sumCount + useCount+",";*/
+    			//入库时的数量
+    			//String sumCounts = map.get("sumCounts").toString();
+    			//int sumCounts = Integer.valueOf(map.get("sumCounts").toString());
+    			String a = map.get("sumCounts").toString().substring(0, map.get("sumCounts").toString().length()-2);
+    			int sumCounts = Integer.valueOf(a);
+    			
+    			//使用数量
+    			int useCounts = sumCounts-Integer.parseInt(map.get("userCounts").toString());
+    			
+    			sumCount = sumCount + sumCounts+",";
+    			useCount = useCount + useCounts+",";
+    			
     		}
     		sumCount = sumCount.substring(0, sumCount.length()-1);
+    		useCount = useCount.substring(0, useCount.length()-1);
+    		System.out.println(sumCount+"****sumCount***");
+    		System.out.println(useCount+"****useCount***");
     	}
     	
     	returnMap.put("sumCount", sumCount);
     	
-    	//使用数量
+    	/*//使用数量
     	List<Map<String, Object>> queryUseCountByType = deviceGetService.queryCountByType();
     	String useCount = "";
     	if(queryUseCountByType.size()>0 && queryUseCountByType!=null){
@@ -207,7 +223,7 @@ public class StorageDeviceInputController {
         		useCount = useCount + getCount+",";
     		}
         	useCount = useCount.substring(0, useCount.length()-1);
-    	}
+    	}*/
     	
     	returnMap.put("useCount", useCount);
         return returnMap;

src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.xml

@@ -673,7 +673,7 @@
   <!-- 每个类型的入库数量 -->
   <select id="queryCountByType"  resultType="java.util.Map">
 
-    select SUM(use_count) userCounts,device_type from storage_deviceinput 
+    select SUM(use_count) userCounts,sum(device_manager)sumCounts,device_type from storage_deviceinput 
     GROUP BY device_type 
     order by device_type asc