From 55d694aaae4e421b5e55cd941500e08f85cb5d4d Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 27 八月 2026 18:21:33 +0800
Subject: [PATCH] feat(sales): 添加框架合同订单功能并优化销售台账管理

---
 src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java |   48 +++++++++++++++++++++++++++++-------------------
 1 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
index b166c89..e359a9c 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
@@ -14,14 +14,15 @@
 import com.ruoyi.measuringinstrumentledger.service.MeasuringInstrumentLedgerService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.mapper.SysUserMapper;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 
@@ -30,22 +31,18 @@
  * @date : 2025/8/5 9:27
  */
 @RestController
-@Api(tags = "璁￠噺鍣ㄥ叿鍙拌处")
+@Tag(name = "璁￠噺鍣ㄥ叿鍙拌处")
 @RequestMapping("/measuringInstrumentLedger")
+@AllArgsConstructor
 public class MeasuringInstrumentLedgerController extends BaseController {
 
-    @Autowired
-    private MeasuringInstrumentLedgerService measuringInstrumentLedgerService;
-
-    @Autowired
-    private SysUserMapper sysUserMapper;
-
-    @Autowired
-    private MeasuringInstrumentLedgerRecordMapper measuringInstrumentLedgerRecordMapper;
+    private final MeasuringInstrumentLedgerService measuringInstrumentLedgerService;
+    private final SysUserMapper sysUserMapper;
+    private final MeasuringInstrumentLedgerRecordMapper measuringInstrumentLedgerRecordMapper;
 
 
     @GetMapping("/listPage")
-    @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处-鍒嗛〉鏌ヨ")
+    @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鍒嗛〉鏌ヨ")
     @Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
     public AjaxResult listPage(Page page, MeasuringInstrumentLedger measuringInstrumentLedger) {
         IPage<MeasuringInstrumentLedger> listPage = measuringInstrumentLedgerService.listPage(page, measuringInstrumentLedger);
@@ -54,7 +51,7 @@
 
 
     @PostMapping("/add")
-    @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处-鏂板")
+    @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鏂板")
     @Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鏂板", businessType = BusinessType.INSERT)
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult add(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) throws IOException {
@@ -66,7 +63,7 @@
     }
 
     @PostMapping("/update")
-    @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处-淇敼")
+    @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-淇敼")
     @Log(title = "璁￠噺鍣ㄥ叿鍙拌处-淇敼", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult update(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) {
@@ -83,7 +80,7 @@
     }
 
     @DeleteMapping("/delete")
-    @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处-鍒犻櫎")
+    @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鍒犻櫎")
     @Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鍒犻櫎", businessType = BusinessType.DELETE)
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult delete(@RequestBody List<Long> ids) {
@@ -104,7 +101,7 @@
     }
 
     @PostMapping("/verifying")
-    @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处-妫�瀹�")
+    @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-妫�瀹�")
     @Log(title = "璁￠噺鍣ㄥ叿鍙拌处-妫�瀹�", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult verifying(@RequestBody MeasuringInstrumentLedgerDto measuringInstrumentLedger) throws IOException {
@@ -112,12 +109,25 @@
         return update ? AjaxResult.success("妫�瀹氭垚鍔�") : AjaxResult.error("妫�瀹氬け璐�");
     }
 
+    @PostMapping("/downloadTemplate")
+    @Operation(summary = "涓嬭浇璁￠噺鍣ㄥ叿鍙拌处瀵煎叆妯℃澘")
+    public void downloadTemplate(HttpServletResponse response) {
+        measuringInstrumentLedgerService.downloadTemplate(response);
+    }
+
+    @PostMapping("/import")
+    @Operation(summary = "鎵归噺瀵煎叆璁￠噺鍣ㄥ叿鍙拌处")
+    @Log(title = "鎵归噺瀵煎叆璁￠噺鍣ㄥ叿鍙拌处", businessType = BusinessType.IMPORT)
+    public AjaxResult importData(@RequestParam("file") MultipartFile file) {
+        return measuringInstrumentLedgerService.importData(file);
+    }
+
     /**
      * 瀵煎嚭璁￠噺鍣ㄥ叿鍙拌处
      */
     @Log(title = "瀵煎嚭璁￠噺鍣ㄥ叿鍙拌处", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    @ApiOperation("瀵煎嚭璁￠噺鍣ㄥ叿鍙拌处")
+    @Operation(summary = "瀵煎嚭璁￠噺鍣ㄥ叿鍙拌处")
     public void export(HttpServletResponse response) {
         measuringInstrumentLedgerService.export( response);
     }

--
Gitblit v1.9.3