招聘需求

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

@@ -4,10 +4,12 @@ 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.NodeQuery;
 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.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -60,4 +62,11 @@ public class HrHireApplyRest {
         return hrHireApplyService.complete(dto);
     }
 
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
+        return hrHireApplyService.getFlowOperateTitle(query);
+    }
+
 }

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

@@ -122,4 +122,11 @@ public class OaMendApplyRest {
     public ResultBean<List<NodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap NodeQuery query) {
         return oaMendApplyService.getNextNodesForSubmit(query);
     }
+
+    @ApiOperation("移动端获取上一环节获取下一环节")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
+        return oaMendApplyService.getFlowOperateTitle(query);
+    }
 }

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

@@ -9,10 +9,7 @@ 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.biz.oaform.flowable.*;
 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;
@@ -174,6 +171,36 @@ public class HrHireApplyService extends MybatisBaseService<HrHireApplyMapper, Hr
         return oaFormService.complete(businessVariablesDto);
     }
 
+    public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        Map<String, Object> formVariables = query.getFormVariables();
+        formVariables = getMap(formVariables, query.getBusinessSid());
+        query.setFormVariables(formVariables);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<NodeVo>> resultBean = oaFormService.getPreviousNodesForReject(query);
+            if (resultBean.getSuccess()) {
+                resultBean.getData().removeAll(Collections.singleton(null));
+                data = resultBean.getData().get(0).getName();
+            } else {
+                return rb.setMsg(resultBean.getMsg());
+            }
+        } else if (next == 1) {
+            ResultBean<List<NodeVo>> resultBean = oaFormService.getNextNodesForSubmit(query);
+            if (resultBean.getSuccess()) {
+                resultBean.getData().removeAll(Collections.singleton(null));
+                data = resultBean.getData().get(0).getName();
+            } else {
+                return rb.setMsg(resultBean.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        return rb.success().setData(data);
+    }
+
 
     public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) {
         Map<String, Object> appMap = new HashMap<>();

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -22,4 +23,8 @@ public class NodeQuery {
     private String businessSid;
 
     private Map<String, Object> formVariables = new HashMap<>();
+
+    @ApiModelProperty(value = "0 上一环节  1下一环节")
+    @NotNull(message = "参数错误：next")
+    private Integer next;
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java

@@ -158,15 +158,15 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
             baseMapper.updateById(entity);
         }
         // 处理附件
-        saveFiles(sid, files, OaFileEnum.OAMENDAPPLY.getAttachType(),"图片");
+        saveFiles(sid, files, OaFileEnum.OAMENDAPPLY.getAttachType(), "图片");
 
         return rb.success().setData(sid);
     }
 
     // 保存文件
-    private void saveFiles(String sid, List<String> files, String attachType,String fileType) {
+    private void saveFiles(String sid, List<String> files, String attachType, String fileType) {
         files.removeAll(Collections.singleton(null));
-        oaAppendixService.saveFile(sid, files, attachType,fileType);
+        oaAppendixService.saveFile(sid, files, attachType, fileType);
     }
 
     public OaMendApplyVo fetchDetailsVoBySid(String sid) {
@@ -294,6 +294,41 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
         return oaFormService.getPreviousNodesForReject(query);
     }
 
+    public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        Map<String, Object> formVariables = query.getFormVariables();
+        //添加网关
+//        formVariables.put("", "");
+        //若有移动端，则需和移动端沟通具体参数，若没有删去即可。
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", query.getBusinessSid());
+        formVariables.put("app", appMap);
+        query.setFormVariables(formVariables);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<NodeVo>> resultBean = oaFormService.getPreviousNodesForReject(query);
+            if (resultBean.getSuccess()) {
+                resultBean.getData().removeAll(Collections.singleton(null));
+                data = resultBean.getData().get(0).getName();
+            } else {
+                return rb.setMsg(resultBean.getMsg());
+            }
+        } else if (next == 1) {
+            ResultBean<List<NodeVo>> resultBean = oaFormService.getNextNodesForSubmit(query);
+            if (resultBean.getSuccess()) {
+                resultBean.getData().removeAll(Collections.singleton(null));
+                data = resultBean.getData().get(0).getName();
+            } else {
+                return rb.setMsg(resultBean.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        return rb.success().setData(data);
+    }
+
     /**
      * 具体申请设置网关参数的统一方法
      */