化验日报和生产日报修改

@@ -144,4 +144,8 @@ public interface FCustomReportDatasetMapper extends BaseMapper<FCustomReportData
 	List<Map<String, Object>> queryNhYyrbReport(@Param(value="dataViewName3a24") String dataViewName3a24,
 	List<Map<String, Object>> queryNhYyrbReport(@Param(value="dataViewName3a24") String dataViewName3a24,
 												@Param(value="startTime") String startTime, @Param(value="endTime") String endTime,
 												@Param(value="startTime") String startTime, @Param(value="endTime") String endTime,
 												@Param(value="departId") String departId);
 												@Param(value="departId") String departId);
+
+    List<Map<String, Object>> queryHyReport(@Param(value="dataViewName9bff") String dataViewName9bff,
+											@Param(value="startTime") String startTime, @Param(value="endTime") String endTime,
+											@Param(value="departId") String departId);
 }
 }

@@ -763,4 +763,49 @@
 			AND v3.time <= #{endTime}
 			AND v3.time <= #{endTime}
 		GROUP BY v3.depart_id
 		GROUP BY v3.depart_id
 	</select>
 	</select>
+
+	<select id="queryHyReport" resultType="java.util.HashMap">
+		SELECT
+			ROUND( AVG( v.SW ), 2 ) AS `SW`,
+			ROUND( AVG( v.FYHGMLSS ), 2 ) AS `FYHGMLSS`,
+			ROUND( AVG( v.EYHGMLSS ), 2 ) AS `EYHGMLSS`,
+			ROUND( AVG( v.DYHGMLSS ), 2 ) AS `DYHGMLSS`,
+			ROUND( AVG( v.BYHGMLSS ), 2 ) AS `BYHGMLSS`,
+			ROUND( AVG( v.CYHGMLSS ), 2 ) AS `CYHGMLSS`,
+			ROUND( AVG( v.AYHGMLSS ), 2 ) AS `AYHGMLSS`,
+			ROUND( AVG( v.FYHGCJB ), 2 ) AS `FYHGCJB`,
+			ROUND( AVG( v.EYHGCJB ), 2 ) AS `EYHGCJB`,
+			ROUND( AVG( v.DYHGCJB ), 2 ) AS `DYHGCJB`,
+			ROUND( AVG( v.BYHGCJB ), 2 ) AS `BYHGCJB`,
+			ROUND( AVG( v.CYHGCJB ), 2 ) AS `CYHGCJB`,
+			ROUND( AVG( v.AYHGCJB ), 2 ) AS `AYHGCJB`,
+			ROUND( AVG( v.JSCODHY ), 2 ) AS `JSCODHY`,
+			ROUND( AVG( v.CSCODHY ), 2 ) AS `CSCODHY`,
+			ROUND( AVG( v.JSADHY ), 2 ) AS `JSADHY`,
+			ROUND( AVG( v.CSADHY ), 2 ) AS `CSADHY`,
+			ROUND( AVG( v.CSTNHY ), 2 ) AS `CSTNHY`,
+			ROUND( AVG( v.JSZDHY ), 2 ) AS `JSZDHY`,
+			ROUND( AVG( v.JSZLHY ), 2 ) AS `JSZLHY`,
+			ROUND( AVG( v.CSZLHY ), 2 ) AS `CSZLHY`,
+			ROUND( AVG( v.JSSSHY ), 2 ) AS `JSSSHY`,
+			ROUND( AVG( v.CSSSHY ), 2 ) AS `CSSSHY`,
+			ROUND( AVG( v.JSPHHY ), 2 ) AS `JSPHHY`,
+			ROUND( AVG( v.CSPHHY ), 2 ) AS `CSPHHY`,
+			ROUND( AVG( v.CSBODHY ), 2 ) AS `CSBODHY`,
+			ROUND( AVG( v.JSBODHY ), 2 ) AS `JSBODHY`,
+			v.depart_id,
+			d.depart_name as depart_name,
+			v.time
+		FROM
+		${dataViewName9bff} v
+		LEFT JOIN sys_depart d ON v.depart_id = d.id
+		WHERE
+		v.depart_id IN
+		<foreach item="item" index="index" collection="departId.split(',')"  open="(" separator="," close=")">
+			'${item}'
+		</foreach>
+		AND v.time &gt;= #{startTime}
+		AND v.time &lt;= #{endTime}
+		GROUP BY v.depart_id
+	</select>
 </mapper>
 </mapper>

@@ -140,4 +140,6 @@ public interface IFCustomReportDatasetService extends IService<FCustomReportData
     List<Map<String, Object>> querySzYyrbReport(String dataViewName2119, String startTime, String endTime, String departId);
     List<Map<String, Object>> querySzYyrbReport(String dataViewName2119, String startTime, String endTime, String departId);
 
 
 	List<Map<String, Object>> queryNhYyrbReport(String dataViewName3a24, String startTime, String endTime, String departId);
 	List<Map<String, Object>> queryNhYyrbReport(String dataViewName3a24, String startTime, String endTime, String departId);
+
+    List<Map<String, Object>> queryHyReport(String dataViewName9bff, String startTime, String endTime, String departIds);
 }
 }

@@ -466,6 +466,12 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 		return list;
 		return list;
 	}
 	}
 
 
+	@Override
+	public List<Map<String, Object>> queryHyReport(String dataViewName9bff, String startTime, String endTime, String departId) {
+		List<Map<String, Object>> list = mapper.queryHyReport(dataViewName9bff, startTime, endTime, departId);
+		return list;
+	}
+
 	/**转换为Map<部门编号,JnhbReportData>  */
 	/**转换为Map<部门编号,JnhbReportData>  */
 	private Map<String,JnhbReportData> convertJnhbReportDataMap(List<JnhbReportData>  dataList){// Map<部门编号,JnhbReportData>
 	private Map<String,JnhbReportData> convertJnhbReportDataMap(List<JnhbReportData>  dataList){// Map<部门编号,JnhbReportData>
 		Map<String,JnhbReportData> dataMap = new HashMap<>();
 		Map<String,JnhbReportData> dataMap = new HashMap<>();