From cf7bc2d68e7d86e7d4b896acf1400f534d594daa Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 三月 2026 17:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

---
 src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailFileController.java |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 55 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailFileController.java b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailFileController.java
new file mode 100644
index 0000000..6a0ce9f
--- /dev/null
+++ b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailFileController.java
@@ -0,0 +1,55 @@
+package com.ruoyi.energy.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.energy.dto.EnergyConsumptionDetailDto;
+import com.ruoyi.energy.pojo.EnergyConsumptionDetail;
+import com.ruoyi.energy.pojo.EnergyConsumptionDetailFile;
+import com.ruoyi.energy.service.EnergyConsumptionDetailFileService;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.production.pojo.ProductWorkOrderFile;
+import com.ruoyi.production.service.ProductWorkOrderFileService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 鑳芥簮绫诲瀷-鑳借�楁妱琛ㄦ槑缁哶闄勪欢 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-10 05:07:33
+ */
+@RestController
+@RequestMapping("/energyConsumptionDetailFile")
+@Api(tags = "鑳借�楃鐞�-鑳借�楁妱琛ㄦ槑缁�-闄勪欢")
+public class EnergyConsumptionDetailFileController {
+
+    @Autowired
+    private EnergyConsumptionDetailFileService energyConsumptionDetailFileService;
+
+    @ApiOperation("鏂板鑳借�楁妱琛�-闄勪欢")
+    @PostMapping()
+    public R add(@RequestBody EnergyConsumptionDetailFile energyConsumptionDetailFile) {
+        return R.ok(energyConsumptionDetailFileService.save(energyConsumptionDetailFile));
+    }
+
+    @ApiOperation("鍒犻櫎鑳借�楁妱琛�-闄勪欢")
+    @DeleteMapping("/{ids}")
+    public R delete(@PathVariable("ids") Long[] ids) {
+        return R.ok(energyConsumptionDetailFileService.removeBatchByIds(Arrays.asList(ids)));
+    }
+
+    @GetMapping("page")
+    @ApiOperation("鍒嗛〉鏌ヨ")
+    public R page(Page<EnergyConsumptionDetailFile> page, EnergyConsumptionDetailFile energyConsumptionDetailFile) {
+        return R.ok(energyConsumptionDetailFileService.page(page,Wrappers.<EnergyConsumptionDetailFile>lambdaQuery().eq(EnergyConsumptionDetailFile::getEnergyConsumptionDetailId,energyConsumptionDetailFile.getEnergyConsumptionDetailId())));
+    }
+}

--
Gitblit v1.9.3