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 @@
and CONVERT(date,eo.order_end) >= #{orderEndArrayStart}
and #{orderEndArrayEnd} >= CONVERT(date,eo.order_end)
and ep.plan_name like concat('%', #{planName}, '%')
+ and be.equipment_type_code like concat('%',#{equipmentTypeCode}, '%')
and eo.del_flag = '0' and be.del_flag = '0' and ep.del_flag = '0'
order by eo.create_time desc