修改问题

src/main/java/com/chinaitop/depot/grainAnalysis/service/impl/StorageGrainAnalysisServiceImpl.java

@@ -184,7 +184,7 @@ public class StorageGrainAnalysisServiceImpl implements StorageGrainAnalysisServ
 		 * 4、将每周的三温检查代表数据放入集合中返回
 		 */
 
-		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+		List list = new ArrayList<>();
 
 		//将当前月的所有周分析数据拿到；
 		StorageGrainAnalysisExample grainExample = new StorageGrainAnalysisExample();
@@ -207,46 +207,19 @@ public class StorageGrainAnalysisServiceImpl implements StorageGrainAnalysisServ
 			map.put("weekdata", "1");
 		}
 
-		Map<String, Object> param_map = new HashMap<String, Object>();
-		param_map.put("house_id", houseId);
-		Map<String, Object> house_map = null;
-		if ("YG".equals(houseId.substring(0, 2))) {//油罐
-			house_map = analysisMapper.selecttankObj(param_map);
-		} else {//粮仓
-			house_map = analysisMapper.selectStoreHouseObj(param_map);
-		}
+		if (null != grainList && grainList.size() > 0) {
+			list = new ArrayList();
+			Map<String, Object> monthMap = new HashMap<>();
+			for (StorageGrainAnalysis grain : grainList) {
 
-		if (null != house_map && house_map.size() > 0) {
-			String houseCode = "";
-			if ("YG".equals(houseId.substring(0, 2))) {
-				houseCode = house_map.get("storageTank_code")+"";
-			} else {
-				houseCode = house_map.get("storehouse_code")+"";
+				list.add(grain.getMonth());
 			}
 
-			//然后按照每条周分析数据的检查时间范围来查询每周对应的三温检查数据,每周的取一条数据组成集合返回；
-			if (null != grainList && grainList.size() > 0) {
-				for (StorageGrainAnalysis grain : grainList) {
-					Date startDate = grain.getCheckDateStart();
-					String startDate_str = ParameterUtil.date2string(startDate);
-
-					Date endDate = grain.getCheckDateEnd();
-					String endDate_str = ParameterUtil.date2string(endDate);
-
-					Map<String, Object> dateMap = new HashMap<>();
-					dateMap.put("houseId",houseCode);
-					dateMap.put("startDate",startDate_str);
-					dateMap.put("endDate",endDate_str);
-					dateMap.put("orgId",orgId);
-					list.add(dateMap);
-				}
-
-				if (null == list || list.size() == 0) {
-					list = new ArrayList<Map<String, Object>>();
-				}
-			} else {
-				list = new ArrayList<Map<String, Object>>();
+			if (null == list || list.size() == 0) {
+				list = new ArrayList();
 			}
+		} else {
+			list = new ArrayList();
 		}
 
 		map.put("threeTempCheckList", list);