sql修改

src/main/java/com/chinaitop/depot/statisticalReport/mapper/StatisticalReportMapper.xml

@@ -4,9 +4,15 @@
   
   <select id="getSummaryReportInfo" resultType="java.util.Map" parameterType="map">
 	SELECT bs.storehouse_code storeHouse, td.inTemp, td.inH, td.outTemp, td.outH, td.t_max maxTemp, 
-		td.t_min minTemp, td.t_avg avgTemp, bs.dutyStoreman, bs.remark
+		td.t_min minTemp, td.t_avg avgTemp, keeps.user_alias dutystoreman, bs.remark
 	FROM basic_storehouse bs
 	LEFT JOIN (
+		SELECT wm_concat(c.user_alias) user_alias,a.house_id FROM basic_keeper_house a
+		INNER JOIN basic_keeper b on a.keeper_Id = b.id
+		INNER JOIN user_info c on b.user_Id = c.user_id
+		GROUP BY a.house_id
+	) keeps on keeps.house_id = bs.storehouse_id
+	LEFT JOIN (
 		  select a.* from t_testdata a inner join (
 		    select storehouse,max(t_time) t_time from t_testdata 
 		    where iLq_yq = '0'
@@ -32,9 +38,16 @@
   <select id="getDetailsReportInfo" resultType="java.util.Map" parameterType="map">
 	SELECT bs.storehouse_code storehouse, bs.storehouse_type storehousetype, bs.keeping_way keepingway, 
     	bs.storehouse_name storehousename, td.t_time, td.intemp, td.inh, td.outtemp, 
-    	td.outh, td.t_max maxtemp, td.t_min mintemp, td.t_avg avgtemp, bs.remark, sq.water, sq.location
+    	td.outh, td.t_max maxtemp, td.t_min mintemp, td.t_avg avgtemp, bs.remark, sq.water, 
+    	keeps.user_alias dutystoreman, sq.location
 	FROM basic_storehouse bs
 	LEFT JOIN storage_qualitycheck sq on bs.storehouse_id = sq.house_id AND sq.org_id = bs.org_id and sq.type = 0
+	LEFT JOIN (
+		SELECT wm_concat(c.user_alias) user_alias,a.house_id FROM basic_keeper_house a
+		INNER JOIN basic_keeper b on a.keeper_Id = b.id
+		INNER JOIN user_info c on b.user_Id = c.user_id
+		GROUP BY a.house_id
+	) keeps on keeps.house_id = bs.storehouse_id
 	LEFT join(
 	  select a.* from t_testdata a inner join (
 		    select storehouse,max(t_time) t_time from t_testdata where iLq_yq = '0'