Browse Source

Merge remote-tracking branch 'origin/master'

caiaf 3 years ago
parent
commit
583faf4f67

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/rel/REq2SpTwo.kt

@@ -38,7 +38,7 @@ import javax.persistence.Table
  * @author 张维新
  */
 @Schema(description = "设备空间分区关系")
-@Table(name = "relationship.r_eq2sp")
+@Table(name = "v_space_eq2sp")
 class REq2SpTwo : RBaseInfo(){
 
     /** 设备Id */

+ 2 - 4
datacenter/src/main/kotlin/com/persagy/server/datacenter/services/relation_calc/ManualRelationCalcService.kt

@@ -1298,8 +1298,8 @@ open class ManualRelationCalcService {
                     list.add(SFilter.eq("classCode",manualRelationCalcRequest.categoryFrom!!))
                 }
                 if (!manualRelationCalcRequest.vagueFrom.isNullOrEmpty()) {
-                    list.add(SFilter.or(SFilter.contain("codeName",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("localId1",manualRelationCalcRequest.vagueFrom!!)
-                            ,SFilter.contain("bimTypeId",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("systemCategotry",manualRelationCalcRequest.vagueFrom!!)))
+                    list.add(SFilter.or(SFilter.contain("codeName",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("localId",manualRelationCalcRequest.vagueFrom!!)
+                            ,SFilter.contain("bimTypeId",manualRelationCalcRequest.vagueFrom!!)))
                 }
 
                 val pageQuery = relEq2SpForEquipService.pageQuery(sQueryRequest, list)
@@ -1326,9 +1326,7 @@ open class ManualRelationCalcService {
                 }
                 val rEq2SpTwoList = rEq2SpTwoService.select(list).exec()
                 if (rEq2SpTwoList.size>0){
-                    for (rEq2SpTwo in rEq2SpTwoList){
 
-                    }
 
                     val listId1 = ArrayList<String>()
                     val listId2 = ArrayList<String>()