From b114257ec68856f3fe078e5eee279492d3157869 Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Fri, 22 Nov 2024 20:10:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/tc/entity/AssetCurrent.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java
index 536e3e5..df21a0a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java
@@ -1035,4 +1035,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
 
     @ApiModelProperty("是否报废（默认0不报废 2代表报废）")
     private String isbf;
+
+    @ApiModelProperty("报废原因")
+    private String bfyy;
 }

From b1e962ae027c7165cc5e32f85c62c60e5f879070 Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Fri, 22 Nov 2024 21:41:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=A5=E6=A0=BC=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/AssetCurrentMapper.xml   | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml
index 28febe6..ae0b590 100644
--- a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml
@@ -41,7 +41,7 @@
         l.*
         FROM
         asset_current a
-        LEFT JOIN ( SELECT asset_id, NAME, tyshxydm, lxr, lxdh, gyszcdz, sfwtc FROM asset_supply_chain WHERE type = 5 GROUP BY asset_id ) b ON a.id = b.asset_id
+        LEFT JOIN ( SELECT asset_id, NAME, tyshxydm, lxr, lxdh, gyszcdz, sfwtc FROM asset_supply_chain WHERE type = 5 GROUP BY asset_id,NAME, tyshxydm, lxr, lxdh, gyszcdz, sfwtc ) b ON a.id = b.asset_id
         LEFT JOIN (
         SELECT
         asset_id,
@@ -56,7 +56,13 @@
         WHERE
         type = 7
         GROUP BY
-        asset_id
+        asset_id,
+        NAME,
+        tyshxydm,
+        lxr,
+        lxdh,
+        gyszcdz,
+        sfwtc
         ) c ON a.id = c.asset_id
         LEFT JOIN (
         SELECT
@@ -76,7 +82,11 @@
         WHERE
         type = 1
         GROUP BY
-        asset_id
+        asset_id,
+        sblx,
+        pp,
+        sb_ip,
+        czxt,czxtbb,yjxh,yjxlh,yjbbxx,yjyt,yjbsxx
         ) d ON a.id = d.asset_id
         LEFT JOIN (
         SELECT
@@ -94,11 +104,13 @@
         WHERE
         type = 2
         GROUP BY
-        asset_id
+        asset_id,
+        sblx,
+        pp,sb_ip,yjxh,yjxlh,yjbbxx,yjyt,yjbsxx
         ) e ON a.id = e.asset_id
         LEFT JOIN ( SELECT
                         asset_id, sblx AS aqwlsblx, pp AS aqwlpp, sb_ip AS aqwlsbIp
-                    FROM asset_basic_network WHERE type = 3 GROUP BY asset_id ) l ON a.id = l.asset_id
+                    FROM asset_basic_network WHERE type = 3 GROUP BY asset_id,sblx,pp,sb_ip ) l ON a.id = l.asset_id
         <where>
             a.del_flag = '0' and a.isbf = '0'
             <if test="req.xtmc!=null and req.xtmc!='' ">