Kaynağa Gözat

优化审批评论

hubin 1 yıl önce
ebeveyn
işleme
a79b04e9e4

+ 4 - 3
src/main/java/com/aizuda/boot/modules/flw/controller/ProcessTaskController.java

@@ -12,6 +12,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import org.simpleframework.xml.core.Validate;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -74,21 +75,21 @@ public class ProcessTaskController extends ApiController {
     @Operation(summary = "审批评论")
     @Permission("flw:processTask:approval")
     @PostMapping("/approval-comment")
-    public boolean approvalComment(@RequestBody TaskApprovalDTO dto) {
+    public boolean approvalComment(@Validated @RequestBody TaskApprovalDTO dto) {
         return processTaskService.approvalComment(dto);
     }
 
     @Operation(summary = "审批同意")
     @Permission("flw:processTask:approval")
     @PostMapping("/approval-consent")
-    public boolean approvalConsent(@RequestBody TaskApprovalDTO dto) {
+    public boolean approvalConsent(@Validated @RequestBody TaskApprovalDTO dto) {
         return processTaskService.approvalConsent(dto);
     }
 
     @Operation(summary = "审批拒绝")
     @Permission("flw:processTask:approval")
     @PostMapping("/approval-rejection")
-    public boolean approvalRejection(@RequestBody TaskApprovalDTO dto) {
+    public boolean approvalRejection(@Validated @RequestBody TaskApprovalDTO dto) {
         return processTaskService.approvalRejection(dto);
     }
 

+ 7 - 3
src/main/java/com/aizuda/boot/modules/flw/service/impl/ProcessTaskServiceImpl.java

@@ -209,16 +209,20 @@ public class ProcessTaskServiceImpl implements IProcessTaskService {
 
     @Override
     public boolean approvalComment(TaskApprovalDTO dto) {
-        return false;
+        ApiAssert.isEmpty(dto.getContent(), "评论不能为空");
+
+        return flwProcessApprovalService.comment(dto);
     }
 
     @Override
     public boolean approvalConsent(TaskApprovalDTO dto) {
-        return false;
+
+        return flwProcessApprovalService.consent(dto);
     }
 
     @Override
     public boolean approvalRejection(TaskApprovalDTO dto) {
-        return false;
+
+        return flwProcessApprovalService.rejection(dto);
     }
 }