瀏覽代碼

******************WX *********************
搜索关系,区域服务关系

zhangweixin 4 年之前
父節點
當前提交
4e338c1f84
共有 17 個文件被更改,包括 192 次插入32 次删除
  1. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RBd2BdTwo.kt
  2. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RBd2FlTwo.kt
  3. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RBd2ShTwo.kt
  4. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RBd2SpTwo.kt
  5. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RFl2BdTwo.kt
  6. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RFl2FlTwo.kt
  7. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RFl2ShTwo.kt
  8. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RFl2SpTwo.kt
  9. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSh2BdTwo.kt
  10. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSh2FlTwo.kt
  11. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSh2ShTwo.kt
  12. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSh2SpTwo.kt
  13. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSp2BdTwo.kt
  14. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSp2FlTwo.kt
  15. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSp2ShTwo.kt
  16. 10 0
      data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSp2SpTwo.kt
  17. 32 32
      datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RBd2BdTwo.kt

@@ -95,4 +95,14 @@ class RBd2BdTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RBd2FlTwo.kt

@@ -95,4 +95,14 @@ class RBd2FlTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RBd2ShTwo.kt

@@ -95,4 +95,14 @@ class RBd2ShTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RBd2SpTwo.kt

@@ -101,4 +101,14 @@ class RBd2SpTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RFl2BdTwo.kt

@@ -95,4 +95,14 @@ class RFl2BdTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RFl2FlTwo.kt

@@ -95,4 +95,14 @@ class RFl2FlTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RFl2ShTwo.kt

@@ -95,4 +95,14 @@ class RFl2ShTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RFl2SpTwo.kt

@@ -101,4 +101,14 @@ class RFl2SpTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSh2BdTwo.kt

@@ -95,4 +95,14 @@ class RSh2BdTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSh2FlTwo.kt

@@ -95,4 +95,14 @@ class RSh2FlTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSh2ShTwo.kt

@@ -95,4 +95,14 @@ class RSh2ShTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSh2SpTwo.kt

@@ -101,4 +101,14 @@ class RSh2SpTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSp2BdTwo.kt

@@ -101,4 +101,14 @@ class RSp2BdTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSp2FlTwo.kt

@@ -101,4 +101,14 @@ class RSp2FlTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSp2ShTwo.kt

@@ -101,4 +101,14 @@ class RSp2ShTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

+ 10 - 0
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/rel/archforarch/RSp2SpTwo.kt

@@ -101,4 +101,14 @@ class RSp2SpTwo : RBaseInfo(){
     @Column(name = "local_name2")
     var localName2: String? = null
 
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name1")
+    var name1: String? = null
+
+    /** 名称 */
+    @Schema(description = "名称")
+    @Column(name = "name2")
+    var name2: String? = null
+
 }

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

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