报表问题修改

@@ -60,8 +60,8 @@ public class VideoController {
     public Result<Object> videoMessage(){
         Result<Object> result = new Result<Object>();
         //获取摄像头所有的列表
-        String factoryids = BaseContextHandler.getDeparts();
-        List<Map<String,Object>> videoList = tVideoService.queryVideoList(factoryids);
+        String departIds = BaseContextHandler.getDeparts();
+        List<Map<String,Object>> videoList = tVideoService.queryVideoList(departIds);
         //将业务数据转换为构造树所需的数据结构
         List<TransTreeModel> transTreeModels = videoList.stream().map(bo -> convertToTreeModel(bo)).collect(Collectors.toList());
         //此处工具类构建树通过拼接root构造根节点

@@ -23,7 +23,7 @@ public interface TVideoMapper extends BaseMapper<TVideo> {
 
     /**
      * APP查询摄像头列表
-     * @param orgCode
+     * @param departIds
      * @return
      */
     List<Map<String, Object>> queryVideoList(@Param("departIds") String departIds);

@@ -73,11 +73,11 @@
         FROM
         sys_depart f
         WHERE
-<!--        id in-->
-<!--        <foreach item="item" index="index" collection="departIds.split(',')"  open="(" separator="," close=")">-->
-<!--            #{item}-->
-<!--        </foreach>-->
-<!--        and -->
+        id in
+        <foreach item="item" index="index" collection="departIds.split(',')"  open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and
         depart_type ='1'
         UNION ALL
         SELECT
@@ -89,10 +89,10 @@
         2222222 AS depart_order
         FROM
         t_video
-<!--        where depart_id in-->
-<!--        <foreach item="item" index="index" collection="departIds.split(',')"  open="(" separator="," close=")">-->
-<!--            #{item}-->
-<!--        </foreach>-->
+        where depart_id in
+        <foreach item="item" index="index" collection="departIds.split(',')"  open="(" separator="," close=")">
+            #{item}
+        </foreach>
         ) ss
         ORDER BY
         ss.depart_order,ss.video_name
@@ -139,7 +139,7 @@
 			</if>
 		order by IFNULL(a.video_sort,99),d.depart_name,a.video_camerauuid
     </select>
-    
+
     <select id="queryCustomVideoPageList" resultType="com.skua.modules.video.entity.TVideo">
         SELECT
 			c.video_root_name AS area_name,

@@ -24,7 +24,7 @@ public interface ITVideoService extends IService<TVideo> {
      * @param orgCode
      * @return
      */
-    List<Map<String, Object>> queryVideoList(String orgCode);
+    List<Map<String, Object>> queryVideoList(String departIds);
     /**
      * <pre>
      * App摄像头模糊搜索

@@ -41,8 +41,8 @@ public class TVideoServiceImpl extends ServiceImpl<TVideoMapper, TVideo> impleme
     }
 
     @Override
-    public List<Map<String, Object>> queryVideoList(String orgCode) {
-        return tVideoMapper.queryVideoList(orgCode);
+    public List<Map<String, Object>> queryVideoList(String departIds) {
+        return tVideoMapper.queryVideoList(departIds);
     }
 
 	@Override

@@ -120,4 +120,20 @@ public interface FCustomReportDatasetMapper extends BaseMapper<FCustomReportData
 
 	List<JnhbReportDetailsHj> getHjList(@Param(value="dataViewName2") String dataViewName2, @Param(value="dataViewName3") String dataViewName3,
 										@Param(value="departId") String departId, @Param(value="year") String year);
+
+    List<Map<String, Object>> querySzYynbReport(@Param(value="dataViewName2119") String dataViewName2119,
+											  @Param(value="startTime")String startTime, @Param(value="endTime")String endTime,
+											  @Param(value="departId") String departId);
+
+	List<Map<String, Object>> queryNhYynbReport(@Param(value="dataViewName3a24") String dataViewName3a24,
+												@Param(value="startTime") String startTime, @Param(value="endTime") String endTime,
+												@Param(value="departId") String departId);
+
+	List<Map<String, Object>> querySzYyybReport(@Param(value="dataViewName2119") String dataViewName2119,
+												@Param(value="startTime")String startTime, @Param(value="endTime")String endTime,
+												@Param(value="departId") String departId);
+
+	List<Map<String, Object>> queryNhYyybReport(@Param(value="dataViewName3a24") String dataViewName3a24,
+												@Param(value="startTime") String startTime, @Param(value="endTime") String endTime,
+												@Param(value="departId") String departId);
 }

@@ -512,4 +512,169 @@
 		GROUP BY
 			LEFT ( v.time, 7 )
 	</select>
+
+	<select id="querySzYynbReport" resultType="java.util.HashMap">
+		SELECT
+			ROUND( SUM( v.JSL ), 2 ) AS `JSL`,
+			ROUND( SUM( v.CSL ), 2 ) AS `CSL`,
+			ROUND( AVG( v.JSPH ), 2 ) AS `JSPH`,
+			ROUND( AVG( v.CSPH ), 2 ) AS `CSPH`,
+			ROUND( AVG( v.JSCOD ), 2 ) AS `JSCOD`,
+			ROUND( AVG( v.CSCOD ), 2 ) AS `CSCOD`,
+			ROUND( AVG( v.CSTN ), 2 ) AS `CSTN`,
+			ROUND( AVG( v.JSZD ), 2 ) AS `JSZD`,
+			ROUND( AVG( v.JSZL ), 2 ) AS `JSZL`,
+			ROUND( AVG( v.CSZL ), 2 ) AS `CSZL`,
+			ROUND( AVG( v.JSAD ), 2 ) AS `JSAD`,
+			ROUND( AVG( v.CSAD ), 2 ) AS `CSAD`,
+			ROUND( AVG( v.JSSS ), 2 ) AS `JSSS`,
+			ROUND( AVG( v.CSSS ), 2 ) AS `CSSS`,
+			v.BZ,
+			v.depart_id,
+			LEFT ( v.time, 7 ) AS time
+		FROM
+			${dataViewName2119} v
+		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
+			LEFT ( v.time, 7 )
+	</select>
+
+	<select id="queryNhYynbReport" resultType="java.util.HashMap">
+		SELECT
+			SUM(v3.PFS) AS PFS,
+			SUM(v3.FHTY) AS FHTY,
+			SUM(v3.RYXNJ) AS RYXNJ,
+			SUM(v3.YWL) AS YWL,
+			SUM(v3.GXCLJ) AS GXCLJ,
+			SUM(v3.CH3COONA) AS CH3COONA,
+			SUM(v3.HXT) AS HXT,
+			SUM(v3.FECL3) AS FECL3,
+			SUM(v3.SH) AS SH,
+			SUM(v3.CH3COOH) AS CH3COOH,
+			SUM(v3.FESO4G) AS FESO4G,
+			SUM(v3.FESO4Y) AS FESO4Y,
+			SUM(v3.H2O2) AS H2O2,
+			SUM(v3.GFFDL) AS GFFDL,
+			SUM(v3.QY) AS QY,
+			SUM(v3.GFCZL) AS GFCZL,
+			SUM(v3.WNHSL) AS WNHSL,
+			SUM(v3.WFCSL) AS WFCSL,
+			SUM(v3.WFCZL) AS WFCZL,
+			SUM(v3.DLJZ) AS DLJZ,
+			SUM(v3.GFSYL) AS GFSYL,
+			SUM(v3.WNL) AS WNL,
+			SUM(v3.DLFZ) AS DLFZ,
+			SUM(v3.DLPZ) AS DLPZ,
+			SUM(v3.DLGZ) AS DLGZ,
+			SUM(v3.DLHJ) AS DLHJ,
+			SUM(v3.YSL) AS YSL,
+			SUM(v3.PAMZ) AS PAMZ,
+			SUM(v3.PAMF) AS PAMF,
+			SUM(v3.PAMRJ) AS PAMRJ,
+			SUM(v3.SCLPAMZ) AS SCLPAMZ,
+			SUM(v3.SCLPAMF) AS SCLPAMF,
+			SUM(v3.NACLO) AS NACLO,
+			SUM(v3.PACGT) AS PACGT,
+			SUM(v3.PACYT) AS PACYT,
+			v3.BZ AS BZ,
+			v3.depart_id AS depart_id,
+			LEFT(v3.time,7) AS time
+		FROM ${dataViewName3a24} v3
+			WHERE
+			v3.depart_id IN
+			<foreach item="item" index="index" collection="departId.split(',')"  open="(" separator="," close=")">
+				'${item}'
+			</foreach>
+			AND v3.time &gt;= #{startTime}
+			AND v3.time &lt;= #{endTime}
+			GROUP BY LEFT(v3.time,7)
+	</select>
+
+	<select id="querySzYyybReport" resultType="java.util.HashMap">
+		SELECT
+		ROUND( SUM( v.JSL ), 2 ) AS `JSL`,
+		ROUND( SUM( v.CSL ), 2 ) AS `CSL`,
+		ROUND( AVG( v.JSPH ), 2 ) AS `JSPH`,
+		ROUND( AVG( v.CSPH ), 2 ) AS `CSPH`,
+		ROUND( AVG( v.JSCOD ), 2 ) AS `JSCOD`,
+		ROUND( AVG( v.CSCOD ), 2 ) AS `CSCOD`,
+		ROUND( AVG( v.CSTN ), 2 ) AS `CSTN`,
+		ROUND( AVG( v.JSZD ), 2 ) AS `JSZD`,
+		ROUND( AVG( v.JSZL ), 2 ) AS `JSZL`,
+		ROUND( AVG( v.CSZL ), 2 ) AS `CSZL`,
+		ROUND( AVG( v.JSAD ), 2 ) AS `JSAD`,
+		ROUND( AVG( v.CSAD ), 2 ) AS `CSAD`,
+		ROUND( AVG( v.JSSS ), 2 ) AS `JSSS`,
+		ROUND( AVG( v.CSSS ), 2 ) AS `CSSS`,
+		v.BZ,
+		v.depart_id,
+		v.time
+		FROM
+		${dataViewName2119} v
+		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.time
+	</select>
+
+	<select id="queryNhYyybReport" resultType="java.util.HashMap">
+		SELECT
+		SUM(v3.PFS) AS PFS,
+		SUM(v3.FHTY) AS FHTY,
+		SUM(v3.RYXNJ) AS RYXNJ,
+		SUM(v3.YWL) AS YWL,
+		SUM(v3.GXCLJ) AS GXCLJ,
+		SUM(v3.CH3COONA) AS CH3COONA,
+		SUM(v3.HXT) AS HXT,
+		SUM(v3.FECL3) AS FECL3,
+		SUM(v3.SH) AS SH,
+		SUM(v3.CH3COOH) AS CH3COOH,
+		SUM(v3.FESO4G) AS FESO4G,
+		SUM(v3.FESO4Y) AS FESO4Y,
+		SUM(v3.H2O2) AS H2O2,
+		SUM(v3.GFFDL) AS GFFDL,
+		SUM(v3.QY) AS QY,
+		SUM(v3.GFCZL) AS GFCZL,
+		SUM(v3.WNHSL) AS WNHSL,
+		SUM(v3.WFCSL) AS WFCSL,
+		SUM(v3.WFCZL) AS WFCZL,
+		SUM(v3.DLJZ) AS DLJZ,
+		SUM(v3.GFSYL) AS GFSYL,
+		SUM(v3.WNL) AS WNL,
+		SUM(v3.DLFZ) AS DLFZ,
+		SUM(v3.DLPZ) AS DLPZ,
+		SUM(v3.DLGZ) AS DLGZ,
+		SUM(v3.DLHJ) AS DLHJ,
+		SUM(v3.YSL) AS YSL,
+		SUM(v3.PAMZ) AS PAMZ,
+		SUM(v3.PAMF) AS PAMF,
+		SUM(v3.PAMRJ) AS PAMRJ,
+		SUM(v3.SCLPAMZ) AS SCLPAMZ,
+		SUM(v3.SCLPAMF) AS SCLPAMF,
+		SUM(v3.NACLO) AS NACLO,
+		SUM(v3.PACGT) AS PACGT,
+		SUM(v3.PACYT) AS PACYT,
+		v3.BZ AS BZ,
+		v3.depart_id AS depart_id,
+		v3.time
+		FROM ${dataViewName3a24} v3
+		WHERE
+		v3.depart_id IN
+		<foreach item="item" index="index" collection="departId.split(',')"  open="(" separator="," close=")">
+			'${item}'
+		</foreach>
+		AND v3.time &gt;= #{startTime}
+		AND v3.time &lt;= #{endTime}
+		GROUP BY v3.time
+	</select>
 </mapper>

@@ -129,4 +129,11 @@ public interface IFCustomReportDatasetService extends IService<FCustomReportData
 	 */
 	List<ResultNumberVO> jnhbLargeScreenShowResultNumber(String departIds, String time);
 
+	List<Map<String, Object>> querySzYynbReport(String dataViewName2119, String startTime, String endTime, String departId);
+
+	List<Map<String, Object>> queryNhYynbReport(String dataViewName3a24, String startTime, String endTime, String departId);
+
+	List<Map<String, Object>> querySzYyybReport(String dataViewName2119, String startTime, String endTime, String departId);
+
+	List<Map<String, Object>> queryNhYyybReport(String dataViewName3a24, String startTime, String endTime, String departId);
 }

@@ -430,6 +430,30 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 		return reduceStatisticsList;
 	}
 
+	@Override
+	public List<Map<String, Object>> querySzYynbReport(String dataViewName2119, String startTime, String endTime, String departId) {
+		List<Map<String, Object>> list = mapper.querySzYynbReport(dataViewName2119, startTime, endTime, departId);
+		return list;
+	}
+
+	@Override
+	public List<Map<String, Object>> queryNhYynbReport(String dataViewName3a24, String startTime, String endTime, String departId) {
+		List<Map<String, Object>> list = mapper.queryNhYynbReport(dataViewName3a24, startTime, endTime, departId);
+		return list;
+	}
+
+	@Override
+	public List<Map<String, Object>> querySzYyybReport(String dataViewName2119, String startTime, String endTime, String departId) {
+		List<Map<String, Object>> list = mapper.querySzYyybReport(dataViewName2119, startTime, endTime, departId);
+		return list;
+	}
+
+	@Override
+	public List<Map<String, Object>> queryNhYyybReport(String dataViewName3a24, String startTime, String endTime, String departId) {
+		List<Map<String, Object>> list = mapper.queryNhYyybReport(dataViewName3a24, startTime, endTime, departId);
+		return list;
+	}
+
 	/**转换为Map<部门编号,JnhbReportData>  */
 	private Map<String,JnhbReportData> convertJnhbReportDataMap(List<JnhbReportData>  dataList){// Map<部门编号,JnhbReportData>
 		Map<String,JnhbReportData> dataMap = new HashMap<>();

@@ -51,8 +51,8 @@ public class FCustomReportInfoServiceImpl extends ServiceImpl<FCustomReportInfoM
 		//获取自定义报表对象
 		FCustomReportInfo reportInfo = this.getById(reportId);
 		if("3".equals(reportInfo.getReportTimeQueryType())){//年
-			startTime = startTime + "-01-01";
-			endTime = endTime + "-12-31";
+			startTime = startTime + "-01";
+			endTime = endTime + "-31";
 		}else if("2".equals(reportInfo.getReportTimeQueryType())){//月
 			startTime = startTime + "-01";
 			endTime = endTime + "-31";