Merge remote-tracking branch 'origin/master'

yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java

@@ -0,0 +1,56 @@
+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.TaskDto;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/16
+ **/
+@RestController
+@RequestMapping("v1/HrHireApply")
+public class HrHireApplyRest {
+
+    @Autowired
+    private HrHireApplyService hrHireApplyService;
+
+    @ApiOperation("新增初始化")
+    @GetMapping("/getInit")
+    ResultBean<HrHireApplyVo> getSaveInit(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath) {
+        return hrHireApplyService.getSaveInit(userSid, orgPath);
+    }
+
+    @ApiOperation("修改初始化")
+    @GetMapping("/getInit/{sid}")
+    ResultBean<HrHireApplyVo> getUpdateInit(@PathVariable("sid") String sid) {
+        return hrHireApplyService.getUpdateInit(sid);
+    }
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean<String> saveOrUpdate(@RequestBody HrHireApplyDto dto) {
+        return hrHireApplyService.saveOrUpdateDto(dto);
+    }
+
+    @ApiOperation("提交审批流程")
+    @PostMapping("/submit")
+    public ResultBean submit(@RequestBody HrHireApplyDto dto) {
+        return hrHireApplyService.submit(dto);
+    }
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean reject(@Valid @RequestBody TaskDto dto) {
+        return hrHireApplyService.reject(dto);
+    }
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApply.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.oa.biz.hrhireapply;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/16
+ **/
+@Data
+public class HrHireApply extends BaseEntity {
+    private static final long serialVersionUID = 3495800881939563210L;
+    @ApiModelProperty("是否是财务")
+    private String isFinanceKey;
+    private String isFinanceValue;
+
+    private String formSid;
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyDto.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.oa.biz.hrhireapply;
+
+import com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsDto;
+import com.yxt.anrui.oa.biz.oaform.OaFormDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/16
+ **/
+@Data
+public class HrHireApplyDto extends OaFormDto {
+    private static final long serialVersionUID = 4255707952292859284L;
+    private String userSid;
+    @ApiModelProperty("是否是财务")
+    private String isFinanceKey;
+    private String isFinanceValue;
+    private List<HrHireDetailsDto> list = new ArrayList<>();
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyMapper.java

@@ -0,0 +1,13 @@
+package com.yxt.anrui.oa.biz.hrhireapply;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/16
+ **/
+@Mapper
+public interface HrHireApplyMapper extends BaseMapper<HrHireApply> {
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyMapper">
+</mapper>

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java

@@ -0,0 +1,177 @@
+package com.yxt.anrui.oa.biz.hrhireapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsDto;
+import com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsService;
+import com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsVo;
+import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
+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.SubmitDto;
+import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
+import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum;
+import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/16
+ **/
+@Service
+public class HrHireApplyService extends MybatisBaseService<HrHireApplyMapper, HrHireApply> {
+
+    @Autowired
+    private OaFormService oaFormService;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private HrHireDetailsService hiHireDetailsService;
+    @Autowired
+    private OaAppendixService oaAppendixService;
+
+    public ResultBean<HrHireApplyVo> getSaveInit(String userSid, String orgPath) {
+        ResultBean<HrHireApplyVo> rb = ResultBean.fireFail();
+        HrHireApplyVo hrHireApplyVo = new HrHireApplyVo();
+        hrHireApplyVo.setUserSid(userSid);
+        hrHireApplyVo.setOrgPath(orgPath);
+        return rb.success().setData(hrHireApplyVo);
+    }
+
+    public ResultBean<HrHireApplyVo> getUpdateInit(String sid) {
+        ResultBean<HrHireApplyVo> rb = ResultBean.fireFail();
+        HrHireApplyVo hrHireApplyVo = new HrHireApplyVo();
+        HrHireApply hrHireApply = fetchBySid(sid);
+        if (hrHireApply == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        OaForm oaForm = oaFormService.fetchBySid(sid);
+        //根据部门sid获取orgPath并赋值
+        SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData();
+        String orgSidPath = organizationVo.getOrgSidPath();
+        hrHireApplyVo.setOrgPath(orgSidPath);
+        hrHireApplyVo.setUserSid(oaForm.getCreateBySid());
+        BeanUtil.copyProperties(hrHireApply, hrHireApplyVo);
+        FormCommon isFinanceObj = FormCommon.of(hrHireApply.getIsFinanceKey(), hrHireApply.getIsFinanceValue());
+        hrHireApplyVo.setIsFinanceObj(isFinanceObj);
+        List<HrHireDetailsVo> list = hiHireDetailsService.getUpdateInit(sid);
+        list.removeAll(Collections.singleton(null));
+        if (!list.isEmpty()) {
+            list.stream().forEach(details -> {
+                FormCommon deptObj = FormCommon.of(details.getDeptKey(), details.getDeptValue());
+                details.setDeptObj(deptObj);
+                FormCommon jobObj = FormCommon.of(details.getJobKey(), details.getJobValue());
+                details.setJobObj(jobObj);
+                FormCommon educationObj = FormCommon.of(details.getEducationKey(), details.getEducationValue());
+                details.setEducationObj(educationObj);
+                List<String> files = oaAppendixService.selectByLinkSid(details.getSid());
+                details.setFiles(files);
+            });
+        }
+        hrHireApplyVo.setList(list);
+        hrHireApplyVo.setSid(sid);
+        return rb.success().setData(hrHireApplyVo);
+    }
+
+    public ResultBean<String> saveOrUpdateDto(HrHireApplyDto dto) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        List<HrHireDetailsDto> list = dto.getList();
+        if (StringUtils.isBlank(sid)) {
+            // 新建操作
+            HrHireApply entity = new HrHireApply();
+            BeanUtil.copyProperties(dto, entity, "sid");
+            dto.setBillNo("ZPXQ");
+            dto.setSid(entity.getSid());
+            dto.setCreateBySid(dto.getUserSid());
+            ResultBean<String> resultBean = oaFormService.saveOaForm(dto);
+            if (!resultBean.getSuccess()) {
+                return rb;
+            }
+            entity.setFormSid(resultBean.getData());
+            entity.setCreateBySid(dto.getUserSid());
+            baseMapper.insert(entity);
+            sid = entity.getSid();
+        } else {
+            // 更新操作
+            HrHireApply entity = fetchBySid(sid);
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            baseMapper.updateById(entity);
+        }
+        hiHireDetailsService.saveDetails(list, sid);
+        return rb.success().setData(sid);
+    }
+
+    /**
+     * 提交
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean submit(HrHireApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean<String> stringResultBean = saveOrUpdateDto(dto);
+        if (!stringResultBean.getSuccess()) {
+            return rb.setMsg(stringResultBean.getData());
+        }
+        String businessSid = stringResultBean.getData();
+
+        SubmitDto submitDto = new SubmitDto();
+        submitDto.setUserSid(dto.getCreateBySid());
+        submitDto.setBusinessSid(businessSid);
+
+        Map<String, Object> formVariables = new HashMap<>();
+        formVariables = getMap(formVariables, businessSid);
+        submitDto.setFormVariables(formVariables);
+        submitDto.setProcDefId(ProcDefEnum.HIHIREAPPLY.getProDefId());
+        submitDto.setNextTaskId(dto.getTaskId());
+        submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule());
+        return oaFormService.submit(submitDto);
+    }
+
+    /**
+     * 驳回
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean reject(TaskDto dto) {
+        Map<String, Object> formVariables = dto.getFormVariables();
+        formVariables = getMap(formVariables, dto.getBusinessSid());
+        dto.setFormVariables(formVariables);
+
+        return oaFormService.reject(dto);
+    }
+
+
+    public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) {
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", sid);
+        appMap.put("editUrl", "approval/#/pages/EditOnboradingApplyActivity?sid=" + sid);
+        appMap.put("detailUrl", "approval/#/pages/DetailOnboradingApplyActivity?sid=" + sid);
+        formVariables.put("app", appMap);
+        //根据组织查询是否是分公司
+        OaForm oaForm = oaFormService.fetchBySid(sid);
+        HrHireApply hrHireApply = fetchBySid(sid);
+        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(oaForm.getUseOrgSid()).getData();
+        //是否是分公司
+        formVariables.put("isTrue", sysOrganization.getIsDept() == 0);
+        //是否是财务岗
+        formVariables.put("isFin", "1".equals(hrHireApply.getIsFinanceKey()));
+        return formVariables;
+    }
+
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.oa.biz.hrhireapply;
+
+import com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsVo;
+import com.yxt.anrui.oa.biz.oaform.FormCommon;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/16
+ **/
+@Data
+public class HrHireApplyVo {
+
+    private String sid;
+    private String userSid;
+    private String orgPath;
+    @ApiModelProperty("是否是财务")
+    private FormCommon isFinanceObj;
+    private String isFinanceKey;
+    private String isFinanceValue;
+
+    private List<HrHireDetailsVo> list = new ArrayList<>();
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetails.java

@@ -0,0 +1,41 @@
+package com.yxt.anrui.oa.biz.hrhiredetails;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/16
+ **/
+@Data
+public class HrHireDetails extends BaseEntity {
+    private static final long serialVersionUID = 4980172913356706485L;
+    @ApiModelProperty("主表sid")
+    private String mainSid;
+    @ApiModelProperty("招聘部门sid")
+    private String deptSid;
+    @ApiModelProperty("招聘部门名称")
+    private String deptName;
+    @ApiModelProperty("招聘岗位sid")
+    private String postSid;
+    @ApiModelProperty("招聘岗位名称")
+    private String postName;
+    @ApiModelProperty("招聘人数")
+    private Integer memberCount;
+    @ApiModelProperty("学历key")
+    private String educationKey;
+    @ApiModelProperty("学历value")
+    private String educationValue;
+    @ApiModelProperty("薪资待遇")
+    private String formalWages;
+    @ApiModelProperty("职位福利")
+    private String benefits;
+    @ApiModelProperty("职位描述")
+    private String describes;
+    @ApiModelProperty("任职要求")
+    private String demand;
+    @ApiModelProperty("工作地址")
+    private String address;
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsDto.java

@@ -0,0 +1,45 @@
+package com.yxt.anrui.oa.biz.hrhiredetails;
+
+import com.yxt.anrui.oa.biz.oaform.FormCommon;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/17
+ **/
+@Data
+public class HrHireDetailsDto {
+
+    @ApiModelProperty("招聘部门")
+    private FormCommon deptObj;
+    private String deptKey;
+    private String deptValue;
+    @ApiModelProperty("招聘岗位")
+    private FormCommon jobObj;
+    private String jobKey;
+    private String jobValue;
+    @ApiModelProperty("人数")
+    private String memberCount;
+    @ApiModelProperty("学历")
+    private FormCommon educationObj;
+    private String educationKey;
+    private String educationValue;
+    @ApiModelProperty("薪资待遇")
+    private String formalWages;
+    @ApiModelProperty("职位福利")
+    private String benefits;
+    @ApiModelProperty("职位描述")
+    private String describes;
+    @ApiModelProperty("职位要求")
+    private String demand;
+    @ApiModelProperty("地址")
+    private String address;
+    private String remarks;
+
+    private List<String> files = new ArrayList<>();
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsMapper.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.oa.biz.hrhiredetails;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/17
+ **/
+@Mapper
+public interface HrHireDetailsMapper extends BaseMapper<HrHireDetails> {
+    List<HrHireDetailsVo> getUpdateInit(String sid);
+
+    List<HrHireDetails> selectByMainSid(String sid);
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsMapper">
+    <select id="getUpdateInit" resultType="com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetailsVo">
+        select deptSid  deptKey,
+               deptName deptValue,
+               postSid  jobKey,
+               postName jobValue,
+               memberCount,
+               educationKey,
+               educationValue,
+               formalWages,
+               benefits,
+               describes,
+               demand,
+               address,
+               sid,
+               remarks
+        from hr_hire_details
+        where mainSid = #{sid}
+    </select>
+
+    <select id="selectByMainSid" resultType="com.yxt.anrui.oa.biz.hrhiredetails.HrHireDetails">
+        select *
+        from hr_hire_details
+        where mainSid = #{sid}
+    </select>
+</mapper>

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsService.java

@@ -0,0 +1,66 @@
+package com.yxt.anrui.oa.biz.hrhiredetails;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.oa.biz.oaappendix.OaAppendixMapper;
+import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
+import com.yxt.anrui.oa.feign.file.OaFileEnum;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/17
+ **/
+@Service
+public class HrHireDetailsService extends MybatisBaseService<HrHireDetailsMapper, HrHireDetails> {
+
+    @Autowired
+    private OaAppendixMapper oaAppendixMapper;
+    @Autowired
+    private OaAppendixService oaAppendixService;
+
+    public List<HrHireDetailsVo> getUpdateInit(String sid) {
+        return baseMapper.getUpdateInit(sid);
+    }
+
+    public void saveDetails(List<HrHireDetailsDto> list, String sid) {
+        //根据sid查询明细并删除
+        List<HrHireDetails> list2 = baseMapper.selectByMainSid(sid);
+        list2.removeAll(Collections.singleton(null));
+        if (!list2.isEmpty()) {
+            list2.stream().forEach(v -> {
+                oaAppendixMapper.deleteByLinkSid(v.getSid());
+                deleteBySid(v.getSid());
+            });
+        }
+        list.removeAll(Collections.singleton(null));
+        if (!list.isEmpty()) {
+            list.stream().forEach(details -> {
+                HrHireDetails hrHireDetails = new HrHireDetails();
+                BeanUtil.copyProperties(details, hrHireDetails);
+                hrHireDetails.setDeptSid(details.getDeptKey());
+                hrHireDetails.setDeptName(details.getDeptValue());
+                hrHireDetails.setPostSid(details.getJobKey());
+                hrHireDetails.setPostName(details.getJobValue());
+                hrHireDetails.setMainSid(sid);
+                baseMapper.insert(hrHireDetails);
+                List<String> files = details.getFiles();
+                // 处理附件
+                saveFiles(hrHireDetails.getSid(), files, OaFileEnum.HIHIREAPPLY.getAttachType(), "文件");
+
+            });
+        }
+
+    }
+
+    // 保存文件
+    private void saveFiles(String sid, List<String> files, String attachType, String fileType) {
+        files.removeAll(Collections.singleton(null));
+        oaAppendixService.saveFile(sid, files, attachType, fileType);
+    }
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsVo.java

@@ -0,0 +1,48 @@
+package com.yxt.anrui.oa.biz.hrhiredetails;
+
+import com.yxt.anrui.oa.biz.oaform.FormCommon;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/16
+ **/
+@Data
+public class HrHireDetailsVo implements Vo {
+    private static final long serialVersionUID = -3330232160961910852L;
+    private String sid;
+    @ApiModelProperty("招聘部门")
+    private FormCommon deptObj;
+    private String deptKey;
+    private String deptValue;
+    @ApiModelProperty("招聘岗位")
+    private FormCommon jobObj;
+    private String jobKey;
+    private String jobValue;
+    @ApiModelProperty("人数")
+    private String memberCount;
+    @ApiModelProperty("学历")
+    private FormCommon educationObj;
+    private String educationKey;
+    private String educationValue;
+    @ApiModelProperty("薪资待遇")
+    private String formalWages;
+    @ApiModelProperty("职位福利")
+    private String benefits;
+    @ApiModelProperty("职位描述")
+    private String describes;
+    @ApiModelProperty("职位要求")
+    private String demand;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    private List<String> files = new ArrayList<>();
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/Extra.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.oa.biz.oaform;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/16
+ **/
+@Data
+public class Extra {
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/FormCommon.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.oa.biz.oaform;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/16
+ **/
+@Data
+public class FormCommon {
+
+    private String id;
+    private String dictValue;
+
+    private Extra extra;
+
+    // 静态方法，直接通过方法创建对象并赋值
+    public static FormCommon of(String id, String dictValue) {
+        FormCommon formCommon = new FormCommon();
+        formCommon.setId(id);
+        formCommon.setDictValue(dictValue);
+        return formCommon;
+    }
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java

@@ -20,7 +20,7 @@ public class OaFormDto implements Dto {
     @ApiModelProperty("创建人sid")
     private String createBySid;
     @ApiModelProperty("组织机构全路径")
-    private String orgSidPath;
+    private String orgPath;
     @ApiModelProperty("申请单编号的字母")
     private String billNo;
     @ApiModelProperty("sid")

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java

@@ -75,10 +75,11 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
         // 创建OA表单对象
         OaForm oaForm = new OaForm();
         // 将DTO中部分属性复制到oaForm中，忽略不需要的字段（如billNo, orgSidPath）
-        BeanUtil.copyProperties(dto, oaForm, "billNo", "orgSidPath");
+        BeanUtil.copyProperties(dto, oaForm, "billNo", "orgPath");
         try {
+            String orgSidPath = dto.getOrgPath();
             // 获取组织信息，根据orgSidPath字段调用外部服务
-            OrgVo orgVo = sysOrganizationFeign.getOrgByPath(dto.getOrgSidPath()).getData();
+            OrgVo orgVo = sysOrganizationFeign.getOrgByPath(orgSidPath).getData();
             // 如果组织信息为空，返回失败信息
             if (orgVo == null) {
                 return rb.setMsg("未找到对应的组织信息");

yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java

@@ -10,6 +10,7 @@ public enum OaFileEnum {
     OALEAVEAPPLY("001", "请假申请附件"),
     OAMENDAPPLY("002", "补卡申请附件"),
     ADEXPATRIATESAPPLY("003", "驻外人员认定附件"),
+    HIHIREAPPLY("004", "招聘需求附件"),
     ;
 
 

yxt-oa/src/main/java/com/yxt/anrui/oa/feign/flowable/flow/ProcDefEnum.java

@@ -9,6 +9,7 @@ public enum ProcDefEnum {
     /***************************正式流程id***********************************/
     OALEAVEAPPLY("请假申请", "process_su0yph7n:1:15957504"),
     OAMENDAPPLY("补卡申请", "process_9suucr96:1:16072504"),
+    HIHIREAPPLY("招聘需求", "process_zy0m4jrp:1:16802504"),
     ;