caiaf 3 years ago
parent
commit
630c4fca9d

+ 2 - 2
data-core/src/main/kotlin/com/persagy/server/datacenter/wanda/rel/REq2SpTwo.kt

@@ -84,13 +84,13 @@ class REq2SpTwo : RBaseInfo(){
     var systemCategotry: String? = null
 
     @Column(name = "code_name")
-    var codeName2: String? = null
+    var codeName: String? = null
 
     @Column(name = "local_id1")
     var localId1: String? = null
 
     @Column(name = "class_code")
-    var classCode1: String? = null
+    var classCode: String? = null
 
     @Column(name = "local_id2")
     var localId2: String? = null

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

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