新增流程审批方法

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

@@ -1,10 +1,7 @@
 package com.aizuda.boot.modules.flw.controller;
 
 import com.aizuda.boot.modules.flw.FlowHelper;
-import com.aizuda.boot.modules.flw.entity.dto.AssigneeTaskDTO;
-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.dto.*;
 import com.aizuda.boot.modules.flw.entity.vo.*;
 import com.aizuda.boot.modules.flw.service.IProcessTaskService;
 import com.aizuda.core.api.ApiController;
@@ -68,12 +65,33 @@ public class ProcessTaskController extends ApiController {
     }
 
     @Operation(summary = "审批信息")
-    @Permission("flw:processTask:viewed")
+    @Permission("flw:processTask:approval")
     @PostMapping("/approval-info-{taskId}")
     public TaskApprovalVO approvalInfo(@PathVariable("taskId") Long taskId) {
         return processTaskService.approvalInfo(taskId);
     }
 
+    @Operation(summary = "审批评论")
+    @Permission("flw:processTask:approval")
+    @PostMapping("/approval-comment")
+    public boolean approvalComment(@RequestBody TaskApprovalDTO dto) {
+        return processTaskService.approvalComment(dto);
+    }
+
+    @Operation(summary = "审批同意")
+    @Permission("flw:processTask:approval")
+    @PostMapping("/approval-consent")
+    public boolean approvalConsent(@RequestBody TaskApprovalDTO dto) {
+        return processTaskService.approvalConsent(dto);
+    }
+
+    @Operation(summary = "审批拒绝")
+    @Permission("flw:processTask:approval")
+    @PostMapping("/approval-rejection")
+    public boolean approvalRejection(@RequestBody TaskApprovalDTO dto) {
+        return processTaskService.approvalRejection(dto);
+    }
+
     @Operation(summary = "设置已阅读")
     @Permission("flw:processTask:viewed")
     @PostMapping("/viewed-{taskId}")

src/main/java/com/aizuda/boot/modules/flw/entity/FlwProcessApproval.java

@@ -32,7 +32,7 @@ public class FlwProcessApproval extends BaseEntity {
 	@PositiveOrZero
 	private Long instanceId;
 
-	@Schema(description = "0，评论 1，抄送 2，同意 3，拒绝 4，转办 5，委派 6，跳转 7，驳回 8，拿回 9，加签 10，减签 11，终止")
+	@Schema(description = "0，评论 1，抄送 2，同意 3，拒绝 4，转办 5，委派 6，跳转 7，驳回 8，拿回 9，前加签 10，并加签 11，后加签 12，减签 13，终止")
 	@NotNull(groups = Create.class)
 	@PositiveOrZero
 	private Integer type;

src/main/java/com/aizuda/boot/modules/flw/entity/dto/TaskApprovalDTO.java

@@ -0,0 +1,28 @@
+package com.aizuda.boot.modules.flw.entity.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.PositiveOrZero;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 流程任务审批 DTO
+ *
+ * @author 青苗
+ * @since 2024-03-04
+ */
+@Getter
+@Setter
+public class TaskApprovalDTO {
+
+    @Schema(description = "流程任务ID")
+    @NotNull
+    @PositiveOrZero
+    private Long taskId;
+
+    @Schema(description = "意见评论")
+    private String content;
+
+
+}

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

@@ -1,6 +1,7 @@
 package com.aizuda.boot.modules.flw.service;
 
 import com.aizuda.boot.modules.flw.entity.FlwProcessApproval;
+import com.aizuda.boot.modules.flw.entity.dto.TaskApprovalDTO;
 import com.aizuda.service.service.IBaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
@@ -22,4 +23,19 @@ public interface IFlwProcessApprovalService extends IBaseService<FlwProcessAppro
      * @param instanceId 流程实例ID
      */
     List<FlwProcessApproval> listByInstanceId(Long instanceId);
+
+    /**
+     * 审批评论
+     */
+    boolean comment(TaskApprovalDTO dto);
+
+    /**
+     * 审批同意
+     */
+    boolean consent(TaskApprovalDTO dto);
+
+    /**
+     * 审批拒绝
+     */
+    boolean rejection(TaskApprovalDTO dto);
 }

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

@@ -1,9 +1,6 @@
 package com.aizuda.boot.modules.flw.service;
 
-import com.aizuda.boot.modules.flw.entity.dto.AssigneeTaskDTO;
-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.dto.*;
 import com.aizuda.boot.modules.flw.entity.vo.*;
 import com.aizuda.core.api.PageParam;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -129,4 +126,19 @@ public interface IProcessTaskService {
      * @return 审批历史VO列表
      */
     List<FlwHisTaskVO> listHisTaskByInstanceId(Long instanceId);
+
+    /**
+     * 审批评论
+     */
+    boolean approvalComment(TaskApprovalDTO dto);
+
+    /**
+     * 审批同意
+     */
+    boolean approvalConsent(TaskApprovalDTO dto);
+
+    /**
+     * 审批拒绝
+     */
+    boolean approvalRejection(TaskApprovalDTO dto);
 }

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

@@ -1,6 +1,7 @@
 package com.aizuda.boot.modules.flw.service.impl;
 
 import com.aizuda.boot.modules.flw.entity.FlwProcessApproval;
+import com.aizuda.boot.modules.flw.entity.dto.TaskApprovalDTO;
 import com.aizuda.boot.modules.flw.mapper.FlwProcessApprovalMapper;
 import com.aizuda.boot.modules.flw.service.IFlwProcessApprovalService;
 import com.aizuda.core.api.ApiAssert;
@@ -31,4 +32,19 @@ public class FlwProcessApprovalServiceImpl extends BaseServiceImpl<FlwProcessApp
     public List<FlwProcessApproval> listByInstanceId(Long instanceId) {
         return lambdaQuery().eq(FlwProcessApproval::getInstanceId, instanceId).list();
     }
+
+    @Override
+    public boolean comment(TaskApprovalDTO dto) {
+        return false;
+    }
+
+    @Override
+    public boolean consent(TaskApprovalDTO dto) {
+        return false;
+    }
+
+    @Override
+    public boolean rejection(TaskApprovalDTO dto) {
+        return false;
+    }
 }

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

@@ -1,10 +1,7 @@
 package com.aizuda.boot.modules.flw.service.impl;
 
 import com.aizuda.boot.modules.flw.entity.FlwProcessForm;
-import com.aizuda.boot.modules.flw.entity.dto.AssigneeTaskDTO;
-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.dto.*;
 import com.aizuda.boot.modules.flw.entity.vo.*;
 import com.aizuda.boot.modules.flw.mapper.FlowlongMapper;
 import com.aizuda.boot.modules.flw.service.IFlwProcessApprovalService;
@@ -209,4 +206,19 @@ public class ProcessTaskServiceImpl implements IProcessTaskService {
         }
         return voList;
     }
+
+    @Override
+    public boolean approvalComment(TaskApprovalDTO dto) {
+        return false;
+    }
+
+    @Override
+    public boolean approvalConsent(TaskApprovalDTO dto) {
+        return false;
+    }
+
+    @Override
+    public boolean approvalRejection(TaskApprovalDTO dto) {
+        return false;
+    }
 }