修改首页返回类型

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/home/ExecutorHomeController.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.iscs.controller.admin.home;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.iscs.controller.admin.home.vo.executor.NodeCountVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.home.vo.manager.WorkCompletedVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowwork.vo.MyWorkRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodePageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeRespVO;
 import cn.iocoder.yudao.module.iscs.service.home.ExecutorHomeService;
@@ -37,8 +38,8 @@ public class ExecutorHomeController {
 
     @GetMapping("/getMyNodeList")
     @Operation(summary = "我的任务列表")
-    public CommonResult<List<WorkflowWorkNodeRespVO>> getMyNodeList(WorkflowWorkNodePageReqVO vo) {
-        List<WorkflowWorkNodeRespVO> respVOList = executorHomeService.getMyNodeList(vo);
+    public CommonResult<List<MyWorkRespVO>> getMyNodeList(WorkflowWorkNodePageReqVO vo) {
+        List<MyWorkRespVO> respVOList = executorHomeService.getMyNodeList(vo);
         return success(respVOList);
     }
 

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workflowwork/vo/MyWorkRespVO.java

@@ -38,6 +38,9 @@ public class MyWorkRespVO {
     @Schema(description = "发起人")
     private String initiatorName;
 
+    @Schema(description = "作业类型")
+    private String workType;
+
 
 
     // ----------------------------------以下是节点信息----------------------------------

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

@@ -151,4 +151,10 @@ public class WorkflowWorkNodeRespVO {
     @Schema(description = "紧急程度")
     private String urgencyLevel;
 
+    @Schema(description = "作业单号")
+    private String orderNo;
+
+    @Schema(description = "作业单号")
+    private String workName;
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/workdesign/WorkflowWorkNodeMapper.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.iscs.dal.mysql.workdesign;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowwork.vo.MyWorkRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodePageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeRespVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowWorkNodeDO;
@@ -34,7 +35,7 @@ public interface WorkflowWorkNodeMapper extends BaseMapperX<WorkflowWorkNodeDO>
                 .orderByDesc(WorkflowWorkNodeDO::getId));
     }
 
-    Page<WorkflowWorkNodeRespVO> getMyNodePage(Page page, @Param(value = "vo") WorkflowWorkNodePageReqVO vo);
+    Page<MyWorkRespVO> getMyNodePage(Page page, @Param(value = "vo") WorkflowWorkNodePageReqVO vo);
 
     List<WorkflowWorkNodeRespVO> getMyCompletedNodeList( @Param(value = "vo") WorkflowWorkNodePageReqVO vo);
 

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/home/ExecutorHomeService.java

@@ -2,8 +2,8 @@ package cn.iocoder.yudao.module.iscs.service.home;
 
 import cn.iocoder.yudao.module.iscs.controller.admin.home.vo.executor.NodeCountVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.home.vo.manager.WorkCompletedVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowwork.vo.MyWorkRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodePageReqVO;
-import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeRespVO;
 
 import java.util.List;
 
@@ -17,7 +17,7 @@ public interface ExecutorHomeService {
     NodeCountVO getExecutorNodeCount();
 
 
-    List<WorkflowWorkNodeRespVO> getMyNodeList(WorkflowWorkNodePageReqVO vo);
+    List<MyWorkRespVO> getMyNodeList(WorkflowWorkNodePageReqVO vo);
 
     /**
      * 全系统作业完成趋势

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/home/ExecutorHomeServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.iscs.controller.admin.home.vo.executor.NodeCountVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.home.vo.manager.WorkCompletedVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowwork.vo.MyWorkRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodePageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeRespVO;
 import cn.iocoder.yudao.module.iscs.service.workdesign.WorkflowWorkNodeService;
@@ -36,7 +37,7 @@ public class ExecutorHomeServiceImpl implements ExecutorHomeService {
         WorkflowWorkNodePageReqVO workflowWorkNodePageReqVO = new WorkflowWorkNodePageReqVO();
         workflowWorkNodePageReqVO.setPageNo(1);
         workflowWorkNodePageReqVO.setPageSize(-1);
-        List<WorkflowWorkNodeRespVO> myNodeList = getMyNodeList(workflowWorkNodePageReqVO);
+        List<MyWorkRespVO> myNodeList = getMyNodeList(workflowWorkNodePageReqVO);
         // 待执行
         int unreleasedCount = (int) myNodeList.stream().filter(o -> StringUtils.isNotBlank(o.getApprovalStatus()) && "pending".equals(o.getApprovalStatus())).count();
         // 进行中
@@ -52,14 +53,14 @@ public class ExecutorHomeServiceImpl implements ExecutorHomeService {
     }
 
     @Override
-    public List<WorkflowWorkNodeRespVO> getMyNodeList(WorkflowWorkNodePageReqVO vo) {
+    public List<MyWorkRespVO> getMyNodeList(WorkflowWorkNodePageReqVO vo) {
         if (vo.getPageNo() == null) {
             vo.setPageNo(1);
         }
         if (vo.getPageSize() == null) {
             vo.setPageSize(3);
         }
-        PageResult<WorkflowWorkNodeRespVO> myNodePage = workflowWorkNodeService.getMyNodePage(vo);
+        PageResult<MyWorkRespVO> myNodePage = workflowWorkNodeService.getMyNodePage(vo);
         return myNodePage.getList();
     }
 

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

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.iscs.service.workdesign;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowwork.vo.MyWorkRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodePageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeSaveReqVO;
@@ -61,7 +62,7 @@ public interface WorkflowWorkNodeService extends IService<WorkflowWorkNodeDO> {
      * @param vo
      * @return
      */
-    PageResult<WorkflowWorkNodeRespVO> getMyNodePage(WorkflowWorkNodePageReqVO vo);
+    PageResult<MyWorkRespVO> getMyNodePage(WorkflowWorkNodePageReqVO vo);
 
     /**
      * 我的任务分页

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

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
 import cn.iocoder.yudao.module.bpm.service.definition.BpmFormService;
+import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowwork.vo.MyWorkRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.FormDataVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodePageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeRespVO;
@@ -383,13 +384,13 @@ public class WorkflowWorkNodeServiceImpl extends ServiceImpl<WorkflowWorkNodeMap
 
 
     @Override
-    public PageResult<WorkflowWorkNodeRespVO> getMyNodePage(WorkflowWorkNodePageReqVO vo) {
+    public PageResult<MyWorkRespVO> getMyNodePage(WorkflowWorkNodePageReqVO vo) {
         Long loginUserId = getLoginUserId();
         vo.setLoginUserId(loginUserId);
         Page page = new Page<>().setSize(vo.getPageSize()).setCurrent(vo.getPageNo());
         // 获取和我相关的作业
-        Page<WorkflowWorkNodeRespVO> myNodePage = workflowWorkNodeMapper.getMyNodePage(page, vo);
-        PageResult<WorkflowWorkNodeRespVO> respVOPageResult = new PageResult<>();
+        Page<MyWorkRespVO> myNodePage = workflowWorkNodeMapper.getMyNodePage(page, vo);
+        PageResult<MyWorkRespVO> respVOPageResult = new PageResult<>();
         respVOPageResult.setList(myNodePage.getRecords());
         respVOPageResult.setTotal(myNodePage.getTotal());
         return respVOPageResult;

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

@@ -10,16 +10,23 @@
      -->
 
     <select id="getMyNodePage"
-            resultType="cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeRespVO">
+            resultType="cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowwork.vo.MyWorkRespVO">
         SELECT
-        su.nickname as worker_user_name,
-        work_node.id,
-        work_node.node_name,
-        work_node.type,
-        work_node.start_time,
-        work_node.approval_status,
+        work_node.work_id,
+        ww.name,
+        ww.order_no,
+        ww.urgency_level,
+        ww.completion_time,
+        ww.cancellation_time,
+        ww.cancellation_reason,
+        ww.initiator_name,
         ww.type as work_type,
-        ww.urgency_level
+        su.nickname as worker_user_name,
+        work_node.id as node_id,
+        work_node.start_time as work_time,
+        work_node.id as current_node_id,
+        work_node.node_name as current_node_name,
+        work_node.approval_status
         FROM
         isc_workflow_work_node work_node
         left join isc_workflow_work ww on ww.id = work_node.work_id