|
@@ -3812,10 +3812,10 @@ open class ManualRelationCalcService {
|
|
|
if (rSp2SpList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rSp2SpTwoService.select(listSF).exec()
|
|
@@ -3859,10 +3859,10 @@ open class ManualRelationCalcService {
|
|
|
if (rSp2SpList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rSp2ShTwoService.select(listSF).exec()
|
|
@@ -3908,10 +3908,10 @@ open class ManualRelationCalcService {
|
|
|
if (rSp2SpList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rSp2FlTwoService.select(listSF).exec()
|
|
@@ -3956,10 +3956,10 @@ open class ManualRelationCalcService {
|
|
|
if (rSp2SpList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rSp2BdTwoService.select(listSF).exec()
|
|
@@ -4005,10 +4005,10 @@ open class ManualRelationCalcService {
|
|
|
if (rSh2SpList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rSh2SpTwoService.select(listSF).exec()
|
|
@@ -4053,10 +4053,10 @@ open class ManualRelationCalcService {
|
|
|
if (rSh2ShList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rSh2ShTwoService.select(listSF).exec()
|
|
@@ -4102,10 +4102,10 @@ open class ManualRelationCalcService {
|
|
|
if (rSh2FlList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rSh2FlTwoService.select(listSF).exec()
|
|
@@ -4150,10 +4150,10 @@ open class ManualRelationCalcService {
|
|
|
if (rSh2BdList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rSh2BdTwoService.select(listSF).exec()
|
|
@@ -4198,10 +4198,10 @@ open class ManualRelationCalcService {
|
|
|
if (rFl2SpList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rFl2SpTwoService.select(listSF).exec()
|
|
@@ -4247,10 +4247,10 @@ open class ManualRelationCalcService {
|
|
|
if (rFl2ShList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rFl2ShTwoService.select(listSF).exec()
|
|
@@ -4295,10 +4295,10 @@ open class ManualRelationCalcService {
|
|
|
if (rFl2ShList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rFl2FlTwoService.select(listSF).exec()
|
|
@@ -4344,10 +4344,10 @@ open class ManualRelationCalcService {
|
|
|
if (rFl2ShList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rFl2BdTwoService.select(listSF).exec()
|
|
@@ -4393,10 +4393,10 @@ open class ManualRelationCalcService {
|
|
|
if (rBd2SpList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rBd2SpTwoService.select(listSF).exec()
|
|
@@ -4440,10 +4440,10 @@ open class ManualRelationCalcService {
|
|
|
if (rBd2ShList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rBd2ShTwoService.select(listSF).exec()
|
|
@@ -4488,10 +4488,10 @@ open class ManualRelationCalcService {
|
|
|
if (rBd2FlList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rBd2FlTwoService.select(listSF).exec()
|
|
@@ -4536,10 +4536,10 @@ open class ManualRelationCalcService {
|
|
|
if (rBd2BdList.size>0) {
|
|
|
val listSF = ArrayList<SFilter>()
|
|
|
if (!manualRelationCalcRequest.vague.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name1",manualRelationCalcRequest.vague!!),SFilter.contain("localId1",manualRelationCalcRequest.vague!!),SFilter.contain("localName1",manualRelationCalcRequest.vague!!)))
|
|
|
}
|
|
|
if (!manualRelationCalcRequest.vagueTo.isNullOrEmpty()){
|
|
|
- listSF.add(SFilter.or(SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
+ listSF.add(SFilter.or(SFilter.contain("name2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localId2",manualRelationCalcRequest.vagueTo!!),SFilter.contain("localName2",manualRelationCalcRequest.vagueTo!!)))
|
|
|
}
|
|
|
listSF.add(SFilter.eq("projectId", projectId))
|
|
|
val rSp2SpTwoList = CommonServices.rBd2BdTwoService.select(listSF).exec()
|