优化我的申请

src/main/java/com/aizuda/boot/modules/flw/controller/ProcessTaskController.java

@@ -4,6 +4,7 @@ import com.aizuda.boot.modules.flw.FlowHelper;
 import com.aizuda.boot.modules.flw.entity.dto.ExecuteTaskDTO;
 import com.aizuda.boot.modules.flw.entity.dto.ProcessTaskDTO;
 import com.aizuda.boot.modules.flw.entity.dto.RejectTaskDTO;
+import com.aizuda.boot.modules.flw.entity.vo.MyApplicationTaskVO;
 import com.aizuda.boot.modules.flw.entity.vo.PendingApprovalTaskVO;
 import com.aizuda.boot.modules.flw.entity.vo.ProcessTaskVO;
 import com.aizuda.boot.modules.flw.service.IProcessTaskService;
@@ -54,7 +55,7 @@ public class ProcessTaskController extends ApiController {
     @Operation(summary = "我的申请任务分页列表")
     @Permission("flw:processTask:pageMyApplication")
     @PostMapping("/page-my-application")
-    public Page<ProcessTaskVO> pageMyApplication(@RequestBody PageParam<ProcessTaskDTO> pageParam) {
+    public Page<MyApplicationTaskVO> pageMyApplication(@RequestBody PageParam<ProcessTaskDTO> pageParam) {
         return processTaskService.pageMyApplication(pageParam);
     }
 

src/main/java/com/aizuda/boot/modules/flw/entity/vo/MyApplicationTaskVO.java

@@ -0,0 +1,57 @@
+package com.aizuda.boot.modules.flw.entity.vo;
+
+import com.aizuda.core.ApiConstants;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 我的申请任务 VO
+ *
+ * @author 青苗
+ * @since 2023-12-11
+ */
+@Getter
+@Setter
+public class MyApplicationTaskVO {
+
+    @Schema(description = "流程ID")
+    private Long processId;
+
+    @Schema(description = "流程名称")
+    private String processName;
+
+    @Schema(description = "当前所在节点")
+    private String currentNode;
+
+    @Schema(description = "流程实例ID")
+    private Long instanceId;
+
+    @Schema(description = "当前状态")
+    private Integer instanceState;
+
+    @Schema(description = "发起人ID")
+    private String createId;
+
+    @Schema(description = "发起人")
+    private String createBy;
+
+    @JsonFormat(pattern = ApiConstants.DATE_MM)
+    @Schema(description = "创建时间")
+    private Date createTime;
+
+    @JsonFormat(pattern = ApiConstants.DATE_MM)
+    @Schema(description = "期望完成时间")
+    private Date expireTime;
+
+    @JsonFormat(pattern = ApiConstants.DATE_MM)
+    @Schema(description = "结束时间")
+    private Date endTime;
+
+    @Schema(description = "处理耗时")
+    private Long duration;
+
+}

src/main/java/com/aizuda/boot/modules/flw/mapper/FlowlongMapper.java

@@ -2,6 +2,7 @@ package com.aizuda.boot.modules.flw.mapper;
 
 import com.aizuda.boot.modules.flw.entity.dto.ProcessTaskDTO;
 import com.aizuda.boot.modules.flw.entity.vo.FlwProcessVO;
+import com.aizuda.boot.modules.flw.entity.vo.MyApplicationTaskVO;
 import com.aizuda.boot.modules.flw.entity.vo.PendingApprovalTaskVO;
 import com.aizuda.boot.modules.flw.entity.vo.ProcessTaskVO;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,7 +29,7 @@ public interface FlowlongMapper {
     /**
      * 我的申请任务分页列表
      */
-    Page<ProcessTaskVO> selectPageMyApplication(Page page, @Param("dto") ProcessTaskDTO dto);
+    Page<MyApplicationTaskVO> selectPageMyApplication(Page page, @Param("dto") ProcessTaskDTO dto);
 
     /**
      * 我收到的任务分页列表

src/main/java/com/aizuda/boot/modules/flw/service/IProcessTaskService.java

@@ -3,6 +3,7 @@ package com.aizuda.boot.modules.flw.service;
 import com.aizuda.boot.modules.flw.entity.dto.ExecuteTaskDTO;
 import com.aizuda.boot.modules.flw.entity.dto.ProcessTaskDTO;
 import com.aizuda.boot.modules.flw.entity.dto.RejectTaskDTO;
+import com.aizuda.boot.modules.flw.entity.vo.MyApplicationTaskVO;
 import com.aizuda.boot.modules.flw.entity.vo.PendingApprovalTaskVO;
 import com.aizuda.boot.modules.flw.entity.vo.ProcessTaskVO;
 import com.aizuda.core.api.PageParam;
@@ -31,7 +32,7 @@ public interface IProcessTaskService {
     /**
      * 我的申请任务分页列表
      */
-    Page<ProcessTaskVO> pageMyApplication(PageParam<ProcessTaskDTO> pageParam);
+    Page<MyApplicationTaskVO> pageMyApplication(PageParam<ProcessTaskDTO> pageParam);
 
     /**
      * 我收到的任务分页列表

src/main/java/com/aizuda/boot/modules/flw/service/impl/ProcessTaskServiceImpl.java

@@ -3,6 +3,7 @@ package com.aizuda.boot.modules.flw.service.impl;
 import com.aizuda.boot.modules.flw.entity.dto.ExecuteTaskDTO;
 import com.aizuda.boot.modules.flw.entity.dto.ProcessTaskDTO;
 import com.aizuda.boot.modules.flw.entity.dto.RejectTaskDTO;
+import com.aizuda.boot.modules.flw.entity.vo.MyApplicationTaskVO;
 import com.aizuda.boot.modules.flw.entity.vo.PendingApprovalTaskVO;
 import com.aizuda.boot.modules.flw.entity.vo.ProcessTaskVO;
 import com.aizuda.boot.modules.flw.mapper.FlowlongMapper;
@@ -45,7 +46,7 @@ public class ProcessTaskServiceImpl implements IProcessTaskService {
     }
 
     @Override
-    public Page<ProcessTaskVO> pageMyApplication(PageParam<ProcessTaskDTO> pageParam) {
+    public Page<MyApplicationTaskVO> pageMyApplication(PageParam<ProcessTaskDTO> pageParam) {
         ProcessTaskDTO dto = this.getProcessTaskDTO(pageParam);
         return flowlongMapper.selectPageMyApplication(pageParam.page(), dto);
     }

src/main/resources/mapper/FlowlongMapper.xml

@@ -27,8 +27,8 @@
         </if>
     </select>
 
-    <select id="selectPageMyApplication" resultType="com.aizuda.boot.modules.flw.entity.vo.ProcessTaskVO">
-        SELECT i.process_id,p.process_name,i.id AS instance_id,i.instance_state,i.create_id,i.create_by,i.create_time
+    <select id="selectPageMyApplication" resultType="com.aizuda.boot.modules.flw.entity.vo.MyApplicationTaskVO">
+        SELECT i.process_id,p.process_name,i.id AS instance_id,i.instance_state,i.create_id,i.create_by,i.create_time,i.expire_time,i.end_time,i.duration
         FROM flw_his_instance i LEFT JOIN flw_process p ON i.process_id=p.id
         WHERE i.create_id=#{dto.createId}
         <if test="dto.processName != null">