1.视图修改 连接为空bug

amos-boot-system-equip/src/main/resources/changelog/init/view_all.sql

@@ -4757,27 +4757,30 @@ FROM
 	(
 		(
 			SELECT
-				`a`.`value` AS `yhxfscyw`,
-				(
-					CASE
-					WHEN (`a`.`value` IS NULL) THEN
-						0
-					WHEN (
-						(`a`.`value` <> '')
-						AND (`b`.`height` <> '')
-					) THEN
-						round(
-							(
-								(`a`.`value` / `b`.`height`) * 100
-							),
-							2
-						)
-					WHEN (`b`.`height` IS NULL) THEN
-						0
-					END
+				ifnull(sum(`a`.`value`), 0) AS `yhxfscyw`,
+				ifnull(
+					(
+						CASE
+						WHEN (`a`.`value` = NULL) THEN
+							0
+						WHEN (
+							(`a`.`value` <> '')
+							AND (`b`.`height` <> '')
+						) THEN
+							round(
+								(
+									(`a`.`value` / `b`.`height`) * 100
+								),
+								2
+							)
+						WHEN (`b`.`height` = NULL) THEN
+							0
+						END
+					),
+					0
 				) AS `yhxfscyl`,
-				`b`.`waterStorage` AS `yhxfsccs`,
-				`b`.`height` AS `yhxfscg`
+				ifnull(`b`.`waterStorage`, 0) AS `yhxfsccs`,
+				ifnull(`b`.`height`, 0) AS `yhxfscg`
 			FROM
 				(
 					(
@@ -4794,7 +4797,7 @@ FROM
 									`si`.`equipment_index_key` = 'FHS_FirePoolDevice_WaterLevel'
 								)
 								AND (
-									`s`.`code` = '1HXFSCCJZZ100000' --1号消防水池装置code
+									`s`.`code` = '1HXFSCCJZZ100000'
 								)
 								AND (
 									`si`.`equipment_specific_id` = `s`.`id`
@@ -4841,7 +4844,7 @@ FROM
 											(
 												(`i`.`field_name` = 'code')
 												AND (
-													`i`.`field_value` = 'SC105035' --1号消防水池（建筑或者房间类型）code
+													`i`.`field_value` = 'SC106268'
 												)
 											)
 										LIMIT 1
@@ -4851,29 +4854,32 @@ FROM
 					) `b`
 				)
 		) `yh`
-		JOIN (
+		LEFT JOIN (
 			SELECT
-				`a`.`value` AS `ehxfscyw`,
-				(
-					CASE
-					WHEN (`a`.`value` IS NULL) THEN
-						0
-					WHEN (
-						(`a`.`value` <> '')
-						AND (`b`.`height` <> '')
-					) THEN
-						round(
-							(
-								(`a`.`value` / `b`.`height`) * 100
-							),
-							2
-						)
-					WHEN (`b`.`height` IS NULL) THEN
-						0
-					END
+				ifnull(sum(`a`.`value`), 0) AS `ehxfscyw`,
+				ifnull(
+					(
+						CASE
+						WHEN (`a`.`value` = NULL) THEN
+							0
+						WHEN (
+							(`a`.`value` <> '')
+							AND (`b`.`height` <> '')
+						) THEN
+							round(
+								(
+									(`a`.`value` / `b`.`height`) * 100
+								),
+								2
+							)
+						WHEN (`b`.`height` = NULL) THEN
+							0
+						END
+					),
+					0
 				) AS `ehxfscyl`,
-				`b`.`waterStorage` AS `ehxfsccs`,
-				`b`.`height` AS `ehxfscg`
+				ifnull(`b`.`waterStorage`, 0) AS `ehxfsccs`,
+				ifnull(`b`.`height`, 0) AS `ehxfscg`
 			FROM
 				(
 					(
@@ -4890,7 +4896,7 @@ FROM
 									`si`.`equipment_index_key` = 'FHS_FirePoolDevice_WaterLevel'
 								)
 								AND (
-									`s`.`code` = '1HXFSCCJZZ100001' --2号消防水池装置code
+									`s`.`code` = '1HXFSCCJZZ100000'
 								)
 								AND (
 									`si`.`equipment_specific_id` = `s`.`id`
@@ -4937,7 +4943,7 @@ FROM
 											(
 												(`i`.`field_name` = 'code')
 												AND (
-													`i`.`field_value` = 'SC103119' --2号消防水池（建筑或者房间类型）code
+													`i`.`field_value` = 'SC106268'
 												)
 											)
 										LIMIT 1
@@ -4946,8 +4952,8 @@ FROM
 							)
 					) `b`
 				)
-		) `eh`
-	);
+		) `eh` ON ((1 = 1))
+);
 -- 泡沫灭火3小
 DROP VIEW IF EXISTS `v_fire_equip_ffs_num`;
 CREATE ALGORITHM = UNDEFINED DEFINER = `root`@`%` SQL SECURITY DEFINER VIEW `v_fire_equip_ffs_num` AS

amos-boot-system-equip/src/main/resources/mapper/AnalysisReportMonthMapper.xml

@@ -18,7 +18,7 @@
         )
         select
             a1.*,
-            DATE_FORMAT(NOW(),'%Y-%m')
+            DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 day),'%Y-%m')
         from
         (SELECT
         system_id,