2024-05-07 修改

修改

1. 机场三字码资料，数据结构修改，部分逻辑修改

2. 车公司资料，数据结构修改，部分逻辑修改

3. 导游资料，数据结构修改，部分逻辑修改

4. 酒店资料，数据结构修改，部分逻辑修改

app/src/main/java/com/pan_american/android/data/model/resource_management/airplane_three_code/entity/AirplaneThreeCode.kt

@@ -1,10 +1,18 @@
 package com.pan_american.android.data.model.resource_management.airplane_three_code.entity
 
+import com.pan_american.android.OASystem
 import java.io.Serializable
 
-class AirplaneThreeCode(
-    var three: String, var four: String, var country: String, var city: String, var airPort: String,
-    var airPort_En: String, var createUserId: Int, var remark: String): Serializable {
+class AirplaneThreeCode: Serializable {
+
+    var three = ""
+    var four = ""
+    var country = ""
+    var city = ""
+    var airPort = ""
+    var airPort_En = ""
+    var createUserId = OASystem.userInfo.userId
+    var remark = ""
 
     var id: Int = 0
     var status: Int = 0

app/src/main/java/com/pan_american/android/data/model/resource_management/car_resource/entity/CarResource.kt

@@ -1,14 +1,32 @@
 package com.pan_american.android.data.model.resource_management.car_resource.entity
 
+import com.pan_american.android.OASystem
 import java.io.Serializable
 
-class CarResource(
-    var unitArea: String, var unitName: String, var address: String, var contact: String,
-    var contactTel:String, var contactEmail: String, var contactFax: String, var carDes: String,
-    var carPicPaths: String, var otherInfo: String, var score: Int, var qualificationScore: String,
-    var carAgeScore: String, var cleanImgScore: String, var smellScore: String, var waterPaperScore: String,
-    var hardwareScore: String, var timeScore: String, var safetyScore: String, var drivingAgeScore: String,
-    var createUserId: Int, var remark: String) : Serializable {
+class CarResource: Serializable {
+
+    var unitArea = ""
+    var unitName = ""
+    var address = ""
+    var contact = ""
+    var contactTel = ""
+    var contactEmail = ""
+    var contactFax = ""
+    var carDes = ""
+    var carPicPaths = ""
+    var otherInfo = ""
+    var score = 0
+    var qualificationScore = ""
+    var carAgeScore = ""
+    var cleanImgScore = ""
+    var smellScore = ""
+    var waterPaperScore = ""
+    var hardwareScore = ""
+    var timeScore = ""
+    var safetyScore = ""
+    var drivingAgeScore = ""
+    var createUserId = OASystem.userInfo.userId
+    var remark = ""
 
     val id: Int = 0
     val createTime: String = ""

app/src/main/java/com/pan_american/android/data/model/resource_management/guide_resource/entity/GuideResource.kt

@@ -1,12 +1,28 @@
 package com.pan_american.android.data.model.resource_management.guide_resource.entity
 
+import com.pan_american.android.OASystem
 import java.io.Serializable
 
-class GuideResource(
-    var unitArea: String, var unitName: String, var address: String, var contact: String, var contactTel: String,
-    var contactEmail: String, var contactFax: String, var otherInfo: String, var score: Int, var suitScore: String,
-    var serveScore: String, var talkProScore: String, var timeScore: String, var fitScore: String, var strainScore: String,
-    var localAndChineseScore: String, val createUserId: Int, val remark: String): Serializable {
+class GuideResource: Serializable {
+
+    var unitArea = ""
+    var unitName = ""
+    var address = ""
+    var contact = ""
+    var contactTel = ""
+    var contactEmail = ""
+    var contactFax = ""
+    var otherInfo = ""
+    var score = 0
+    var suitScore = ""
+    var serveScore = ""
+    var talkProScore = ""
+    var timeScore = ""
+    var fitScore = ""
+    var strainScore = ""
+    var localAndChineseScore = ""
+    var createUserId = OASystem.userInfo.userId
+    var remark = ""
 
     var status = 0
     val id: Int = 0

app/src/main/java/com/pan_american/android/data/model/resource_management/hotel_resource/entity/HotelResource.kt

@@ -1,11 +1,21 @@
 package com.pan_american.android.data.model.resource_management.hotel_resource.entity
 
+import com.pan_american.android.OASystem
 import java.io.Serializable
 
-class HotelResource(
-    var city: String, var name: String, var level: String, var address: String,
-    var tel: String, var fax: String, var contact: String, var contactPhone: String,
-    var otherInformation: String, var createUserId: Int, var remark: String): Serializable {
+class HotelResource: Serializable {
+
+    var city = ""
+    var name = ""
+    var level = ""
+    var address = ""
+    var tel = ""
+    var fax = ""
+    var contact = ""
+    var contactPhone = ""
+    var otherInformation = ""
+    var createUserId = OASystem.userInfo.userId
+    var remark = ""
 
     var status: Int = 0
     val id: Int = 0

app/src/main/java/com/pan_american/android/ui/resource_management/airplane_three_code/AddAirplaneThreeCodeActivity.kt

@@ -56,7 +56,7 @@ class AddAirplaneThreeCodeActivity : BaseActivity<ActivityAddAirplaneThreeCodeBi
         if (fromList) {
 
             airplaneThreeCode =
-                intent.getSerializableExtra("airplaneResource") as AirplaneThreeCode
+                intent.getSerializableExtra("airplaneResource", AirplaneThreeCode::class.java) as AirplaneThreeCode
             initAirplaneResourceInfo()
 
             binding.commit.text = resources.getString(R.string.update)
@@ -64,8 +64,7 @@ class AddAirplaneThreeCodeActivity : BaseActivity<ActivityAddAirplaneThreeCodeBi
 
             binding.commit.text = resources.getString(R.string.add)
 
-            airplaneThreeCode =
-                AirplaneThreeCode("", "", "", "", "", "", OASystem.userInfo.userId, "")
+            airplaneThreeCode = AirplaneThreeCode()
         }
     }
 

app/src/main/java/com/pan_american/android/ui/resource_management/car_resource/AddCarResourceActivity.kt

@@ -62,36 +62,13 @@ class AddCarResourceActivity : BaseActivity<ActivityAddCarResourceBinding>() {
 
         if (fromList) {
 
-            carResource = intent.getSerializableExtra("carResource") as CarResource
+            carResource = intent.getSerializableExtra("carResource", CarResource::class.java) as CarResource
             initCarResourceInfo()
 
             binding.commit.text = resources.getString(R.string.update)
         } else {
 
-            carResource = CarResource(
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                0,
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                OASystem.userInfo.userId,
-                ""
-            )
+            carResource = CarResource()
         }
 
     }

app/src/main/java/com/pan_american/android/ui/resource_management/guide_resource/AddGuideResourceActivity.kt

@@ -63,32 +63,13 @@ class AddGuideResourceActivity : BaseActivity<ActivityAddGuideResourceBinding>()
 
         if (fromList) {
 
-            guideResource = intent.getSerializableExtra("guideResource") as GuideResource
+            guideResource = intent.getSerializableExtra("guideResource", GuideResource::class.java) as GuideResource
             binding.commit.text = resources.getString(R.string.update)
             initGuideResourceInfo()
 
         } else {
 
-            guideResource = GuideResource(
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                0,
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                OASystem.userInfo.userId,
-                ""
-            )
+            guideResource = GuideResource()
         }
     }
 

app/src/main/java/com/pan_american/android/ui/resource_management/hotel_resource/AddHotelResourceActivity.kt

@@ -61,7 +61,7 @@ class AddHotelResourceActivity : BaseActivity<ActivityAddHotelResourceBinding>()
         titleBinding.apply {
             if (fromList) {
 
-                hotelResource = intent.getSerializableExtra("hotelResource") as HotelResource
+                hotelResource = intent.getSerializableExtra("hotelResource", HotelResource::class.java) as HotelResource
                 initHotelResourceInfo()
 
                 binding.commit.text = resources.getString(R.string.update)
@@ -70,9 +70,7 @@ class AddHotelResourceActivity : BaseActivity<ActivityAddHotelResourceBinding>()
 
                 binding.commit.text = resources.getString(R.string.add)
 
-                hotelResource = HotelResource(
-                    "", "", "", "", "", "", "", "", "", OASystem.userInfo.userId, ""
-                )
+                hotelResource = HotelResource()
             }
         }