refactor(更新)

- 数据库修改

app/src/main/java/com/grkj/iscs/features/main/fragment/common/SelectMemberFragment.kt

@@ -61,11 +61,11 @@ class SelectMemberFragment : BaseFragment<FragmentSelectMemeberBinding>() {
             navController.popBackStack()
         }
         binding.confirm.setDebouncedClickListener {
-            if (selectedLockerData.isEmpty()){
+            if (selectedLockerData.isEmpty()) {
                 PopTip.tip(com.grkj.ui_base.R.string.please_select_locker)
                 return@setDebouncedClickListener
             }
-            if (selectedColockerData.isEmpty()){
+            if (canSelectColoker && selectedColockerData.isEmpty()) {
                 PopTip.tip(com.grkj.ui_base.R.string.please_select_colocker)
                 return@setDebouncedClickListener
             }
@@ -134,7 +134,8 @@ class SelectMemberFragment : BaseFragment<FragmentSelectMemeberBinding>() {
             } else {
                 item.isSelected = true
                 if ((item.avatar
-                        ?: viewModel.userBiometricDataVo.find { it.userId == item.userId }?.content)==null){
+                        ?: viewModel.userBiometricDataVo.find { it.userId == item.userId }?.content) == null
+                ) {
                     PopTip.tip(R.string.current_user_has_not_face_data)
                 }
                 if (isLockerSelect) {

data/src/main/java/com/grkj/data/model/dos/BaseStandardBean.kt

@@ -0,0 +1,57 @@
+package com.grkj.data.model.dos
+
+import androidx.room.ColumnInfo
+import androidx.room.Ignore
+import com.grkj.data.data.MainDomainData
+import com.sik.sikcore.date.TimeUtils
+import java.io.Serializable
+
+/**
+ * Bean基类
+ *
+ * @author ruoyi
+ */
+open class BaseStandardBean : Serializable {
+    @ColumnInfo("creator")
+    var creator: String? = MainDomainData.userInfo?.userName
+
+    @ColumnInfo("create_time")
+    var createTime: String? = TimeUtils.nowString(TimeUtils.DEFAULT_DATE_HOUR_MIN_SEC_FORMAT)
+
+    /**
+     * 更新者
+     */
+    @ColumnInfo("updater")
+    var updater: String? = MainDomainData.userInfo?.userName
+
+    /**
+     * 更新时间
+     */
+    @ColumnInfo("update_time")
+    var updateTime: String? = TimeUtils.nowString(TimeUtils.DEFAULT_DATE_HOUR_MIN_SEC_FORMAT)
+
+    /**
+     * 备注
+     */
+    @ColumnInfo("remark")
+    var remark: String? = null
+
+    /**
+     * 是否选中
+     */
+    @Ignore
+    var isSelected: Boolean = false
+
+    @Ignore
+    var paramMap: MutableMap<String?, Any?>? = null
+        get() {
+            if (field == null) {
+                field = HashMap<String?, Any?>()
+            }
+            return field
+        }
+
+    companion object {
+        private const val serialVersionUID = 1L
+    }
+}

data/src/main/java/com/grkj/data/model/dos/IsJobTicketGroup.kt

@@ -0,0 +1,26 @@
+package com.grkj.data.model.dos
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+/**
+ * 作业分组分组
+ */
+@Entity(tableName = "is_sop_group")
+class IsJobTicketGroup : BaseStandardBean() {
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+
+    @ColumnInfo(name = "ticket_id")
+    var ticketId: Long = 0
+
+    @ColumnInfo(name = "group_name")
+    var groupName: String = ""
+
+    var deleted: String = ""
+
+    @ColumnInfo(name = "tenant_id")
+    var tenantId: Long? = null
+
+}

data/src/main/java/com/grkj/data/model/dos/IsJobTicketPoints.kt

@@ -16,6 +16,9 @@ open class IsJobTicketPoints : BaseBean() {
     @ColumnInfo("ticket_id")
     var ticketId: Long = 0
 
+    @ColumnInfo("group_id")
+    var groupId: Long = 0
+
     @ColumnInfo("workshop_id")
     var workshopId: Long? = null
 

data/src/main/java/com/grkj/data/model/dos/IsJobTicketUser.kt

@@ -15,6 +15,9 @@ open class IsJobTicketUser : BaseBean() {
 	
 	@ColumnInfo("ticket_id")
     var ticketId: Long = 0
+
+    @ColumnInfo("group_id")
+    var groupId: Long = 0
 	
 	@ColumnInfo("user_id")
     var userId: Long = 0

data/src/main/java/com/grkj/data/model/dos/IsSopGroup.kt

@@ -0,0 +1,26 @@
+package com.grkj.data.model.dos
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+/**
+ * sop分组
+ */
+@Entity(tableName = "is_sop_group")
+class IsSopGroup : BaseStandardBean() {
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+
+    @ColumnInfo(name = "sop_id")
+    var sopId: Long = 0
+
+    @ColumnInfo(name = "group_name")
+    var groupName: String = ""
+
+    var deleted: String = ""
+
+    @ColumnInfo(name = "tenant_id")
+    var tenantId: Long?=null
+
+}

data/src/main/java/com/grkj/data/model/dos/IsSopPoints.kt

@@ -16,6 +16,9 @@ class IsSopPoints : BaseBean() {
     @ColumnInfo("sop_id")
     var sopId: Long = 0
 
+    @ColumnInfo("group_id")
+    var groupId: Long = 0
+
     @ColumnInfo("workshop_id")
     var workshopId: Long? = null
 

data/src/main/java/com/grkj/data/model/dos/IsSopUser.kt

@@ -19,6 +19,9 @@ class IsSopUser : BaseBean() {
     @ColumnInfo("user_id")
     var userId: Long = 0
 
+    @ColumnInfo("group_id")
+    var groupId: Long = 0
+
     @ColumnInfo("user_name")
     var userName: String? = null