Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC007.java

@@ -292,8 +292,17 @@ public class ServiceHGSC007 extends ServiceEPBase {
 			if (queryRow.containsKey("depositDate")) {
 				queryRow.put("depositDate", DateUtils.formatShort(queryRow.get("depositDate")));
 			}
-			List result = DaoBase.getInstance().query("HGSC007.queryByWt", queryRow);
-			inInfo.set(EiConstant.resultBlock, result);
+			List<HashMap<String, Object>> result = (List<HashMap<String, Object>>) DaoBase.getInstance().query("HGSC007.queryByWt", queryRow);
+			List<String> processNameList = result.stream()
+					.map(item -> (String) item.get("processName"))
+					.collect(Collectors.toList());
+			List<String> totalWeightList = result.stream()
+					.map(item -> String.valueOf(item.get("totalWeight")))  // 使用 String.valueOf()
+					.collect(Collectors.toList());
+			EiBlock block = new EiBlock("result");
+			block.set("processNameList",processNameList);
+			block.set("totalWeightList",totalWeightList);
+			inInfo.setBlock(block);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
 		}
@@ -323,8 +332,17 @@ public class ServiceHGSC007 extends ServiceEPBase {
 			if (queryRow.containsKey("depositDate")) {
 				queryRow.put("depositDate", DateUtils.formatShort(queryRow.get("depositDate")));
 			}
-			List result = DaoBase.getInstance().query("HGSC007.queryByDayWt", queryRow);
-			inInfo.set(EiConstant.resultBlock, result);
+			List<HashMap<String, Object>> result = (List<HashMap<String, Object>>)DaoBase.getInstance().query("HGSC007.queryByDayWt", queryRow);
+			List<String> depositDateList = result.stream()
+					.map(item -> (String) item.get("depositDate"))
+					.collect(Collectors.toList());
+			List<String> totalWeightList = result.stream()
+					.map(item -> String.valueOf(item.get("totalWeight"))) // 使用 String.valueOf()
+					.collect(Collectors.toList());
+			EiBlock block = new EiBlock("result");
+			block.set("depositDateList",depositDateList);
+			block.set("totalWeightList",totalWeightList);
+			inInfo.setBlock(block);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
 		}