From d76e261b1c49f9df83af63cc8c2cfa1d46e5522b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=83=E6=B0=94=E6=BB=A1=E6=BB=A1=28jgy=29?= <KHD@202305>
Date: Wed, 9 Oct 2024 10:32:32 +0800
Subject: [PATCH] =?UTF-8?q?2024-10-09=20=E8=AE=BE=E5=A4=87-=E5=AE=89?=
 =?UTF-8?q?=E7=8E=AF-=E7=82=B9=E6=A3=80=E3=80=81=E5=B7=A1=E6=A3=80?=
 =?UTF-8?q?=E3=80=81=E4=BF=9D=E5=85=BB=E4=B8=89=E4=B8=AA=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/device/domain/EquOrder.java  | 11 +++++++++--
 .../main/resources/mapper/device/EquOrderMapper.xml   |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java
index 83487f91..c72821f3 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java
@@ -292,7 +292,10 @@ public class EquOrder extends BaseEntity {
     //合格率
     private String complianceRate;
 
-    public String getPicturePath() {
+    //设备类型编码 安环三个报表要用
+    private String equipmentTypeCode;
+
+  public String getPicturePath() {
         return picturePath;
     }
 
@@ -829,11 +832,15 @@ public class EquOrder extends BaseEntity {
     }
 
     public String getComplianceRate() { return complianceRate; }
-
     public void setComplianceRate(String complianceRate) {
         this.complianceRate = complianceRate;
     }
 
+    public String getEquipmentTypeCode() { return equipmentTypeCode; }
+    public void setEquipmentTypeCode(String equipmentTypeCode) {
+        this.equipmentTypeCode = equipmentTypeCode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
index 7f2cdcff..2f4f953b 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
@@ -152,6 +152,7 @@
             <if test="orderEndArrayStart != null ">and CONVERT(date,eo.order_end) >= #{orderEndArrayStart}</if>
             <if test="orderEndArrayEnd != null ">and #{orderEndArrayEnd} >= CONVERT(date,eo.order_end)</if>
             <if test="planName != null  and planName != ''">and ep.plan_name like concat('%', #{planName}, '%')</if>
+            <if test="equipmentTypeCode != null  and equipmentTypeCode != ''">and be.equipment_type_code like concat('%',#{equipmentTypeCode}, '%')</if>
             and eo.del_flag = '0' and be.del_flag = '0' and ep.del_flag = '0'
         </where>
         order by eo.create_time desc