From ac79dfd8d661dbe166553ff80fbdbfee64e8134e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 28 四月 2026 16:02:20 +0800
Subject: [PATCH] feat(production): 添加工序ID字段支持
---
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index a56f6b1..b2c99c8 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -2,16 +2,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.approve.pojo.ApproveProcess;
-import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.bean.vo.ApproveGetAndUpdateVo;
import com.ruoyi.approve.bean.vo.ApproveProcessVO;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.service.ISysDeptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +18,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.text.ParseException;
import java.util.List;
@RestController
@@ -28,11 +25,8 @@
@Api(tags = "瀹℃壒")
public class ApproveProcessController {
- @GetMapping("/test")
- public AjaxResult test() {
- System.out.println(1111);
- return AjaxResult.success("娴嬭瘯");
- }
+ @Autowired
+ private ISysDeptService sysDeptService;
@Autowired
@@ -43,11 +37,7 @@
*/
@GetMapping("/getDept")
public AjaxResult getDept() {
- Long userId = SecurityUtils.getUserId();
- LoginUser user = SecurityUtils.getLoginUser();
- Long[] deptIds = SecurityUtils.getDeptId();
-
- List<SysDept> sysDeptList = approveProcessService.selectDeptListByDeptIds(deptIds);
+ List<SysDept> sysDeptList =sysDeptService.selectDeptList(new SysDept());
return AjaxResult.success(sysDeptList);
}
@@ -115,7 +105,7 @@
@DeleteMapping("/deleteIds")
@ApiOperation(value = "鍒犻櫎瀹℃壒")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult deleteIds(@RequestBody List<Long> ids) {
+ public AjaxResult deleteIds(@RequestBody List<String> ids) {
if (ids == null || ids.size() == 0) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
--
Gitblit v1.9.3