From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/FlowCardController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/FlowCardController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/FlowCardController.java
index a265c19..badef54 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/FlowCardController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/FlowCardController.java
@@ -1,9 +1,22 @@
package com.mes.pp.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mes.pp.entity.dto.FlowCardPercentDTO;
+import com.mes.pp.entity.request.FlowCardRequest;
+import com.mes.pp.service.FlowCardService;
+import com.mes.utils.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -13,9 +26,25 @@
* @author wu
* @since 2024-08-07
*/
+@Api(tags = "娴佺▼鍗�")
@RestController
-@RequestMapping("/flow_card/flow-card")
+@RequestMapping("/flow_card")
public class FlowCardController {
+ @Resource
+ FlowCardService flowCardService;
+
+ @ApiOperation("鏍规嵁璁㈠崟id鏌ヨ娴佺▼鍗¤繘搴�")
+ @PostMapping("/flowCardReportForms")
+ public Result flowCardReportForms(String orderId) {
+ return Result.build(200, "鏌ヨ鎴愬姛", flowCardService.flowCardReportForms(orderId));
+ }
+
+ @ApiOperation("璁㈠崟璇︽儏杩涘害鎺ュ彛")
+ @PostMapping("/flowCardPercent")
+ public Result<List<FlowCardPercentDTO>> flowCardPercent(@RequestBody FlowCardRequest flowCardRequest) {
+ return Result.build(200, "鏌ヨ鎴愬姛", null);
+ }
+
}
--
Gitblit v1.8.0