Browse Source

fix : 级联查询条件调整

lvxianyun 3 years ago
parent
commit
e1905bb7e2

+ 4 - 0
src/main/java/com/persagy/proxy/object/model/AdmComponent.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * ADM 组件 实体 ==> Equipment
@@ -88,6 +89,9 @@ public class AdmComponent extends AdmBaseEntity<AdmComponent> {
         /** 对象类型 */
         private String objectType;
 
+        /** 部件分类 */
+        private Map<String, String> equipCategory;
+
         /** 资产信息实体类   资产对应部件设施关系 资产→部件设施*/
         @CascadeColumn(graphCode = "Property2Mech", relCode = "Pe2Eq", selectToObj = false)
         private AdmProperty property;

+ 2 - 2
src/main/java/com/persagy/proxy/object/model/AdmEquipment.java

@@ -121,10 +121,10 @@ public class AdmEquipment extends AdmBaseEntity<AdmEquipment> {
     @CascadeColumn(graphCode = "Property2Mech", relCode = "Pe2Eq", selectToObj = false)
     private AdmProperty property;
     /** 建筑信息实体类 */
-    @CascadeColumn(graphCode = "MechForArch", relCode = "Eq2Bd")
+    @CascadeColumn(graphCode = "MechInArch", relCode = "Eq2Bd")
     private AdmBuilding building;
     /** 楼层信息实体类 */
-    @CascadeColumn(graphCode = "MechForArch", relCode = "Eq2Fl")
+    @CascadeColumn(graphCode = "MechInArch", relCode = "Eq2Fl")
     private AdmFloor floor;
     /** 项目信息实体类 */
     @CascadeColumn(graphCode = "MechSubset", relCode = "Pj2Eq", selectToObj = false)