修改我的作业查询范围 修改节点详情中作业信息

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workflowworknode/vo/WorkflowWorkNodeRespVO.java

@@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo.Wo
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo.WorkflowWorkTicketKeyRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo.WorkflowWorkTicketLockRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workhandle.vo.WorkflowWorkTicketRespVO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowWorkDO;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -164,9 +165,12 @@ public class WorkflowWorkNodeRespVO {
     @Schema(description = "作业单号")
     private String orderNo;
 
-    @Schema(description = "作业单号")
+    @Schema(description = "作业名称")
     private String workName;
 
+    @Schema(description = "作业信息")
+    private WorkflowWorkDO workDetail;
+
     @Schema(description = "节点point数据")
     private List<WorkflowWorkPointRespVO> points;
 

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkServiceImpl.java

@@ -335,6 +335,7 @@ public class WorkflowWorkServiceImpl extends ServiceImpl<WorkflowWorkMapper, Wor
         // 获取作业
         WorkflowWorkDO workflowWorkDO = getById(byId.getWorkId());
         bean.setOrderNo(workflowWorkDO.getOrderNo());
+        bean.setWorkDetail(workflowWorkDO);
         AdminUserDO user = adminUserService.getUser(workflowWorkDO.getInitiatorId());
         String phone = "";
         if (user != null && StringUtils.isNotBlank(user.getMobile())) {

yudao-module-iscs/src/main/resources/mapper/workdesign/WorkflowWorkMapper.xml

@@ -42,20 +42,22 @@
             -- 条件2：上锁人ID匹配（根据type添加不同进度限制）
             OR (
             work_node.lock_person = #{vo.loginUserId}
-            AND (
+            -- AND (
             -- isolation类型：进度大于等于3
-            (work_node.type = 'isolation' AND work_node.node_progress <= 2)
+            -- (work_node.type = 'isolation' AND work_node.node_progress <= 2)
             -- releaseIsolation类型：进度小于等于2
-            OR (work_node.type = 'releaseIsolation' AND work_node.node_progress >= 2) ) )
+            -- OR (work_node.type = 'releaseIsolation' AND work_node.node_progress >= 2) )
+            )
 
             -- 条件3：公锁人ID匹配（仅isolation类型有此条件）
             OR (
             JSON_CONTAINS(CAST(work_node.colock_persons AS JSON), CAST(#{vo.loginUserId} AS JSON), '$')
-            AND (
+            -- AND (
             -- isolation类型：进度大于等于3
-            (work_node.type = 'isolation' AND work_node.node_progress >= 3)
+            -- (work_node.type = 'isolation' AND work_node.node_progress >= 3)
             -- releaseIsolation类型：进度小于等于1
-            OR (work_node.type = 'releaseIsolation' AND work_node.node_progress <= 1) ) )
+            -- OR (work_node.type = 'releaseIsolation' AND work_node.node_progress <= 1) )
+            )
             )
             <if test="vo.key != null and vo.key.trim != ''">
                 AND (ww.name like concat('%',#{vo.key},'%')