From 2bb12b1ca40b29b7edcf06ef3f3d6de24dde1c4c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 24 九月 2025 14:59:17 +0800
Subject: [PATCH] 原材料订单拆分功能v1
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalReportController.java | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalReportController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalReportController.java
index 08eb6f4..8f3d5c2 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalReportController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalReportController.java
@@ -3,12 +3,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.pojo.InternalReport;
import com.ruoyi.manage.service.InternalReportService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+import com.deepoove.poi.data.style.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -34,15 +36,13 @@
/**
* 鍐呭鎶ュ憡鍒嗛〉鏌ヨ
- * @param data
+ * @param
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭鎶ュ憡鍒嗛〉鏌ヨ")
- @PostMapping("/pageInternalReport")
- public Result<IPage<InternalReport>> pageInternalReport(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- InternalReport internalReport = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InternalReport.class);
+ @GetMapping("/pageInternalReport")
+ public Result<IPage<InternalReport>> pageInternalReport(Page page,InternalReport internalReport) throws Exception {
return Result.success(internalReportService.pageInternalReport(page, internalReport));
}
@@ -50,7 +50,7 @@
* 鍐呭鎶ュ憡鏂板
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭鎶ュ憡鏂板")
@PostMapping("/addInternalReport")
public Result addInternalReport(@RequestBody InternalReport internalReport){
@@ -61,7 +61,7 @@
* 鍐呭鎶ュ憡淇敼
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭鎶ュ憡淇敼")
@PostMapping("/updateInternalReport")
public Result updateInternalReport(@RequestBody InternalReport internalReport){
@@ -72,9 +72,9 @@
* 鍐呭鎶ュ憡鍒犻櫎
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭鎶ュ憡鍒犻櫎")
- @GetMapping("/delInternalReport")
+ @DeleteMapping("/delInternalReport")
public Result delInternalReport(Integer reportId){
return Result.success(internalReportService.removeById(reportId));
}
@@ -83,7 +83,7 @@
* 鍐呭鎶ュ憡鏌ョ湅璇︽儏
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "鍐呭鎶ュ憡鏌ョ湅璇︽儏")
@GetMapping("/getInternalReportOne")
public Result<InternalReport> getInternalReportOne(Integer reportId){
@@ -94,7 +94,6 @@
* 鍐呭妫�鏌ュ鏍�
* @return
*/
- @ValueClassify("鍐呭鎶ュ憡")
@ApiOperation(value = "鍐呭妫�鏌ュ鏍�")
@PostMapping("/examineInternalReport")
public Result examineInternalReport(@RequestBody InternalReport internalReport){
@@ -105,7 +104,6 @@
* 鍐呭鎶ュ憡璐ㄩ噺璐熻矗浜哄～鍐�
* @return
*/
- @ValueClassify("鍐呭鎶ュ憡")
@ApiOperation(value = "鍐呭鎶ュ憡璐ㄩ噺璐熻矗浜哄～鍐�")
@PostMapping("/qualityInternalReport")
public Result qualityInternalReport(@RequestBody InternalReport internalReport){
@@ -116,7 +114,7 @@
* 瀵煎嚭鍐呭鎶ュ憡
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "瀵煎嚭鍐呭鎶ュ憡")
@GetMapping("/exportInternalReport")
public void exportInternalReport(Integer reportId, HttpServletResponse response){
--
Gitblit v1.9.3