From ba4af275c3b8d073f863be7b12e43974b3ef14a2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 12 七月 2025 10:27:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after into pim_ly
---
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 112 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
new file mode 100644
index 0000000..9dcda81
--- /dev/null
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -0,0 +1,112 @@
+package com.ruoyi.approve.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.approve.service.IApproveProcessService;
+import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
+import com.ruoyi.approve.vo.ApproveProcessVO;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.domain.SysDept;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.ParseException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/approveProcess")
+public class ApproveProcessController {
+
+ @GetMapping("/test")
+ public AjaxResult test() {
+ System.out.println(1111);
+ return AjaxResult.success("娴嬭瘯");
+ }
+
+
+ @Autowired
+ private IApproveProcessService approveProcessService;
+ /**銆�
+ * 鑾峰彇閮ㄩ棬鍒楄〃
+ * @return
+ */
+ @GetMapping("/getDept")
+ public AjaxResult getDept() {
+ Long userId = SecurityUtils.getUserId();
+ LoginUser user = SecurityUtils.getLoginUser();
+ Long[] deptIds = SecurityUtils.getDeptId();
+
+ List<SysDept> sysDeptList = approveProcessService.selectDeptListByDeptIds(deptIds);
+ return AjaxResult.success(sysDeptList);
+ }
+
+ /**
+ * 娣诲姞瀹℃壒
+ * @param approveProcessVO
+ * @return
+ */
+ @PostMapping("/add")
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult add(@RequestBody ApproveProcessVO approveProcessVO) throws ParseException {
+ if (approveProcessVO == null) {
+ return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ approveProcessService.addApprove(approveProcessVO);
+ return AjaxResult.success("娣诲姞鎴愬姛");
+ }
+
+ /**
+ * 瀹℃壒璇︽儏
+ * @param approveGetAndUpdateVo
+ * @return
+ */
+ @GetMapping("/get")
+ public AjaxResult get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
+ if (approveGetAndUpdateVo.getId() == null || approveGetAndUpdateVo.getId().isEmpty()) {
+ return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
+ }
+ return AjaxResult.success(approveProcessService.getApproveById(approveGetAndUpdateVo.getId()));
+ }
+
+ /**
+ * 鏇存柊瀹℃壒
+ * @param approveGetAndUpdateVo
+ * @return
+ */
+ @PostMapping("/update")
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) {
+ if (approveGetAndUpdateVo == null) {
+ return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
+ }
+ approveProcessService.updateByApproveId(approveGetAndUpdateVo);
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
+ }
+ /**
+ * 鑾峰彇瀹℃壒鍒楄〃
+ * @return
+ */
+ @GetMapping("/list")
+ public AjaxResult list(Page page, ApproveProcess approveProcess) {
+ return AjaxResult.success(approveProcessService.listAll(page, approveProcess));
+ }
+
+ /**
+ * 鍒犻櫎瀹℃壒
+ * @param ids
+ * @return
+ */
+ @DeleteMapping("/deleteIds")
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult deleteIds(@RequestBody Long[] ids) {
+ if (ids == null || ids.length == 0) {
+ return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
+ }
+ approveProcessService.delApprove(ids);
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
+ }
+}
--
Gitblit v1.9.3