新增作业票视图数据

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsJobTicketController.java

@@ -38,9 +38,6 @@ public class IsJobTicketController extends BaseController {
     private IIsJobTicketService isJobTicketService;
 
 
-    /**
-     * 查询作业票分页
-     */
     @ApiOperation("查询作业票-分页")
     @Parameters({
             @Parameter(name = "page", description = "Page"),
@@ -52,6 +49,13 @@ public class IsJobTicketController extends BaseController {
         return CommonResult.success(isJobTicketService.getIsJobTicketPage(page, dto));
     }
 
+    @ApiOperation("查询作业票-正在进行中的作业票列表")
+    @PreAuthorize("@ss.hasPermi('mes:job:jobm:query')")
+    @GetMapping("/getWorkstationTicketList")
+    public CommonResult<List<IsJobTicket>> getWorkstationTicketList() {
+        return CommonResult.success(isJobTicketService.getWorkstationTicketList());
+    }
+
     /**
      * 导出作业票列表
      */

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsJobTicket.java

@@ -64,7 +64,7 @@ public class IsJobTicket extends BaseBean
     private String ticketContent;
 
     /** 作业票状态 */
-    @ApiModelProperty(value = "作业票状态(0未开始 1待上锁 2进行中 3待解锁 4已结束)")
+    @ApiModelProperty(value = "作业票状态(字典值)(0未开始 1待上锁 2进行中 3待解锁 4已解锁 5已结束 6已取消)")
     @Excel(name = "作业票状态")
     private String ticketStatus;
 

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsJobTicketService.java

@@ -76,6 +76,8 @@ public interface IIsJobTicketService extends IService<IsJobTicket>
      */
     Page<PageTicketVO> getIsJobTicketPage(Page<IsJobTicket> page, PageTicketDTO dto);
 
+    List<IsJobTicket> getWorkstationTicketList();
+
     Boolean updateTicketProgress(JobTicketUpdateProgressReqVO reqVO);
 
     Page<MonitorTicketPageVO> getMonitorJobTicketPage(Page<IsJobTicket> page, PageTicketDTO dto);

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsJobTicketServiceImpl.java

@@ -452,6 +452,13 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
         return isJobTicketMapper.getIsJobTicketPage(page, dto);
     }
 
+    @Override
+    public List<IsJobTicket> getWorkstationTicketList() {
+        // 查询所有未完成的作业票返回给岗位视图
+        List<IsJobTicket> list = list(Wrappers.<IsJobTicket>lambdaQuery().lt(IsJobTicket::getTicketStatus, FINISHED.status));
+        return list;
+    }
+
     @Override
     @Transactional
     public Boolean updateTicketProgress(JobTicketUpdateProgressReqVO reqVO) {