test

lib/src/main/java/com/gyf/lib/util/Vo.kt

@@ -239,7 +239,7 @@ enum class AssociationFaculty(val desc: String, val range: kotlin.ranges.IntRang
 }
 
 abstract class BaseAssociationVo {
-    abstract val id: Int
+    abstract val associationId: Int
     abstract val name: String
     abstract val desc: String
     abstract val logo: String
@@ -252,7 +252,7 @@ abstract class BaseAssociationVo {
  *
  */
 class AssociationVo(
-    override val id: Int,
+    override val associationId: Int,
     override val name: String,
     override val desc: String,
     override val logo: String,
@@ -269,10 +269,6 @@ enum class CheckStatus(val desc: String) {
     Finish("审核完成")
 }
 
-data class AssociationMemberVo(
-    val association: AssociationVo,
-    val isHead: Boolean
-)
 
 /**
  * 活动照片
@@ -286,19 +282,21 @@ data class AssociationMainVo(
     val photos: List<AssociationActPhotoVo>? = null
 )
 
-//用户社团
+data class AuditCheckVo(
+    val checkStatus: CheckStatus, val applyTime: Long,
+    val firstCause: String, val lastCause: String?
+)
+
+//前台社团注册资料
 data class AssociationCheckVo(
-    override val id: Int,
+    override val associationId: Int,
     override val name: String,
     override val desc: String,
     override val logo: String,
     override val faculty: AssociationFaculty,
     override val level: AssociationLevel?,
-    val checkStatus: CheckStatus,
-    val applyTime: Long,
-    val firstCause: String,
-    val lastCause: String?,
-    val fileId: Int
+    val fileId: Int,
+    val auditCheckVo: AuditCheckVo
 ) : BaseAssociationVo()
 
 /**
@@ -408,20 +406,25 @@ data class QualityReportVo(
  * @property fileId
  */
 data class AssociationRegVo(
-    val id: Int?, val name: String, val desc: String, val fileId: Int,
+    val associationId: Int?, val name: String, val desc: String, val fileId: Int,
     override val clientType: ClientType = ClientType.Foreground
 ) : ClientBaseVo()
 
+
+abstract class AuditVo {
+    abstract val audit: AuditLoggingVo
+}
+
 /**
  * 社团注册审核记录
  *
  */
-data class DisposeRegInfoVo(
+data class AuditAssociationVo(
     val name: String,
     val desc: String,
     val logo: String,
-    val log: AuditLoggingVo
-)
+    override val audit: AuditLoggingVo
+) : AuditVo()
 
 /**
  * 通用审核记录
@@ -445,28 +448,64 @@ data class AuditLoggingVo(
 /**
  * 社团注册资料受理
  *
- * @property regId
+ * @property auditId
  * @property clientType
  */
-data class AcceptRegAssociation(
-    val regId: Int,
-    val isFirstAccept: Boolean,
+data class AcceptVo(
+    val auditId: Int,
     override val clientType: ClientType = ClientType.Background
 ) : ClientBaseVo()
 
 /**
  * 社团注册资料审核
  *
- * @property regId
+ * @property auditId
  * @property result
  * @property cause
  * @property clientType
  */
-data class CheckRegVo(
-    val regId: Int, val result: Boolean, val cause: String,
+data class CheckVo(
+    val auditId: Int, val result: Boolean, val cause: String,
     override val clientType: ClientType = ClientType.Background
 ) : ClientBaseVo()
 
+
+/**
+ * 前台活动申请书
+ *
+ * @property activityId
+ * @property activityName
+ * @property activityTime
+ * @property activityAddress
+ * @property activityDesc
+ * @property activitySize
+ * @property clientType
+ */
+data class ActivityApplyVo(
+    val activityId: Int?, val associationId: Int,
+    val activityName: String, val activityTime: Long,
+    val activityAddress: String,
+    val activityDesc: String, val activitySize: Int,
+    override val clientType: ClientType = ClientType.Foreground
+) : ClientBaseVo()
+
+/**
+ * 后台活动申请书
+ *
+ * @property auditId
+ * @property activityName
+ * @property activityTime
+ * @property activityAddress
+ * @property activityDesc
+ * @property activitySize
+ */
+data class AuditActVo(
+    val auditId: Int, val activityName: String, val activityTime: Long,
+    val activityAddress: String,
+    val activityDesc: String, val activitySize: Int,
+    override val audit: AuditLoggingVo
+) : AuditVo()
+
 /**
  * 换名申请表
  *