From bbdaa26536663fe9d85d45c734acf3638393a7db Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 02 四月 2026 11:32:44 +0800
Subject: [PATCH] fix: 工序根据条件返回全部/启用数据
---
src/main/java/com/ruoyi/production/controller/ProductProcessController.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductProcessController.java b/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
index 77920b2..702d091 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -18,7 +19,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@@ -41,7 +44,7 @@
@ApiModelProperty("鏂板宸ュ簭")
@PostMapping()
@Log(title = "鏂板", businessType = BusinessType.INSERT)
- public AjaxResult add( @RequestBody ProductProcessDto productProcessDto) {
+ public AjaxResult add(@RequestBody ProductProcessDto productProcessDto) {
return productProcessService.add(productProcessDto);
}
@@ -56,15 +59,29 @@
@DeleteMapping("/batchDelete")
@Log(title = "鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult batchDelete(@RequestBody List<Integer> ids) {
- if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
- }
- return AjaxResult.success(productProcessService.removeBatchByIds(ids));
+ return AjaxResult.success(productProcessService.batchDelete(ids));
}
@ApiOperation("鏌ヨ鎵�鏈夊伐搴�")
@GetMapping("/list")
- public AjaxResult list() {
- return AjaxResult.success(productProcessService.list());
+ public AjaxResult list(@RequestParam(required = false) Integer dateType) {
+ List<ProductProcess> productProcessList = productProcessService.productProcessList(dateType);
+ return AjaxResult.success(productProcessList);
+ }
+
+ /**
+ * 瀵煎叆宸ュ簭
+ */
+ @Log(title = "宸ュ簭", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(MultipartFile file) throws Exception {
+ return productProcessService.importData(file);
+ }
+
+ @PostMapping("/downloadTemplate")
+ @Log(title = "宸ュ簭-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
+ public void downloadTemplate(HttpServletResponse response) {
+ ExcelUtil<ProductProcess> util = new ExcelUtil<ProductProcess>(ProductProcess.class);
+ util.importTemplateExcel(response, "宸ュ簭妯℃澘");
}
}
--
Gitblit v1.9.3