From 196bb14112448857a885e32dc4149e308e00b01a Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 15 八月 2024 11:57:15 +0800
Subject: [PATCH] 2024.8.15 各项修正
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/UserSearchCondition.kt | 113 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 97 insertions(+), 16 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/UserSearchCondition.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/UserSearchCondition.kt
index c4b263a..179a04e 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/UserSearchCondition.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/UserSearchCondition.kt
@@ -1,25 +1,106 @@
package cn.flightfeather.supervision.lightshare.vo
+import cn.flightfeather.supervision.domain.entity.UserConfig
+
/**
* 鐢ㄦ埛鏌ヨ鏉′欢
*/
-data class UserSearchCondition(
- /**
- * 鍦烘櫙绫诲瀷
- * @see [cn.flightfeather.supervision.domain.enumeration.SceneType.value]
- */
- val sceneTypes: List<String> = emptyList(),
+class UserSearchCondition {
+ companion object {
- /**
- * 琛楅晣琛屾斂浠ｇ爜
- */
- val townCodes: List<String> = emptyList(),
+ fun fromUserConfig(config: UserConfig?, condition: UserSearchCondition? = null): UserSearchCondition {
+ return condition?.apply {
+ config?.ucProvinceCode?.let { provinceCode = it }
+ config?.ucProvinceName?.let { provinceName = it }
+ config?.ucCityCode?.let { cityCode = it }
+ config?.ucCityName?.let { cityName = it }
+ config?.ucDistrictCode?.let { districtCode = it }
+ config?.ucDistrictName?.let { districtName = it }
+ config?.ucTownCode?.let { townCode = it }
+ config?.ucTownName?.let { townName = it }
+ config?.ucAreaCode?.let { areaCode = it }
+ config?.ucArea?.let { area = it }
+ config?.ucManagementCompanyId?.let { mcId = it }
+ config?.ucManagementCompany?.let { mcName = it }
+ // userTypeId = config?.ucUserTypeId?.toByte()
+ // userSubTypeId = config?.ucUserSubtypeId?.toByte()
+ }
+ ?: UserSearchCondition().apply {
+ config?.ucProvinceCode?.let { provinceCode = it }
+ config?.ucProvinceName?.let { provinceName = it }
+ config?.ucCityCode?.let { cityCode = it }
+ config?.ucCityName?.let { cityName = it }
+ config?.ucDistrictCode?.let { districtCode = it }
+ config?.ucDistrictName?.let { districtName = it }
+ config?.ucTownCode?.let { townCode = it }
+ config?.ucTownName?.let { townName = it }
+ config?.ucAreaCode?.let { areaCode = it }
+ config?.ucArea?.let { area = it }
+ config?.ucManagementCompanyId?.let { mcId = it }
+ config?.ucManagementCompany?.let { mcName = it }
+ // userTypeId = config?.ucUserTypeId?.toByte()
+ // userSubTypeId = config?.ucUserSubtypeId?.toByte()
+ }
+ }
+ }
- val districtName: String? = null,
+ var provinceCode: String? = null
- /**
- * 鏌ヨ瀛楁锛屽搴斾紒涓氬悕绉�
- */
- val searchText: String = ""
+ var provinceName: String? = null
-)
\ No newline at end of file
+ var cityCode: String? = null
+
+ var cityName: String? = null
+
+ var districtCode: String? = null
+
+ var districtName: String? = null
+
+ //琛楅晣琛屾斂浠ｇ爜
+ var townCode: String? = null
+
+ var townName: String? = null
+
+ //闆嗕腑鍖虹紪鍙�
+ var areaCode: String? = null
+
+ //闆嗕腑鍖哄悕绉�
+ var area: String? = null
+
+ //鎵�灞炵墿涓歩d
+ var mcId: String? = null
+
+ //鎵�灞炵墿涓氬悕绉�
+ var mcName: String? = null
+
+ //鐢ㄦ埛绫诲瀷id
+ var userTypeId: Byte? = null
+
+ //鐢ㄦ埛瀛愮被鍨媔d
+ var userSubTypeId: Byte? = null
+
+ //鏄惁鍙敤
+ var online: Boolean? = null
+
+ /**
+ * 鍦烘櫙绫诲瀷
+ * @see [cn.flightfeather.supervision.domain.enumeration.SceneType.value]
+ */
+ var sceneTypes: List<String> = emptyList()
+
+
+ // 鏌ヨ瀛楁锛屽搴斾紒涓氬悕绉�
+ var searchText: String? = null
+
+ // 鎸夌収璇勫垎鎺掑簭锛岄粯璁ら檷搴�
+ var sorts: String = "desc"
+
+ // 鍛ㄦ湡, yyyy/M-M 鎴� yyyy-MM-dd
+ var period: String? = null
+
+ // 鐜俊鐮佺瓑绾э紝0锛氱豢鐮侊紱1锛氶粍鐮侊紱2锛氱孩鐮侊紱null锛氬叏閮�
+ var codeType: Int? = null
+
+ // 椋庨櫓绛夌骇锛�0锛氫綆椋庨櫓锛�1锛氫腑椋庨櫓锛�2锛氶珮椋庨櫓锛沶ull锛氬叏閮�
+ var riskType: Int? = null
+}
\ No newline at end of file
--
Gitblit v1.9.3