大屏卡片 更换报废 模块统计修改为 以列表为准

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

@@ -2778,11 +2778,11 @@
                         LEFT JOIN wl_equipment e ON ed.equipment_id = e.id
                         LEFT JOIN wl_stock_detail sd ON sd.equipment_detail_id = ed.id
                 WHERE
-                    ed.delivery_date IS NOT NULL
-                  AND ( (sd.`status` != 3) or (sd.`status` is null) or (sd.`status` = ''))
-                  AND ed.maintenance_cycle IS NOT NULL
-                  AND es.biz_org_code LIKE concat(#{bizOrgCode}, '%')
-                  AND 0 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.delivery_date, '%Y-%m-%d' ), INTERVAL ed.maintenance_cycle MONTH ), CURRENT_DATE )
+                    ed.production_date IS NOT NULL
+                    AND e.expiry_date IS NOT NULL
+                    AND es.biz_org_code LIKE concat(#{equipmentSpecific.bizOrgCode}, '%')
+                    AND 0 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
+                    AND ( (sd.`status` != 3) or (sd.`status` is null) or (sd.`status` = ''))
             ) AS `value` UNION ALL
             SELECT
             '超期未报废' AS `name`,
@@ -2796,10 +2796,10 @@
                         LEFT JOIN wl_stock_detail sd ON sd.equipment_detail_id = ed.id
                 WHERE
                     ed.production_date IS NOT NULL
-                  AND ( (sd.`status` != 7) or (sd.`status` is null) or (sd.`status` = ''))
-                  AND e.expiry_date IS NOT NULL
-                  AND es.biz_org_code LIKE concat(#{bizOrgCode}, '%')
-                  AND 0 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
+                    AND e.expiry_date IS NOT NULL
+                    AND es.biz_org_code LIKE concat(#{equipmentSpecific.bizOrgCode}, '%')
+                    AND 0 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
+                    AND ( (sd.`status` != 7) or (sd.`status` is null) or (sd.`status` = ''))
             ) AS `value` UNION ALL
             SELECT
             '近1月临期设备' AS `name`,
@@ -2812,12 +2812,12 @@
             LEFT JOIN wl_equipment e ON ed.equipment_id = e.id
             LEFT JOIN wl_stock_detail sd ON sd.equipment_detail_id = ed.id
             WHERE
-            ed.production_date IS NOT NULL
-            AND ( (sd.`status` != 7) or (sd.`status` is null) or (sd.`status` = ''))
-            AND e.expiry_date IS NOT NULL
-            AND es.biz_org_code LIKE concat(#{bizOrgCode}, '%')
-            AND 30 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
-            AND DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) >= 0
+                ed.production_date IS NOT NULL
+                AND e.expiry_date IS NOT NULL
+                AND es.biz_org_code LIKE concat(#{equipmentSpecific.bizOrgCode}, '%')
+                AND ( (sd.`status` != 7) or (sd.`status` is null) or (sd.`status` = ''))
+                AND 30 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
+                AND DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) >= 0
             ) AS `value`
     </select>