车车 11 місяців тому
батько
коміт
f709dba9f6

+ 6 - 0
ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/ticket/MonitorTicketPageVO.java

@@ -44,4 +44,10 @@ public class MonitorTicketPageVO extends BaseBean
     @ApiModelProperty(value = "已完成(解锁)共锁数")
     private Integer removeColockNum;
 
+    @ApiModelProperty(value = "所属区域ID")
+    private Long workareaId;
+
+    @ApiModelProperty(value = "所属区域Name")
+    private String workareaName;
+
 }

+ 2 - 1
ktg-iscs/src/main/resources/mapper/IsJobTicketMapper.xml

@@ -175,9 +175,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getMonitorJobTicketPage" resultType="com.ktg.iscs.domain.vo.ticket.MonitorTicketPageVO">
         SELECT
-            j.*
+            j.*, w.workarea_name
         FROM
             is_job_ticket j
+                left join is_workarea w on w.workarea_id = j.workarea_id
         <where>
             (j.ticket_status != 4 OR ( j.ticket_end_time > CURDATE() AND j.ticket_status = 4 ))
             <if test="dto.ticketCode != null and dto.ticketCode.trim != ''">