装备报废 4 xiao bug

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

@@ -5053,9 +5053,9 @@
         es.id,
         ed.`name`,
         ed.standard,
-        DATE_ADD( DATE_FORMAT( ed.delivery_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ) AS passDate,
-        DATEDIFF( DATE_ADD( DATE_FORMAT( ed.delivery_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) AS dayNum,
-        DATE_FORMAT( ed.delivery_date, '%Y-%m-%d' ) AS productDate,
+        DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ) AS passDate,
+        DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) AS dayNum,
+        DATE_FORMAT( ed.production_date, '%Y-%m-%d' ) AS productDate,
         e.`name` AS equipSortName,
         e.id AS equipSortId
         FROM
@@ -5064,12 +5064,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.delivery_date IS NOT NULL
+        ed.production_date IS NOT NULL
         AND sd.`status` != 7
         AND e.expiry_date IS NOT NULL
         AND es.biz_org_code like concat(#{bizOrgCode}, '%')
-        AND DATEDIFF( DATE_ADD( DATE_FORMAT( ed.delivery_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) > 0
-        AND #{expiryDayNum} >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.delivery_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
+        AND #{expiryDayNum} >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
         ) a
         GROUP BY
         a.equipSortId
@@ -5080,9 +5080,9 @@
         es.id AS specificId,
         ed.`name` AS specificName,
         IFNULL( ed.standard, '' ) AS modelNumber,
-        DATE_ADD( DATE_FORMAT( ed.delivery_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ) AS passDate,
-        DATEDIFF( DATE_ADD( DATE_FORMAT( ed.delivery_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) AS dayNum,
-        DATE_FORMAT( ed.delivery_date, '%Y-%m-%d' ) AS productDate,
+        DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ) AS passDate,
+        DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) AS dayNum,
+        DATE_FORMAT( ed.production_date, '%Y-%m-%d' ) AS productDate,
         e.`name` AS equipSortName,
         e.id AS equipSortId,
         IFNULL( ws.full_name, '' ) AS equipAddress
@@ -5093,13 +5093,13 @@
         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
+        ed.production_date IS NOT NULL
         AND sd.`status` != 7
         AND e.expiry_date IS NOT NULL
         AND es.biz_org_code like concat(#{bizOrgCode}, '%')
-        AND DATEDIFF( DATE_ADD( DATE_FORMAT( ed.delivery_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) > 0
-        AND #{expiryDayNum} >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.delivery_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
-        ORDER BY DATEDIFF( DATE_ADD( DATE_FORMAT( ed.delivery_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) ASC
+        AND DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) > 0
+        AND #{expiryDayNum} >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
+        ORDER BY DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) ASC
     </select>
 
     <select id="getStockEquipStatistics" resultType="java.util.Map">
@@ -5139,11 +5139,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
+        ed.production_date IS NOT NULL
         AND sd.`status` != 7
         AND e.expiry_date 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 e.expiry_date YEAR ), CURRENT_DATE )
+        AND 0 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
         ) AS countNum UNION ALL
         SELECT
         '近2月临期设备' AS `content`,
@@ -5156,12 +5156,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.delivery_date IS NOT NULL
+        ed.production_date IS NOT NULL
         AND sd.`status` != 7
         AND e.expiry_date IS NOT NULL
         AND es.biz_org_code LIKE concat(#{bizOrgCode}, '%')
-        AND DATEDIFF( DATE_ADD( DATE_FORMAT( ed.delivery_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) > 0
-        AND 60 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.delivery_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
+        AND 60 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
         ) AS countNum
     </select>
 </mapper>