|
@@ -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>()
|