From 458def14d8a8c9b88179cca983573a8b8ec6e27c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 27 三月 2026 16:58:17 +0800
Subject: [PATCH] yys 1.修改bug
---
src/main/java/com/ruoyi/production/controller/ProductProcessController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductProcessController.java b/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
index 234c307..d578d78 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;
@@ -10,6 +11,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.oA.pojo.OaProject;
import com.ruoyi.production.dto.ProductProcessDto;
+import com.ruoyi.production.dto.SysDeptAndUserDto;
import com.ruoyi.production.pojo.ProductProcess;
import com.ruoyi.production.service.impl.ProductProcessServiceImpl;
import io.swagger.annotations.Api;
@@ -18,7 +20,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
@@ -30,6 +34,26 @@
@Autowired
private ProductProcessServiceImpl productProcessService;
+ /**
+ * 鑾峰彇閮ㄩ棬鐢ㄦ埛鏍�
+ */
+ @GetMapping("/listDeptUserTree")
+ @ApiOperation("鑾峰彇閮ㄩ棬鐢ㄦ埛鏍�")
+ public AjaxResult listDeptUserTree() {
+ List<SysDeptAndUserDto> list = productProcessService.listDeptUserTree();
+ if (CollectionUtils.isEmpty(list)) {
+ return AjaxResult.warn("鏆傛棤鏁版嵁");
+ }
+ return AjaxResult.success(list);
+ }
+
+
+ /**
+ * 鍒嗛〉鏌ヨ宸ュ簭
+ * @param page
+ * @param productProcessDto
+ * @return
+ */
@GetMapping("/listPage")
@Log(title = "宸ュ簭-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@ApiOperation("宸ュ簭-鍒嗛〉鏌ヨ")
@@ -56,9 +80,28 @@
@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.batchDelete(ids));
+ }
+
+ @ApiOperation("鏌ヨ鎵�鏈夊伐搴�")
+ @GetMapping("/list")
+ public AjaxResult list() {
+ return AjaxResult.success(productProcessService.list());
}
- return AjaxResult.success(productProcessService.removeBatchByIds(ids));
+
+ /**
+ * 瀵煎叆宸ュ簭
+ */
+ @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