|
@@ -3809,13 +3809,15 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rSp2SpList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
- val rSp2SpTwoList = CommonServices.rSp2SpTwoService.select(list).exec()
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val rSp2SpTwoList = CommonServices.rSp2SpTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
|
val listId1 = ArrayList<String>()
|
|
@@ -3825,11 +3827,9 @@ open class ManualRelationCalcService {
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
- val listSF = ArrayList<SFilter>()
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relZoneSpaceForService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+ val pageQuery = CommonServices.relZoneSpaceForService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
@@ -3856,13 +3856,15 @@ open class ManualRelationCalcService {
|
|
|
val rSp2SpList = CommonServices.rSp2ShService.select(SFilter.eq("projectId", projectId), SFilter.eq("type", manualRelationCalcRequest.relType!!)).exec()
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rSp2SpList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
- val rSp2SpTwoList = CommonServices.rSp2ShTwoService.select(list).exec()
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val rSp2SpTwoList = CommonServices.rSp2ShTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
|
val listId1 = ArrayList<String>()
|
|
@@ -3874,9 +3876,9 @@ open class ManualRelationCalcService {
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relZoneSpaceForShService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+// listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val pageQuery = CommonServices.relZoneSpaceForShService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
@@ -3903,13 +3905,15 @@ open class ManualRelationCalcService {
|
|
|
val rSp2SpList = CommonServices.rSp2FlService.select(SFilter.eq("projectId", projectId), SFilter.eq("type", manualRelationCalcRequest.relType!!)).exec()
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rSp2SpList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
- val rSp2SpTwoList = CommonServices.rSp2FlTwoService.select(list).exec()
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val rSp2SpTwoList = CommonServices.rSp2FlTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
|
val listId1 = ArrayList<String>()
|
|
@@ -3919,11 +3923,10 @@ open class ManualRelationCalcService {
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
- val listSF = ArrayList<SFilter>()
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relZoneSpaceForFlService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+
|
|
|
+ val pageQuery = CommonServices.relZoneSpaceForFlService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
@@ -3950,13 +3953,15 @@ open class ManualRelationCalcService {
|
|
|
val rSp2SpList = CommonServices.rSp2BdService.select(SFilter.eq("projectId", projectId), SFilter.eq("type", manualRelationCalcRequest.relType!!)).exec()
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rSp2SpList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
- val rSp2SpTwoList = CommonServices.rSp2BdTwoService.select(list).exec()
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val rSp2SpTwoList = CommonServices.rSp2BdTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
|
val listId1 = ArrayList<String>()
|
|
@@ -3966,11 +3971,10 @@ open class ManualRelationCalcService {
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
- val listSF = ArrayList<SFilter>()
|
|
|
+
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relZoneSpaceForBdService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+ val pageQuery = CommonServices.relZoneSpaceForBdService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
@@ -3998,13 +4002,15 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rSh2SpList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
- val rSp2SpTwoList = CommonServices.rSh2SpTwoService.select(list).exec()
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val rSp2SpTwoList = CommonServices.rSh2SpTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
|
val listId1 = ArrayList<String>()
|
|
@@ -4014,11 +4020,9 @@ open class ManualRelationCalcService {
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
- val listSF = ArrayList<SFilter>()
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relShaftForSpService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+ val pageQuery = CommonServices.relShaftForSpService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
@@ -4046,13 +4050,15 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rSh2ShList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
- val rSp2SpTwoList = CommonServices.rSh2ShTwoService.select(list).exec()
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val rSp2SpTwoList = CommonServices.rSh2ShTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
|
val listId1 = ArrayList<String>()
|
|
@@ -4062,11 +4068,10 @@ open class ManualRelationCalcService {
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
- val listSF = ArrayList<SFilter>()
|
|
|
+
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relShaftForShService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+ val pageQuery = CommonServices.relShaftForShService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
@@ -4094,13 +4099,15 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rSh2FlList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
- val rSp2SpTwoList = CommonServices.rSh2FlTwoService.select(list).exec()
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val rSp2SpTwoList = CommonServices.rSh2FlTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
|
val listId1 = ArrayList<String>()
|
|
@@ -4110,11 +4117,9 @@ open class ManualRelationCalcService {
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
- val listSF = ArrayList<SFilter>()
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relShaftForFlService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+ val pageQuery = CommonServices.relShaftForFlService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
@@ -4142,13 +4147,15 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rSh2BdList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
- val rSp2SpTwoList = CommonServices.rSh2BdTwoService.select(list).exec()
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val rSp2SpTwoList = CommonServices.rSh2BdTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
|
val listId1 = ArrayList<String>()
|
|
@@ -4158,11 +4165,9 @@ open class ManualRelationCalcService {
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
- val listSF = ArrayList<SFilter>()
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relShaftForBdService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+ val pageQuery = CommonServices.relShaftForBdService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
@@ -4190,12 +4195,14 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rFl2SpList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rFl2SpTwoService.select(list).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
@@ -4206,11 +4213,10 @@ open class ManualRelationCalcService {
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
- val listSF = ArrayList<SFilter>()
|
|
|
+
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relFloorForSpService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+ val pageQuery = CommonServices.relFloorForSpService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
@@ -4238,13 +4244,15 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rFl2ShList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
- val rSp2SpTwoList = CommonServices.rFl2ShTwoService.select(list).exec()
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val rSp2SpTwoList = CommonServices.rFl2ShTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
|
val listId1 = ArrayList<String>()
|
|
@@ -4254,11 +4262,9 @@ open class ManualRelationCalcService {
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
- val listSF = ArrayList<SFilter>()
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relFloorForShService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+ val pageQuery = CommonServices.relFloorForShService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
@@ -4286,13 +4292,15 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rFl2ShList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
- val rSp2SpTwoList = CommonServices.rFl2FlTwoService.select(list).exec()
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val rSp2SpTwoList = CommonServices.rFl2FlTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
|
val listId1 = ArrayList<String>()
|
|
@@ -4304,9 +4312,8 @@ open class ManualRelationCalcService {
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relFloorForFlService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+ val pageQuery = CommonServices.relFloorForFlService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
@@ -4334,13 +4341,15 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rFl2ShList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
- val rSp2SpTwoList = CommonServices.rFl2BdTwoService.select(list).exec()
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val rSp2SpTwoList = CommonServices.rFl2BdTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
|
val listId1 = ArrayList<String>()
|
|
@@ -4350,11 +4359,10 @@ open class ManualRelationCalcService {
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
- val listSF = ArrayList<SFilter>()
|
|
|
+
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relFloorForBdService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+ val pageQuery = CommonServices.relFloorForBdService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
@@ -4382,15 +4390,16 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rBd2SpList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
- val rSp2SpTwoList = CommonServices.rBd2SpTwoService.select(list).exec()
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val rSp2SpTwoList = CommonServices.rBd2SpTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
-
|
|
|
val listId1 = ArrayList<String>()
|
|
|
val listId2 = ArrayList<String>()
|
|
|
for (rSp2SpTwo in rSp2SpTwoList){
|
|
@@ -4398,11 +4407,9 @@ open class ManualRelationCalcService {
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
- val listSF = ArrayList<SFilter>()
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relBuildingForSpService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+ val pageQuery = CommonServices.relBuildingForSpService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
@@ -4430,13 +4437,15 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rBd2ShList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
- val rSp2SpTwoList = CommonServices.rBd2ShTwoService.select(list).exec()
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val rSp2SpTwoList = CommonServices.rBd2ShTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
|
val listId1 = ArrayList<String>()
|
|
@@ -4446,11 +4455,9 @@ open class ManualRelationCalcService {
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
- val listSF = ArrayList<SFilter>()
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relBuildingForShService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+ val pageQuery = CommonServices.relBuildingForShService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
@@ -4478,13 +4485,15 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rBd2FlList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
- val rSp2SpTwoList = CommonServices.rBd2FlTwoService.select(list).exec()
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val rSp2SpTwoList = CommonServices.rBd2FlTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
|
val listId1 = ArrayList<String>()
|
|
@@ -4494,11 +4503,9 @@ open class ManualRelationCalcService {
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
- val listSF = ArrayList<SFilter>()
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relBuildingForFlService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+ val pageQuery = CommonServices.relBuildingForFlService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
@@ -4526,13 +4533,15 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val manualRelationCalcResponse = ManualRelationCalcResponse()
|
|
|
if (rBd2BdList.size>0) {
|
|
|
+ val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- list.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
- val rSp2SpTwoList = CommonServices.rBd2BdTwoService.select(list).exec()
|
|
|
+ listSF.add(SFilter.eq("projectId", projectId))
|
|
|
+ val rSp2SpTwoList = CommonServices.rBd2BdTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
|
val listId1 = ArrayList<String>()
|
|
@@ -4542,11 +4551,9 @@ open class ManualRelationCalcService {
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
- val listSF = ArrayList<SFilter>()
|
|
|
sCascadeQuery.filters = "id in ${listId2.toJson()}"
|
|
|
- listSF.add(SFilter.inList("id",listId1.toList()))
|
|
|
- listSF.add(SFilter.eq("projectId", projectId))
|
|
|
- val pageQuery = CommonServices.relBuildingForBdService.pageQuery(sQueryRequest, listSF)
|
|
|
+ list.add(SFilter.inList("id",listId1.toList()))
|
|
|
+ val pageQuery = CommonServices.relBuildingForBdService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|
|
|
manualRelationCalcResponse.content = pageQuery.content
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|