|
@@ -1002,8 +1002,8 @@ open class ManualRelationCalcService {
|
|
|
list.add(SFilter.eq("classCode1",manualRelationCalcRequest.categoryTo!!))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueFrom.isNullOrEmpty()) {
|
|
|
- list.add(SFilter.or(SFilter.contain("localName1",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId1",manualRelationCalcRequest.vagueTo!!)
|
|
|
- ,SFilter.contain("codeName1",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ list.add(SFilter.or(SFilter.contain("localName1",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("localId1",manualRelationCalcRequest.vagueFrom!!)
|
|
|
+ ,SFilter.contain("codeName1",manualRelationCalcRequest.vagueFrom!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.categoryTo.isNullOrEmpty()) {
|
|
|
list.add(SFilter.eq("classCode2",manualRelationCalcRequest.categoryTo!!))
|
|
@@ -1099,8 +1099,8 @@ open class ManualRelationCalcService {
|
|
|
list.add(SFilter.eq("classCode",manualRelationCalcRequest.categoryFrom!!))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueFrom.isNullOrEmpty()) {
|
|
|
- list.add(SFilter.or(SFilter.contain("codeName",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId1",manualRelationCalcRequest.vagueTo!!)
|
|
|
- ,SFilter.contain("bimTypeId",manualRelationCalcRequest.vagueTo!!),SFilter.contain("systemCategotry",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ list.add(SFilter.or(SFilter.contain("codeName",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("localId1",manualRelationCalcRequest.vagueFrom!!)
|
|
|
+ ,SFilter.contain("bimTypeId",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("systemCategotry",manualRelationCalcRequest.vagueFrom!!)))
|
|
|
}
|
|
|
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
@@ -1190,7 +1190,7 @@ 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!!)
|
|
|
+ list.add(SFilter.or(SFilter.contain("aliasName",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("localId1",manualRelationCalcRequest.vagueFrom!!)
|
|
|
,SFilter.contain("bimTypeId",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("systemCategotry",manualRelationCalcRequest.vagueFrom!!)))
|
|
|
}
|
|
|
val pageQuery = relEq2SpForEquipService.pageQuery(sQueryRequest, list)
|
|
@@ -1206,8 +1206,8 @@ open class ManualRelationCalcService {
|
|
|
list.add(SFilter.eq("classCode",manualRelationCalcRequest.categoryFrom!!))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueFrom.isNullOrEmpty()) {
|
|
|
- list.add(SFilter.or(SFilter.contain("codeName",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId1",manualRelationCalcRequest.vagueTo!!)
|
|
|
- ,SFilter.contain("bimTypeId",manualRelationCalcRequest.vagueTo!!),SFilter.contain("systemCategotry",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ list.add(SFilter.or(SFilter.contain("codeName",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("localId1",manualRelationCalcRequest.vagueFrom!!)
|
|
|
+ ,SFilter.contain("bimTypeId",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("systemCategotry",manualRelationCalcRequest.vagueFrom!!)))
|
|
|
}
|
|
|
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
@@ -1314,8 +1314,8 @@ open class ManualRelationCalcService {
|
|
|
list.add(SFilter.eq("classCode",manualRelationCalcRequest.categoryFrom!!))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueFrom.isNullOrEmpty()) {
|
|
|
- list.add(SFilter.or(SFilter.contain("aliasName",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId1",manualRelationCalcRequest.vagueTo!!)
|
|
|
- ,SFilter.contain("bimTypeId",manualRelationCalcRequest.vagueTo!!),SFilter.contain("systemCategotry",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ list.add(SFilter.or(SFilter.contain("codeName",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("localId1",manualRelationCalcRequest.vagueFrom!!)
|
|
|
+ ,SFilter.contain("bimTypeId",manualRelationCalcRequest.vagueFrom!!),SFilter.contain("systemCategotry",manualRelationCalcRequest.vagueFrom!!)))
|
|
|
}
|
|
|
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|