Selaa lähdekoodia

人员分配上锁人默认选择自己

Frankensteinly 9 kuukautta sitten
vanhempi
sitoutus
26368dafbc

+ 10 - 0
app/src/main/java/com/grkj/iscs/view/fragment/WorkerFragment.kt

@@ -9,6 +9,7 @@ import com.grkj.iscs.model.Constants.USER_ROLE_LOCKER
 import com.grkj.iscs.model.bo.PageChangeBO
 import com.grkj.iscs.model.vo.ticket.TicketUserReqVO
 import com.grkj.iscs.model.vo.user.UserListRespVO
+import com.grkj.iscs.util.SPUtils
 import com.grkj.iscs.view.base.BaseMvpFragment
 import com.grkj.iscs.view.iview.IWorkerView
 import com.grkj.iscs.view.presenter.WorkerPresenter
@@ -161,6 +162,15 @@ class WorkerFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> U
                 }
                 mSelectedList.add(TicketUserReqVO(user.userId!!, user.userName!!, user.userType!!, user.userRole!!))
             }
+            // 上锁人默认选择自己
+            if (mSelectedList.none { it.userRole == USER_ROLE_LOCKER }) {
+                val user = it?.jobTicketUserList?.find { it.userId == SPUtils.getLoginUser(requireContext())?.userId }
+                user?.let {
+                    mSelectedList.add(TicketUserReqVO(it.userId!!, it.userName!!, it.userType!!, USER_ROLE_LOCKER))
+                    mBinding?.layoutLocker?.root?.visibility = View.VISIBLE
+                    mBinding?.layoutLocker?.tvName?.text = it.userName
+                }
+            }
             mColockerSelectedShowList.addAll(mSelectedList.filter { it.userRole == USER_ROLE_COLOCKER }.toMutableList())
             mBinding?.rvColockerSelected?.adapter?.notifyDataSetChanged()
             mBinding?.rvLockerList?.adapter?.notifyDataSetChanged()

+ 6 - 0
app/src/main/res/values/strings.xml

@@ -161,4 +161,10 @@
     <string name="confirm">确定</string>
     <string name="please_select_locker">请选择上锁人</string>
     <string name="has_locked">已上锁</string>
+    <string name="action_confirm_shut_down">确定要执行停机操作吗?</string>
+    <string name="action_confirm_lock">确定要执行上锁挂牌吗?</string>
+    <string name="action_confirm_power_isolation">确定要执行能量隔离证实吗?</string>
+    <string name="action_confirm_check_before_unlocking">确定要执行取锁前检查吗?</string>
+    <string name="action_confirm_restore">确定要执行拆锁恢复开关吗?</string>
+    <string name="action_confirm_finish_ticket">还有隔离开关被其他作业票锁定,确定要结束作业吗?</string>
 </resources>