From dabb94df77ad70cf0ffa9a965f1e6db85cb11be0 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 20 Jan 2025 10:42:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E8=81=98=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/oa/api/HrHireApplyRest.java |  7 +++++++
 .../biz/hrhireapply/HrHireApplyService.java   | 19 +++++++++++++++++++
 .../oa/biz/hrhireapply/HrHireApplyVo.java     |  4 ++++
 3 files changed, 30 insertions(+)

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 03bc4fd1bb..dbb883307a 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
@@ -3,6 +3,7 @@ package com.yxt.anrui.oa.api;
 import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyDto;
 import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyService;
 import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyVo;
+import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto;
 import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.ApiOperation;
@@ -53,4 +54,10 @@ public class HrHireApplyRest {
         return hrHireApplyService.reject(dto);
     }
 
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
+        return hrHireApplyService.complete(dto);
+    }
+
 }
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java
index 674a6e0237..b18e30931c 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java
@@ -9,6 +9,8 @@ import com.yxt.anrui.oa.biz.oaform.FormCommon;
 import com.yxt.anrui.oa.biz.oaform.OaForm;
 import com.yxt.anrui.oa.biz.oaform.OaFormRuleEnum;
 import com.yxt.anrui.oa.biz.oaform.OaFormService;
+import com.yxt.anrui.oa.biz.oaform.flowable.BusinessVariablesDto;
+import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto;
 import com.yxt.anrui.oa.biz.oaform.flowable.SubmitDto;
 import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
 import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum;
@@ -58,6 +60,8 @@ public class HrHireApplyService extends MybatisBaseService<HrHireApplyMapper, Hr
             return rb.setMsg("该申请不存在");
         }
         OaForm oaForm = oaFormService.fetchBySid(sid);
+        hrHireApplyVo.setTaskId(oaForm.getTaskId());
+        hrHireApplyVo.setProcInsId(oaForm.getProcInstId());
         //根据部门sid获取orgPath并赋值
         SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData();
         String orgSidPath = organizationVo.getOrgSidPath();
@@ -155,6 +159,21 @@ public class HrHireApplyService extends MybatisBaseService<HrHireApplyMapper, Hr
         return oaFormService.reject(dto);
     }
 
+    /**
+     * 办理（同意）
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean complete(CompleteDto dto) {
+        Map<String, Object> formVariables = dto.getFormVariables();
+        formVariables = getMap(formVariables, dto.getBusinessSid());
+        dto.setFormVariables(formVariables);
+        BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto();
+        BeanUtil.copyProperties(dto, businessVariablesDto);
+        return oaFormService.complete(businessVariablesDto);
+    }
+
 
     public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) {
         Map<String, Object> appMap = new HashMap<>();
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java
index c4ae16bd06..1f89adff04 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java
@@ -25,4 +25,8 @@ public class HrHireApplyVo {
     private String isFinanceValue;
 
     private List<HrHireDetailsVo> list = new ArrayList<>();
+
+    private String taskId;
+    @ApiModelProperty("流程实例id")
+    private String procInsId;
 }