|
@@ -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.bo.PageChangeBO
|
|
|
import com.grkj.iscs.model.vo.ticket.TicketUserReqVO
|
|
import com.grkj.iscs.model.vo.ticket.TicketUserReqVO
|
|
|
import com.grkj.iscs.model.vo.user.UserListRespVO
|
|
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.base.BaseMvpFragment
|
|
|
import com.grkj.iscs.view.iview.IWorkerView
|
|
import com.grkj.iscs.view.iview.IWorkerView
|
|
|
import com.grkj.iscs.view.presenter.WorkerPresenter
|
|
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!!))
|
|
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())
|
|
mColockerSelectedShowList.addAll(mSelectedList.filter { it.userRole == USER_ROLE_COLOCKER }.toMutableList())
|
|
|
mBinding?.rvColockerSelected?.adapter?.notifyDataSetChanged()
|
|
mBinding?.rvColockerSelected?.adapter?.notifyDataSetChanged()
|
|
|
mBinding?.rvLockerList?.adapter?.notifyDataSetChanged()
|
|
mBinding?.rvLockerList?.adapter?.notifyDataSetChanged()
|