Ver Fonte

添加获取作业票详细信息接口

Frankensteinly há 11 meses atrás
pai
commit
8557df12d3

+ 3 - 1
app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -383,8 +383,10 @@ object BusinessManager {
 
     /**
      * TODO 生成下发工作票Json
+     *
+     * @param isLock true:上锁任务 false:解锁任务
      */
-    fun genTicketSendJson(): WorkTicketSendBO {
+    fun genTicketSendJson(isLock: Boolean): WorkTicketSendBO {
         val bo = WorkTicketSendBO()
         return bo
     }

+ 5 - 0
app/src/main/java/com/grkj/iscs/model/UrlConsts.kt

@@ -52,6 +52,11 @@ object UrlConsts {
      */
     const val PAGE_TICKET = "/iscs/ticket/getIsJobTicketPage"
 
+    /**
+     * 获取作业票详细信息
+     */
+    const val DETAIL_TICKET = "/iscs/ticket/selectIsJobTicketById"
+
     /**
      * 刷卡登录
      */

+ 53 - 0
app/src/main/java/com/grkj/iscs/model/vo/ticket/TicketDetailRespVO.kt

@@ -0,0 +1,53 @@
+package com.grkj.iscs.model.vo.ticket
+
+data class TicketDetailRespVO(
+    private val ticketId: Long?,
+    private val ticketCode: String?,
+    private val ticketName: String?,
+    private val workshopId: Long?,
+    private val workshopName: String?,
+    private val workareaId: Long?,
+    private val workareaName: String?,
+    private val sopId: Long?,
+    private val sopName: String?,
+    private val ticketType: String?,
+    private val ticketContent: String?,
+    private val ticketStatus: String?,
+    private val ticketStartTime: String?,
+    private val ticketEndTime: String?,
+    private val delFlag: String?,
+    private val pointDetailVOList: List<PointDetailVO>?,
+    private val jobTicketUserList: List<UserVO>?
+) {
+    data class PointDetailVO(
+        private val pointId: Long?,
+        private val pointCode: String?,
+        private val pointName: String?,
+        private val pointType: String?,
+        private val pointTypeName: String?,
+        private val workshopId: Long?,
+        private val workshopName: String?,
+        private val workareaId: Long?,
+        private val workareaName: String?,
+        private val powerType: String?,
+        private val powerTypeName: String?,
+        private val isolationMethod: String?,
+        private val pointIcon: String?,
+        private val pointPicture: String?,
+        private val delFlag: String?,
+        private val lockTypeId: Long?,
+        private val lockTypeCode: String?,
+        private val lockTypeName: String?,
+        private val lockTypeIcon: String?,
+        private val lockTypeImg: String?)
+
+    data class UserVO(
+        private val recordId: Long?,
+        private val ticketId: Long?,
+        private val userId: Long?,
+        private val userName: String?,
+        private val userType: String?,
+        private val userRole: String?,
+        private val jobStatus: Int?,
+        private val delFlag: String?)
+}

+ 17 - 0
app/src/main/java/com/grkj/iscs/util/NetApi.kt

@@ -7,6 +7,7 @@ import com.grkj.iscs.model.vo.card.CardInfoRespVO
 import com.grkj.iscs.model.vo.dept.DeptListRespVO
 import com.grkj.iscs.model.vo.sop.SopInfoRespVO
 import com.grkj.iscs.model.vo.sop.SopPageRespVO
+import com.grkj.iscs.model.vo.ticket.TicketDetailRespVO
 import com.grkj.iscs.model.vo.ticket.TicketPageRespVO
 import com.grkj.iscs.model.vo.ticket.TicketTypeRespVO
 import com.grkj.iscs.model.vo.user.UserListRespVO
@@ -196,6 +197,22 @@ object NetApi {
         )
     }
 
+    /**
+     * 获取作业票详细信息
+     */
+    fun getTicketDetail(ticketId: Long, callBack: (TicketDetailRespVO?) -> Unit) {
+        NetHttpManager.getInstance().doRequestNet(
+            UrlConsts.DETAIL_TICKET,
+            false,
+            mapOf("ticketId" to ticketId),
+            { res, _, _ ->
+                res?.let {
+                    callBack.invoke(getRefBean(it))
+                }
+            }, isGet = true, isAuth = true
+        )
+    }
+
     /**
      * 获取刷卡信息
      */