From c0cf736ff001bbaec59b7da6239f4670464952fd Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 12 六月 2025 16:32:05 +0800
Subject: [PATCH] 1.销售模块 2.时区优化
---
main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java b/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java
index dd4b2e8..4dca675 100644
--- a/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java
+++ b/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java
@@ -1,21 +1,72 @@
package com.ruoyi.business.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.business.dto.OfficialInventoryDto;
+import com.ruoyi.business.entity.OfficialInventory;
+import com.ruoyi.business.service.OfficialInventoryService;
+import com.ruoyi.business.vo.OfficialInventoryVo;
+import com.ruoyi.common.core.domain.R;
import lombok.AllArgsConstructor;
- import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
-* <p>
- * 姝ｅ紡搴撳瓨琛� 鍓嶇鎺у埗鍣�
- * </p>
-*
-* @author ruoyi
-* @since 2025-06-04
-*/
+ * <p>
+ * 姝ｅ紡搴撳瓨琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author ruoyi
+ * @since 2025-06-04
+ */
@RestController
@AllArgsConstructor
-@RequestMapping("/business/officialInventory")
- public class OfficialInventoryController {
+@RequestMapping("/officialInventory")
+public class OfficialInventoryController {
+ private OfficialInventoryService officialInventoryService;
+
+ /**
+ * 姝ｅ紡搴撳簱琛ㄦ煡璇�
+ */
+ @GetMapping("/list")
+ public R<IPage<OfficialInventoryDto>> list(Page page, OfficialInventoryDto officialInventoryDto) {
+ IPage<OfficialInventoryDto> list = officialInventoryService.selectOfficialInventoryList(page, officialInventoryDto);
+ return R.ok(list);
}
+
+ /**
+ * 姝ｅ紡搴撶叅绉嶉儴鍒嗕俊鎭痩ist
+ */
+ @GetMapping("/officialList")
+ public R<List<OfficialInventoryVo>> officialList(OfficialInventoryVo officialInventoryVo) {
+ return R.ok(officialInventoryService.selectOfficialList(officialInventoryVo));
+ }
+
+ /**
+ * 姝ｅ紡搴撶叅绉嶇敓浜у姞宸ラ�夋嫨list
+ */
+ @GetMapping("/officialAll")
+ public R<List<OfficialInventory>> officialAll() {
+ return R.ok(officialInventoryService.selectOfficialAll());
+ }
+
+ /**
+ * 姝ｅ紡搴撲慨鏀�
+ */
+ @PostMapping("/editOfficial")
+ public R editOfficial(@RequestBody OfficialInventoryDto officialInventoryDto) {
+ return R.ok(officialInventoryService.editOfficial(officialInventoryDto));
+ }
+
+ /**
+ * 鍚堝苟
+ */
+ @PostMapping("/merge")
+ public R merge(@RequestBody OfficialInventoryDto officialInventoryDto) {
+ return R.ok(officialInventoryService.mergeAll(officialInventoryDto));
+ }
+
+}
--
Gitblit v1.9.3