From d1e1588a73eba4ceb3efdd1da073bd389e5dd4af Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 21 Jan 2025 17:08:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/oa/api/HrHireApplyRest.java | 23 ++++++++++++++++++-
 .../java/com/yxt/anrui/oa/api/OaFormRest.java |  6 ++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java
index f841a1927b..72b8a695d1 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java
@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 
+import static com.yxt.common.core.result.ResultBean.fireFail;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -27,7 +29,7 @@ public class HrHireApplyRest {
     @Autowired
     private HrHireApplyService hrHireApplyService;
 
-    @ApiOperation("新增初始化")
+   /* @ApiOperation("新增初始化")
     @GetMapping("/getInit")
     ResultBean<HrHireApplyVo> getSaveInit(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath) {
         return hrHireApplyService.getSaveInit(userSid, orgPath);
@@ -37,6 +39,25 @@ public class HrHireApplyRest {
     @GetMapping("/getInit/{sid}")
     ResultBean<HrHireApplyVo> getUpdateInit(@PathVariable("sid") String sid) {
         return hrHireApplyService.getUpdateInit(sid);
+    }*/
+
+    @ApiOperation("初始化（新增或修改）")
+    @GetMapping({"/getInit", "/getInit/{sid}"})
+    public ResultBean<HrHireApplyVo> getInit(
+            @PathVariable(value = "sid", required = false) String sid,
+            @RequestParam(value = "userSid", required = false) String userSid,
+            @RequestParam(value = "orgPath", required = false) String orgPath) {
+        ResultBean<HrHireApplyVo> rb = ResultBean.fireFail();
+        if (sid == null || sid.isEmpty()) {
+            // 执行新增初始化
+            if (userSid == null || orgPath == null) {
+                return rb.setMsg("userSid和orgPath不能为空");
+            }
+            return hrHireApplyService.getSaveInit(userSid, orgPath);
+        } else {
+            // 执行修改初始化
+            return hrHireApplyService.getUpdateInit(sid);
+        }
     }
 
     @ApiOperation("新增或修改")
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java
index 36ba330ccb..0044f471c7 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java
@@ -55,7 +55,7 @@ public class OaFormRest {
         return rb.success();
     }
 
-    @ApiOperation(value = "办理（同意）")
+    /* @ApiOperation(value = "办理（同意）")
     @PutMapping("/complete")
     public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
         BusinessVariablesDto businessVariables = new BusinessVariablesDto();
@@ -63,7 +63,7 @@ public class OaFormRest {
         return oaFormService.complete(businessVariables);
     }
 
-    @ApiOperation(value = "获取上一个环节")
+   @ApiOperation(value = "获取上一个环节")
     @GetMapping(value = "/getPreviousNodesForReject")
     public ResultBean<List<NodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap NodeQuery query) {
         return oaFormService.getPreviousNodesForReject(query);
@@ -79,7 +79,7 @@ public class OaFormRest {
     @PutMapping(value = "/reject")
     public ResultBean reject(@Valid @RequestBody TaskDto dto) {
         return oaFormService.reject(dto);
-    }
+    }*/
 
     @ApiOperation(value = "撤回流程")
     @PutMapping(value = "/revokeProcess")