Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java

@@ -78,7 +78,7 @@ public class ScmCollectionrebateCheckapplyRest implements ScmCollectionrebateChe
     @Override
     public ResultBean rePushVoucher(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        scmCollectionrebateCheckapplyService.pusCollectionRebateWithVoucher(sid);
+        scmCollectionrebateCheckapplyService.pusCollectionRebateCheckVoucher(sid);
         return rb.success();
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java

@@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
@@ -45,11 +46,8 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
 import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate;
 import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.*;
@@ -72,11 +70,13 @@ import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessageFlowVo;
 import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 /**
@@ -365,7 +365,7 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
      *
      * @param sid
      */
-    public void pusCollectionRebateWithVoucher(String sid) {
+    public void pusCollectionRebateCheckVoucher(String sid) {
         String summaryTag = "";//摘要前缀
         ScmCollectionrebateCheckapply entity = fetchBySid(sid);
         String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
@@ -553,6 +553,19 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
                 for (String collectionRebateSid : collectionRebateSids) {
                     scmCollectionRebateService.updateState(collectionRebateSid, 4);
                 }
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(1, 10,
+                            1000, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    Future future1 = pool.submit(() -> {
+                        pusCollectionRebateCheckVoucher(bv.getBusinessSid()); //回款返利核对凭证
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
             } else {
                 //极光推送
                 scmCollectionrebateCheckapply = fetchBySid(bv.getBusinessSid());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java

@@ -30,6 +30,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
@@ -74,11 +75,13 @@ import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessageFlowVo;
 import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -522,7 +525,18 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
                         scmCollectionRebateDistributionService.save(scmCollectionRebateDistribution);
                     }
                 }
-                pushCollectionRebateWithVoucher(bv.getBusinessSid()); //回款返利预提凭证
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(1, 10,
+                            1000, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    Future future1 = pool.submit(() -> {
+                        pushCollectionRebateWithVoucher(bv.getBusinessSid()); //回款返利预提凭证
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             } else {
                 //极光推送
                 scmCollectionRebateWithApply = fetchBySid(bv.getBusinessSid());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java

@@ -66,7 +66,7 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
     @Override
     public ResultBean rePushVoucher(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        scmSpecialrebateCheckapplyService.pushSpecialRebateWithVoucher(sid);
+        scmSpecialrebateCheckapplyService.pushSpecialRebateCheckVoucher(sid);
         return rb.success();
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@@ -30,6 +30,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
@@ -79,11 +80,13 @@ import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import com.yxt.messagecenter.api.messagelist.MessageList;
 import com.yxt.messagecenter.api.messagelist.MessageListFeign;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 import static java.util.Comparator.comparing;
@@ -435,7 +438,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
      * 推送单车返利核对凭证
      *
      */
-    public void pushSpecialRebateWithVoucher(String sid) {
+    public void pushSpecialRebateCheckVoucher(String sid) {
         String summaryTag = "";//摘要前缀
         ScmSpecialrebateCheckapply entity = fetchBySid(sid);
         String format = scmVehRebateWithApplyService.returnBusDate(entity.getCreateTime());
@@ -886,8 +889,19 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                     }
                     scmSpecialRebateService.updateOnceCheckState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1);
                 }
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(1, 10,
+                            1000, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    Future future1 = pool.submit(() -> {
+                        pushSpecialRebateCheckVoucher(bv.getBusinessSid());
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
 
-                pushSpecialRebateWithVoucher(bv.getBusinessSid());
             } else {
                 //极光推送
                 scmSpecialrebateCheckapply = fetchBySid(bv.getBusinessSid());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

@@ -30,6 +30,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
@@ -79,11 +80,13 @@ import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import com.yxt.messagecenter.api.messagelist.MessageList;
 import com.yxt.messagecenter.api.messagelist.MessageListFeign;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 import static java.util.Comparator.comparing;
@@ -584,7 +587,18 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
                     scmSpecialRebateService.updateState(specialRebateSid, 2);
                     scmSpecialRebateService.updateWithholdingDateBySid(specialRebateSid,scmSpecialRebateWithApply.getWithApply());
                 }
-                pushSpecialRebateWithVoucher(bv.getBusinessSid());
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(1, 10,
+                            1000, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    Future future1 = pool.submit(() -> {
+                        pushSpecialRebateWithVoucher(bv.getBusinessSid());
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             } else {
                 //极光推送
                 scmSpecialRebateWithApply = fetchBySid(bv.getBusinessSid());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@@ -30,6 +30,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
@@ -83,11 +84,13 @@ import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import com.yxt.messagecenter.api.messagelist.MessageList;
 import com.yxt.messagecenter.api.messagelist.MessageListFeign;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 import static java.util.Comparator.comparing;
@@ -489,7 +492,21 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
                     }
                     scmVehRebateService.updateOnceCheckState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 1);
                 }
-                pushVehRebateWithVoucher(bv.getBusinessSid()); //推送返利核对凭证
+
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(1, 10,
+                            1000, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    Future future1 = pool.submit(() -> {
+                        pushVehRebateWithVoucher(bv.getBusinessSid()); //推送返利核对凭证
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+
             } else {
                 //极光推送
                 scmVehrebateCheckapply = fetchBySid(bv.getBusinessSid());

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -244,7 +244,7 @@
     </select>
 
     <select id="getToDoNum" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM
+        SELECT COUNT(a.sid) FROM
             (SELECT
                  b.sid
              FROM

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

@@ -0,0 +1,104 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.api;
+
+import com.yxt.anrui.oa.biz.adseatapply.*;
+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.Api;
+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;
+
+@Api(tags = "乘坐交通工具特殊座席事前申请")
+@RestController
+@RequestMapping("v1/byVehicleapply")
+public class AdSeatApplyRest {
+
+	@Autowired
+	private AdSeatApplyService adSeatApplyService;
+
+	@ApiOperation("初始化（新增或修改）")
+	@GetMapping({"/getInit", "/getInit/{sid}"})
+	public ResultBean<AdSeatApplyVo> getInit(
+			@PathVariable(value = "sid", required = false) String sid,
+			@RequestParam(value = "userSid", required = false) String userSid,
+			@RequestParam(value = "orgPath", required = false) String orgPath) {
+		ResultBean<AdSeatApplyVo> rb = ResultBean.fireFail();
+		if (sid == null || sid.isEmpty()) {
+			// 执行新增初始化
+			if (userSid == null || orgPath == null) {
+				return rb.setMsg("userSid和orgPath不能为空");
+			}
+			return adSeatApplyService.getSaveInit(userSid, orgPath);
+		} else {
+			// 执行修改初始化
+			return adSeatApplyService.getUpdateInit(sid);
+		}
+	}
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AdSeatApplyDto dto) {
+		return adSeatApplyService.saveOrUpdateDto(dto);
+	}
+
+	@ApiOperation("详情")
+	@GetMapping("/details/{sid}")
+	ResultBean<AdSeatApplyDetailsVo> details(@PathVariable("sid") String sid
+			, @RequestParam(value = "application", required = false) String application) {
+		return adSeatApplyService.details(sid,application);
+	}
+
+	@ApiOperation("提交审批流程")
+	@PostMapping("/submit")
+	public ResultBean submit(@RequestBody AdSeatApplyDto dto) {
+		return adSeatApplyService.submit(dto);
+	}
+
+	@ApiOperation(value = "办理（同意）")
+	@PutMapping("/complete")
+	public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
+		return adSeatApplyService.complete(dto);
+	}
+
+	@ApiOperation(value = "驳回任务")
+	@PutMapping(value = "/reject")
+	public ResultBean reject(@Valid @RequestBody TaskDto dto) {
+		return adSeatApplyService.reject(dto);
+	}
+
+	@ApiOperation("获取流程操作标题")
+	@GetMapping("/getFlowOperateTitle")
+	@ResponseBody
+	ResultBean<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
+		return adSeatApplyService.getFlowOperateTitle(query);
+	}
+}

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

@@ -0,0 +1,40 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.api;
+
+import com.yxt.anrui.oa.biz.adseatdetail.*;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "乘坐交通工具特殊座席事前列表")
+@RestController
+public class AdSeatDetailRest {
+
+}

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

@@ -0,0 +1,104 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.api;
+
+import com.yxt.anrui.oa.biz.adteamapply.*;
+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.Api;
+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;
+
+@Api(tags = "团建申请")
+@RestController
+@RequestMapping("v1/leagueConstructionapply")
+public class AdTeamApplyRest {
+
+	@Autowired
+	private AdTeamApplyService adTeamApplyService;
+
+	@ApiOperation("初始化（新增或修改）")
+	@GetMapping({"/getInit", "/getInit/{sid}"})
+	public ResultBean<AdTeamApplyVo> getInit(
+			@PathVariable(value = "sid", required = false) String sid,
+			@RequestParam(value = "userSid", required = false) String userSid,
+			@RequestParam(value = "orgPath", required = false) String orgPath) {
+		ResultBean<AdTeamApplyVo> rb = ResultBean.fireFail();
+		if (sid == null || sid.isEmpty()) {
+			// 执行新增初始化
+			if (userSid == null || orgPath == null) {
+				return rb.setMsg("userSid和orgPath不能为空");
+			}
+			return adTeamApplyService.getSaveInit(userSid, orgPath);
+		} else {
+			// 执行修改初始化
+			return adTeamApplyService.getUpdateInit(sid);
+		}
+	}
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody AdTeamApplyDto dto) {
+		return adTeamApplyService.saveOrUpdateDto(dto);
+	}
+
+	@ApiOperation("详情")
+	@GetMapping("/details/{sid}")
+	ResultBean<AdTeamApplyDetailsVo> details(@PathVariable("sid") String sid
+			, @RequestParam(value = "application", required = false) String application) {
+		return adTeamApplyService.details(sid,application);
+	}
+
+	@ApiOperation("提交审批流程")
+	@PostMapping("/submit")
+	public ResultBean submit(@RequestBody AdTeamApplyDto dto) {
+		return adTeamApplyService.submit(dto);
+	}
+
+	@ApiOperation(value = "办理（同意）")
+	@PutMapping("/complete")
+	public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
+		return adTeamApplyService.complete(dto);
+	}
+
+	@ApiOperation(value = "驳回任务")
+	@PutMapping(value = "/reject")
+	public ResultBean reject(@Valid @RequestBody TaskDto dto) {
+		return adTeamApplyService.reject(dto);
+	}
+
+	@ApiOperation("获取流程操作标题")
+	@GetMapping("/getFlowOperateTitle")
+	@ResponseBody
+	ResultBean<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
+		return adTeamApplyService.getFlowOperateTitle(query);
+	}
+}

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

@@ -0,0 +1,36 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.api;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "团建列表")
+@RestController
+@RequestMapping("v1/adteamdetail")
+public class AdTeamDetailRest {
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java

@@ -51,6 +51,7 @@ import java.util.Map;
 
 @Service
 public class AdSalecarpulApplyService extends MybatisBaseService<AdSalecarpulApplyMapper, AdSalecarpulApply> {
+
 	@Autowired
 	private OaAppendixService oaAppendixService;
 	@Autowired

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApply.java

@@ -0,0 +1,44 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adseatapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "乘坐交通工具特殊座席事前申请", description = "乘坐交通工具特殊座席事前申请")
+@TableName("ad_seat_apply")
+public class AdSeatApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("基础表单sid")
+    private String formSid; // 基础表单sid
+    @ApiModelProperty("关联审批sid列表,英文逗号分隔")
+    private String linkFormSids; // 关联审批sid列表,英文逗号分隔
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyDetailsVo.java

@@ -0,0 +1,49 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adseatapply;
+
+import com.yxt.anrui.oa.biz.adseatdetail.AdSeatListDetailVo;
+import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@ApiModel(value = "乘坐交通工具特殊座席事前申请 视图数据详情", description = "乘坐交通工具特殊座席事前申请 视图数据详情")
+public class AdSeatApplyDetailsVo extends OaFormCommonVo {
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("图片")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("附件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdSeatListDetailVo> list = new ArrayList<>();
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyDto.java

@@ -0,0 +1,52 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adseatapply;
+
+import com.yxt.anrui.oa.biz.adseatdetail.AdSeatDetailDto;
+import com.yxt.anrui.oa.biz.oaform.OaFormDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@ApiModel(value = "乘坐交通工具特殊座席事前申请 数据传输对象", description = "乘坐交通工具特殊座席事前申请 数据传输对象")
+public class AdSeatApplyDto extends OaFormDto {
+
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("基础表单sid")
+    private String formSid;
+    @ApiModelProperty("关联审批单")
+    private String linkFormSids;
+    @ApiModelProperty("图片")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("文件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdSeatDetailDto> list = new ArrayList<>();
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyMapper.java

@@ -0,0 +1,35 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adseatapply;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AdSeatApplyMapper extends BaseMapper<AdSeatApply> {
+
+	AdSeatApplyDetailsVo details(String sid);
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyMapper.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.adseatapply.AdSeatApplyMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="details" resultMap="detailMap">
+        select remarks, sid
+        from ad_seat_apply
+        where sid = #{sid}
+    </select>
+
+    <resultMap id="detailMap" type="com.yxt.anrui.oa.biz.adseatapply.AdSeatApplyDetailsVo">
+        <result column="remarks" property="remarks"/>
+        <collection property="list" ofType="com.yxt.anrui.oa.biz.adseatdetail.AdSeatListDetailVo"
+                    select="selectList" column="sid">
+        </collection>
+    </resultMap>
+
+    <select id="selectList" resultType="com.yxt.anrui.oa.biz.adseatdetail.AdSeatListDetailVo">
+        select sid,
+               specialSeat,
+               cause,
+               expectCost,
+               costRemarks
+        from ad_seat_detail
+        where mainSid = #{sid}
+    </select>
+</mapper>

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyService.java

@@ -0,0 +1,304 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adseatapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.oa.biz.adsalecarpulapply.AdSalecarpulApply;
+import com.yxt.anrui.oa.biz.adseatdetail.AdSeatDetailDto;
+import com.yxt.anrui.oa.biz.adseatdetail.AdSeatDetailService;
+import com.yxt.anrui.oa.biz.adseatdetail.AdSeatDetailVo;
+import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
+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.OaFormUrlEnum;
+import com.yxt.anrui.oa.biz.oaform.flowable.*;
+import com.yxt.anrui.oa.feign.file.OaFileEnum;
+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 org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+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;
+
+@Service
+public class AdSeatApplyService extends MybatisBaseService<AdSeatApplyMapper, AdSeatApply> {
+
+	@Autowired
+	private OaAppendixService oaAppendixService;
+	@Autowired
+	private OaFormService oaFormService;
+	@Autowired
+	private AdSeatDetailService adSeatDetailService;
+	@Autowired
+	private SysOrganizationFeign sysOrganizationFeign;
+
+	public ResultBean<AdSeatApplyVo> getSaveInit(String userSid, String orgPath) {
+		ResultBean<AdSeatApplyVo> rb = ResultBean.fireFail();
+		AdSeatApplyVo adSeatApplyVo = new AdSeatApplyVo();
+		adSeatApplyVo.setCreateBySid(userSid);
+		adSeatApplyVo.setOrgSidPath(orgPath);
+		return rb.success().setData(adSeatApplyVo);
+	}
+
+	public ResultBean<AdSeatApplyVo> getUpdateInit(String sid) {
+		ResultBean<AdSeatApplyVo> rb = ResultBean.fireFail();
+		AdSeatApplyVo adSeatApplyVo = new AdSeatApplyVo();
+		AdSeatApply adSeatApply = fetchBySid(sid);
+		if (adSeatApply == null) {
+			return rb.setMsg("该申请不存在");
+		}
+//        adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
+		OaForm oaForm = oaFormService.fetchBySid(sid);
+		adSeatApplyVo.setTaskId(oaForm.getTaskId());
+		adSeatApplyVo.setProcInsId(oaForm.getProcInstId());
+		//根据部门sid获取orgPath并赋值
+		SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData();
+		String orgSidPath = organizationVo.getOrgSidPath();
+		adSeatApplyVo.setOrgSidPath(orgSidPath);
+		adSeatApplyVo.setCreateBySid(oaForm.getCreateBySid());
+		BeanUtil.copyProperties(adSeatApply, adSeatApplyVo);
+		List<AdSeatDetailVo> list = adSeatDetailService.getUpdateInit(sid);
+		List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
+		adSeatApplyVo.setFiles(files);
+		List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
+		adSeatApplyVo.setAppes(appes);
+		adSeatApplyVo.setList(list);
+		adSeatApplyVo.setSid(sid);
+		return rb.success().setData(adSeatApplyVo);
+	}
+
+	public ResultBean<String> saveOrUpdateDto(AdSeatApplyDto dto) {
+		ResultBean<String> rb = ResultBean.fireFail();
+		String sid = dto.getSid();
+		List<String> files = dto.getFiles();
+		List<String> appes = dto.getAppes();
+		List<AdSeatDetailDto> list = dto.getList();
+		if (StringUtils.isBlank(sid)) {
+			// 新建操作
+			AdSeatApply entity = new AdSeatApply();
+			BeanUtil.copyProperties(dto, entity, "sid");
+
+			dto.setBillNo("CZJTGJTSZXSQ");
+			dto.setSid(entity.getSid());
+			ResultBean<String> resultBean = oaFormService.saveOaForm(dto);
+
+			if (!resultBean.getSuccess()) {
+				return rb;
+			}
+
+			entity.setFormSid(resultBean.getData());
+			baseMapper.insert(entity);
+			sid = entity.getSid();
+		} else {
+			// 更新操作
+			AdSeatApply entity = fetchBySid(sid);
+			BeanUtil.copyProperties(dto, entity, "id", "sid");
+			baseMapper.updateById(entity);
+		}
+		adSeatDetailService.saveDetails(list, sid);
+		// 处理附件
+		saveFiles(sid, files, OaFileEnum.ADSEATAPPLY.getAttachType(), "图片");
+		saveFiles(sid, appes, OaFileEnum.ADSEATAPPLY.getAttachType(), "文件");
+		return rb.success().setData(sid);
+	}
+
+	// 保存文件
+	private void saveFiles(String sid, List<String> files, String attachType, String fileType) {
+		files.removeAll(Collections.singleton(null));
+		oaAppendixService.saveFile(sid, files, attachType, fileType);
+	}
+
+	public ResultBean<AdSeatApplyDetailsVo> details(String sid, String application) {
+		ResultBean rb = ResultBean.fireFail();
+		AdSeatApplyDetailsVo adSeatApplyDetailsVo = baseMapper.details(sid);
+		if (adSeatApplyDetailsVo == null) {
+			return rb.setMsg("该申请不存在");
+		}
+		List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
+		List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
+		adSeatApplyDetailsVo.setFiles(files);
+		adSeatApplyDetailsVo.setAppes(appes);
+		//基础字段赋值
+		BeanUtil.copyProperties(oaFormService.getDetails(sid), adSeatApplyDetailsVo);
+		return rb.success().setData(adSeatApplyDetailsVo);
+	}
+
+	/**
+	 * 提交
+	 *
+	 * @param dto
+	 * @return
+	 */
+	public ResultBean submit(AdSeatApplyDto 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 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);
+	}
+
+	/**
+	 * 驳回
+	 *
+	 * @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 ResultBean<String> getFlowOperateTitle(NodeQuery query) {
+		// 默认失败返回
+		ResultBean<String> rb = ResultBean.fireFail();
+
+		// 获取next值和formVariables
+		int next = query.getNext();
+
+		// 获取并更新formVariables
+		Map<String, Object> formVariables = getMap(query.getFormVariables(), query.getBusinessSid());
+		query.setFormVariables(formVariables);
+
+		// 校验next参数是否有效（只允许0或1）
+		if (next != 0 && next != 1) {
+			return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息
+		}
+
+		// 获取节点名称
+		String data = getNodeName(query, next);
+
+		// 如果data为null，表示未获取到有效的节点信息
+		if (data == null) {
+			return rb.setMsg("没有获取到节点信息"); // 返回错误消息
+		}
+
+		// 返回成功的结果和获取到的节点名称
+		return rb.success().setData(data);
+	}
+
+	/**
+	 * 网关参数组成
+	 *
+	 * @param formVariables
+	 * @param sid
+	 * @return
+	 */
+	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);
+        appMap.put("flowOperateUrl", "oa/v1/HrHireApply/getFlowOperateTitle");
+        appMap.put("agreeUrl", "oa/v1/HrHireApply/complete");
+        appMap.put("stopUrl", "oa/v1/oaform/breakProcess");
+        appMap.put("rejectUrl", "oa/v1/HrHireApply/reject");
+        appMap.put("recallUrl", "oa/v1/oaform/revokeProcess");
+        appMap.put("signUrl", "oa/v1/oaform/delegate");
+        appMap.put("transferUrl", "oa/v1/oaform/assignTask");*/
+		appMap.put(OaFormUrlEnum.HRHIREAPPLY_EDIT.getType(), OaFormUrlEnum.HRHIREAPPLY_EDIT.getUrl() + "?sid=" + sid);
+		appMap.put(OaFormUrlEnum.HRHIREAPPLY_DETAIL.getType(), OaFormUrlEnum.HRHIREAPPLY_DETAIL.getUrl() + "?sid=" + sid);
+		appMap.put(OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getUrl());
+		appMap.put(OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getUrl());
+		appMap.put(OaFormUrlEnum.STOPURL.getType(), OaFormUrlEnum.STOPURL.getUrl());
+		appMap.put(OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getType(), OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getUrl());
+		appMap.put(OaFormUrlEnum.RECALLURL.getType(), OaFormUrlEnum.RECALLURL.getUrl());
+		appMap.put(OaFormUrlEnum.SIGNURL.getType(), OaFormUrlEnum.SIGNURL.getUrl());
+		appMap.put(OaFormUrlEnum.TRANSFERURL.getType(), OaFormUrlEnum.TRANSFERURL.getUrl());
+		formVariables.put("app", appMap);
+		//根据组织查询是否是分公司
+		OaForm oaForm = oaFormService.fetchBySid(sid);
+		AdSeatApply adSeatApply = fetchBySid(sid);
+		SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(oaForm.getUseOrgSid()).getData();
+		//是否是分公司
+		formVariables.put("isTrue", sysOrganization.getIsDept() == 0);
+		return formVariables;
+	}
+
+	/**
+	 * 根据next的值获取前一个节点或下一个节点的名称。
+	 *
+	 * @param query 包含查询所需参数的NodeQuery对象
+	 * @param next  参数，0表示上一环节，1表示下一环节
+	 * @return 节点名称，如果失败则返回null
+	 */
+	private String getNodeName(NodeQuery query, int next) {
+		// 根据next值选择相应的服务方法获取节点信息
+		ResultBean<List<NodeVo>> resultBean = (next == 0)
+				? oaFormService.getPreviousNodesForReject(query)  // 获取上一环节的节点
+				: oaFormService.getNextNodesForSubmit(query);     // 获取下一环节的节点
+		// 如果服务调用成功
+		if (resultBean.getSuccess()) {
+			// 清除结果列表中的null值，避免空节点
+			resultBean.getData().removeAll(Collections.singleton(null));
+			// 如果结果列表非空，返回第一个节点的名称
+			if (!resultBean.getData().isEmpty()) {
+				return resultBean.getData().get(0).getName();
+			}
+		} else {
+			// 如果服务调用失败，返回null
+			return null;
+		}
+		// 如果结果为空，返回null
+		return null;
+	}
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatapply/AdSeatApplyVo.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adseatapply;
+
+import com.yxt.anrui.oa.biz.adseatdetail.AdSeatDetailVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@ApiModel(value = "乘坐交通工具特殊座席事前申请 视图数据对象", description = "乘坐交通工具特殊座席事前申请 视图数据对象")
+public class AdSeatApplyVo implements Vo {
+
+    private String sid;
+    /*  private String userSid;
+      private String orgPath;*/
+    private String orgSidPath;
+    private String createBySid;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("图片")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("附件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdSeatDetailVo> list = new ArrayList<>();
+
+    private String taskId;
+    @ApiModelProperty("流程实例id")
+    private String procInsId;
+
+//    private String testPage;
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetail.java

@@ -0,0 +1,52 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adseatdetail;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "乘坐交通工具特殊座席事前列表", description = "乘坐交通工具特殊座席事前列表")
+@TableName("ad_seat_detail")
+public class AdSeatDetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("申请sid")
+    private String mainSid; // 申请sid
+    @ApiModelProperty("申请交通工具特殊座席")
+    private String specialSeat; // 申请交通工具特殊座席
+    @ApiModelProperty("申请事由及详情")
+    private String cause; // 申请事由及详情
+    @ApiModelProperty("预计费用")
+    private BigDecimal expectCost; // 预计费用
+    @ApiModelProperty("费用明细")
+    private String costRemarks; // 费用明细
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailDto.java

@@ -0,0 +1,47 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adseatdetail;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "乘坐交通工具特殊座席事前列表 数据传输对象", description = "乘坐交通工具特殊座席事前列表 数据传输对象")
+public class AdSeatDetailDto implements Dto {
+
+    @ApiModelProperty("申请交通工具特殊座席")
+    private String specialSeat;
+    @ApiModelProperty("申请事由及详情")
+    private String cause;
+    @ApiModelProperty("预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("费用明细")
+    private String costRemarks;
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailMapper.java

@@ -0,0 +1,40 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adseatdetail;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import java.util.List;
+
+@Mapper
+public interface AdSeatDetailMapper extends BaseMapper<AdSeatDetail> {
+
+	List<AdSeatDetailVo> getUpdateInit(String sid);
+
+	@Select("select * from ad_seat_detail where mainSid = #{mainSid}")
+	List<AdSeatDetail> selectByMainSid(String mainSid);
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailMapper.xml

@@ -0,0 +1,15 @@
+<?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.adseatdetail.AdSeatDetailMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="getUpdateInit" resultType="com.yxt.anrui.oa.biz.adseatdetail.AdSeatDetailVo">
+        select sid,
+               specialSeat,
+               cause,
+               expectCost,
+               costRemarks
+        from ad_seat_detail
+        where mainSid = #{sid}
+    </select>
+</mapper>

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailService.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adseatdetail;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class AdSeatDetailService extends MybatisBaseService<AdSeatDetailMapper, AdSeatDetail> {
+
+	public void saveDetails(List<AdSeatDetailDto> list, String sid) {
+		//根据sid查询明细并删除
+		List<AdSeatDetail> list2 = baseMapper.selectByMainSid(sid);
+		list2.removeAll(Collections.singleton(null));
+		if (!list2.isEmpty()) {
+			list2.stream().forEach(v -> {
+				deleteBySid(v.getSid());
+			});
+		}
+		list.removeAll(Collections.singleton(null));
+		if (!list.isEmpty()) {
+			list.stream().forEach(details -> {
+				AdSeatDetail adSeatDetail = new AdSeatDetail();
+				BeanUtil.copyProperties(details, adSeatDetail);
+				adSeatDetail.setMainSid(sid);
+				baseMapper.insert(adSeatDetail);
+			});
+		}
+	}
+
+	public List<AdSeatDetailVo> getUpdateInit(String sid) {
+		return baseMapper.getUpdateInit(sid);
+	}
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatDetailVo.java

@@ -0,0 +1,48 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adseatdetail;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "乘坐交通工具特殊座席事前列表 视图数据对象", description = "乘坐交通工具特殊座席事前列表 视图数据对象")
+public class AdSeatDetailVo implements Vo {
+
+    private String sid;
+
+    @ApiModelProperty("申请交通工具特殊座席")
+    private String specialSeat;
+    @ApiModelProperty("申请事由及详情")
+    private String cause;
+    @ApiModelProperty("预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("费用明细")
+    private String costRemarks;
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adseatdetail/AdSeatListDetailVo.java

@@ -0,0 +1,48 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adseatdetail;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "乘坐交通工具特殊座席事前列表 视图数据对象", description = "乘坐交通工具特殊座席事前列表 视图数据对象")
+public class AdSeatListDetailVo implements Vo {
+
+    private String sid;
+
+    @ApiModelProperty("申请交通工具特殊座席")
+    private String specialSeat;
+    @ApiModelProperty("申请事由及详情")
+    private String cause;
+    @ApiModelProperty("预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("费用明细")
+    private String costRemarks;
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamapply/AdTeamApply.java

@@ -0,0 +1,45 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adteamapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "团建申请", description = "团建申请")
+@TableName("ad_team_apply")
+public class AdTeamApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("基础表单sid")
+    private String formSid; // 基础表单sid
+    @ApiModelProperty("关联审批sid列表,英文逗号分隔")
+    private String linkFormSids; // 关联审批sid列表,英文逗号分隔
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamapply/AdTeamApplyDetailsVo.java

@@ -0,0 +1,49 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adteamapply;
+
+import com.yxt.anrui.oa.biz.adteamdetail.AdTeamListDetailVo;
+import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@ApiModel(value = "团建申请 视图数据详情", description = "团建申请 视图数据详情")
+public class AdTeamApplyDetailsVo extends OaFormCommonVo {
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("图片")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("附件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdTeamListDetailVo> list = new ArrayList<>();
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamapply/AdTeamApplyDto.java

@@ -0,0 +1,52 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adteamapply;
+
+import com.yxt.anrui.oa.biz.adteamdetail.AdTeamDetailDto;
+import com.yxt.anrui.oa.biz.oaform.OaFormDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@ApiModel(value = "团建申请 数据传输对象", description = "团建申请 数据传输对象")
+public class AdTeamApplyDto extends OaFormDto {
+
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("基础表单sid")
+    private String formSid;
+    @ApiModelProperty("关联审批单")
+    private String linkFormSids;
+    @ApiModelProperty("图片")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("文件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdTeamDetailDto> list = new ArrayList<>();
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamapply/AdTeamApplyMapper.java

@@ -0,0 +1,35 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adteamapply;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AdTeamApplyMapper extends BaseMapper<AdTeamApply> {
+
+	AdTeamApplyDetailsVo details(String sid);
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamapply/AdTeamApplyMapper.xml

@@ -0,0 +1,32 @@
+<?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.adteamapply.AdTeamApplyMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="details" resultMap="detailMap">
+        select remarks, sid
+        from ad_team_apply
+        where sid = #{sid}
+    </select>
+
+    <resultMap id="detailMap" type="com.yxt.anrui.oa.biz.adteamapply.AdTeamApplyDetailsVo">
+        <result column="remarks" property="remarks"/>
+        <collection property="list" ofType="com.yxt.anrui.oa.biz.adteamdetail.AdTeamListDetailVo"
+                    select="selectList" column="sid">
+        </collection>
+    </resultMap>
+
+    <select id="selectList" resultType="com.yxt.anrui.oa.biz.adteamdetail.AdTeamListDetailVo">
+        select sid,
+               deptName as deptValue,
+               leagueConstructionDate,
+               leagueConstructionNum,
+               leagueConstructionStandard,
+               isUseCanteenValue,
+               isGetADrinkValue,
+               expectCost,
+               costRemarks
+        from ad_team_detail
+        where mainSid = #{sid}
+    </select>
+</mapper>

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamapply/AdTeamApplyService.java

@@ -0,0 +1,310 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adteamapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.oa.biz.adteamdetail.AdTeamDetailDto;
+import com.yxt.anrui.oa.biz.adteamdetail.AdTeamDetailService;
+import com.yxt.anrui.oa.biz.adteamdetail.AdTeamDetailVo;
+import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
+import com.yxt.anrui.oa.biz.oaform.*;
+import com.yxt.anrui.oa.biz.oaform.flowable.*;
+import com.yxt.anrui.oa.feign.file.OaFileEnum;
+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 org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+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;
+
+@Service
+public class AdTeamApplyService extends MybatisBaseService<AdTeamApplyMapper, AdTeamApply> {
+	@Autowired
+	private OaAppendixService oaAppendixService;
+	@Autowired
+	private OaFormService oaFormService;
+	@Autowired
+	private AdTeamDetailService adTeamDetailService;
+	@Autowired
+	private SysOrganizationFeign sysOrganizationFeign;
+
+	public ResultBean<AdTeamApplyVo> getSaveInit(String userSid, String orgPath) {
+		ResultBean<AdTeamApplyVo> rb = ResultBean.fireFail();
+		AdTeamApplyVo adTeamApplyVo = new AdTeamApplyVo();
+		adTeamApplyVo.setCreateBySid(userSid);
+		adTeamApplyVo.setOrgSidPath(orgPath);
+		return rb.success().setData(adTeamApplyVo);
+	}
+
+	public ResultBean<AdTeamApplyVo> getUpdateInit(String sid) {
+		ResultBean<AdTeamApplyVo> rb = ResultBean.fireFail();
+		AdTeamApplyVo adTeamApplyVo = new AdTeamApplyVo();
+		AdTeamApply adTeamApply = fetchBySid(sid);
+		if (adTeamApplyVo == null) {
+			return rb.setMsg("该申请不存在");
+		}
+//        adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
+		OaForm oaForm = oaFormService.fetchBySid(sid);
+		adTeamApplyVo.setTaskId(oaForm.getTaskId());
+		adTeamApplyVo.setProcInsId(oaForm.getProcInstId());
+		//根据部门sid获取orgPath并赋值
+		SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData();
+		String orgSidPath = organizationVo.getOrgSidPath();
+		adTeamApplyVo.setOrgSidPath(orgSidPath);
+		adTeamApplyVo.setCreateBySid(oaForm.getCreateBySid());
+		BeanUtil.copyProperties(adTeamApply, adTeamApplyVo);
+		List<AdTeamDetailVo> list = adTeamDetailService.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 isUseCanteenObj = FormCommon.of(details.getIsUseCanteenKey(), details.getIsUseCanteenValue());
+				details.setIsUseCanteenObj(isUseCanteenObj);
+				FormCommon isGetADrinkObj = FormCommon.of(details.getIsGetADrinkKey(), details.getIsGetADrinkValue());
+				details.setIsGetADrinkObj(isGetADrinkObj);
+			});
+		}
+		List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
+		adTeamApplyVo.setFiles(files);
+		List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
+		adTeamApplyVo.setAppes(appes);
+		adTeamApplyVo.setList(list);
+		adTeamApplyVo.setSid(sid);
+		return rb.success().setData(adTeamApplyVo);
+	}
+
+	public ResultBean<String> saveOrUpdateDto(AdTeamApplyDto dto) {
+		ResultBean<String> rb = ResultBean.fireFail();
+		String sid = dto.getSid();
+		List<String> files = dto.getFiles();
+		List<String> appes = dto.getAppes();
+		List<AdTeamDetailDto> list = dto.getList();
+		if (StringUtils.isBlank(sid)) {
+			// 新建操作
+			AdTeamApply entity = new AdTeamApply();
+			BeanUtil.copyProperties(dto, entity, "sid");
+
+			dto.setBillNo("TJSQ");
+			dto.setSid(entity.getSid());
+			ResultBean<String> resultBean = oaFormService.saveOaForm(dto);
+
+			if (!resultBean.getSuccess()) {
+				return rb;
+			}
+
+			entity.setFormSid(resultBean.getData());
+			baseMapper.insert(entity);
+			sid = entity.getSid();
+		} else {
+			// 更新操作
+			AdTeamApply entity = fetchBySid(sid);
+			BeanUtil.copyProperties(dto, entity, "id", "sid");
+			baseMapper.updateById(entity);
+		}
+		adTeamDetailService.saveDetails(list, sid);
+		// 处理附件
+		saveFiles(sid, files, OaFileEnum.ADTEAMAPPLY.getAttachType(), "图片");
+		saveFiles(sid, appes, OaFileEnum.ADTEAMAPPLY.getAttachType(), "文件");
+		return rb.success().setData(sid);
+	}
+
+	// 保存文件
+	private void saveFiles(String sid, List<String> files, String attachType, String fileType) {
+		files.removeAll(Collections.singleton(null));
+		oaAppendixService.saveFile(sid, files, attachType, fileType);
+	}
+
+	public ResultBean<AdTeamApplyDetailsVo> details(String sid, String application) {
+		ResultBean rb = ResultBean.fireFail();
+		AdTeamApplyDetailsVo adTeamApplyDetailsVo = baseMapper.details(sid);
+		if (adTeamApplyDetailsVo == null) {
+			return rb.setMsg("该申请不存在");
+		}
+		List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
+		List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
+		adTeamApplyDetailsVo.setFiles(files);
+		adTeamApplyDetailsVo.setAppes(appes);
+		//基础字段赋值
+		BeanUtil.copyProperties(oaFormService.getDetails(sid), adTeamApplyDetailsVo);
+		return rb.success().setData(adTeamApplyDetailsVo);
+	}
+
+	/**
+	 * 提交
+	 *
+	 * @param dto
+	 * @return
+	 */
+	public ResultBean submit(AdTeamApplyDto 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 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);
+	}
+
+	/**
+	 * 驳回
+	 *
+	 * @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 ResultBean<String> getFlowOperateTitle(NodeQuery query) {
+		// 默认失败返回
+		ResultBean<String> rb = ResultBean.fireFail();
+
+		// 获取next值和formVariables
+		int next = query.getNext();
+
+		// 获取并更新formVariables
+		Map<String, Object> formVariables = getMap(query.getFormVariables(), query.getBusinessSid());
+		query.setFormVariables(formVariables);
+
+		// 校验next参数是否有效（只允许0或1）
+		if (next != 0 && next != 1) {
+			return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息
+		}
+
+		// 获取节点名称
+		String data = getNodeName(query, next);
+
+		// 如果data为null，表示未获取到有效的节点信息
+		if (data == null) {
+			return rb.setMsg("没有获取到节点信息"); // 返回错误消息
+		}
+
+		// 返回成功的结果和获取到的节点名称
+		return rb.success().setData(data);
+	}
+
+	/**
+	 * 网关参数组成
+	 *
+	 * @param formVariables
+	 * @param sid
+	 * @return
+	 */
+	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);
+        appMap.put("flowOperateUrl", "oa/v1/HrHireApply/getFlowOperateTitle");
+        appMap.put("agreeUrl", "oa/v1/HrHireApply/complete");
+        appMap.put("stopUrl", "oa/v1/oaform/breakProcess");
+        appMap.put("rejectUrl", "oa/v1/HrHireApply/reject");
+        appMap.put("recallUrl", "oa/v1/oaform/revokeProcess");
+        appMap.put("signUrl", "oa/v1/oaform/delegate");
+        appMap.put("transferUrl", "oa/v1/oaform/assignTask");*/
+		appMap.put(OaFormUrlEnum.HRHIREAPPLY_EDIT.getType(), OaFormUrlEnum.HRHIREAPPLY_EDIT.getUrl() + "?sid=" + sid);
+		appMap.put(OaFormUrlEnum.HRHIREAPPLY_DETAIL.getType(), OaFormUrlEnum.HRHIREAPPLY_DETAIL.getUrl() + "?sid=" + sid);
+		appMap.put(OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getUrl());
+		appMap.put(OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getUrl());
+		appMap.put(OaFormUrlEnum.STOPURL.getType(), OaFormUrlEnum.STOPURL.getUrl());
+		appMap.put(OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getType(), OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getUrl());
+		appMap.put(OaFormUrlEnum.RECALLURL.getType(), OaFormUrlEnum.RECALLURL.getUrl());
+		appMap.put(OaFormUrlEnum.SIGNURL.getType(), OaFormUrlEnum.SIGNURL.getUrl());
+		appMap.put(OaFormUrlEnum.TRANSFERURL.getType(), OaFormUrlEnum.TRANSFERURL.getUrl());
+		formVariables.put("app", appMap);
+		//根据组织查询是否是分公司
+		OaForm oaForm = oaFormService.fetchBySid(sid);
+		AdTeamApply adTeamApply = fetchBySid(sid);
+		SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(oaForm.getUseOrgSid()).getData();
+		//是否是分公司
+		formVariables.put("isTrue", sysOrganization.getIsDept() == 0);
+		return formVariables;
+	}
+
+	/**
+	 * 根据next的值获取前一个节点或下一个节点的名称。
+	 *
+	 * @param query 包含查询所需参数的NodeQuery对象
+	 * @param next  参数，0表示上一环节，1表示下一环节
+	 * @return 节点名称，如果失败则返回null
+	 */
+	private String getNodeName(NodeQuery query, int next) {
+		// 根据next值选择相应的服务方法获取节点信息
+		ResultBean<List<NodeVo>> resultBean = (next == 0)
+				? oaFormService.getPreviousNodesForReject(query)  // 获取上一环节的节点
+				: oaFormService.getNextNodesForSubmit(query);     // 获取下一环节的节点
+		// 如果服务调用成功
+		if (resultBean.getSuccess()) {
+			// 清除结果列表中的null值，避免空节点
+			resultBean.getData().removeAll(Collections.singleton(null));
+			// 如果结果列表非空，返回第一个节点的名称
+			if (!resultBean.getData().isEmpty()) {
+				return resultBean.getData().get(0).getName();
+			}
+		} else {
+			// 如果服务调用失败，返回null
+			return null;
+		}
+		// 如果结果为空，返回null
+		return null;
+	}
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamapply/AdTeamApplyVo.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adteamapply;
+
+import com.yxt.anrui.oa.biz.adteamdetail.AdTeamDetailVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@ApiModel(value = "团建申请 视图数据对象", description = "团建申请 视图数据对象")
+public class AdTeamApplyVo implements Vo {
+
+    private String sid;
+    /*  private String userSid;
+      private String orgPath;*/
+    private String orgSidPath;
+    private String createBySid;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("图片")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("附件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdTeamDetailVo> list = new ArrayList<>();
+
+    private String taskId;
+    @ApiModelProperty("流程实例id")
+    private String procInsId;
+
+//    private String testPage;
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamdetail/AdTeamDetail.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adteamdetail;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "团建列表", description = "团建列表")
+@TableName("ad_team_detail")
+public class AdTeamDetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("申请sid")
+    private String mainSid; // 申请sid
+    @ApiModelProperty("部门sid")
+    private String deptSid; // 部门sid
+    @ApiModelProperty("部门名称")
+    private String deptName; // 部门名称
+    @ApiModelProperty("团建时间")
+    private String leagueConstructionDate; // 团建时间
+    @ApiModelProperty("团建人数")
+    private String leagueConstructionNum; // 团建人数
+    @ApiModelProperty("团建标准")
+    private String leagueConstructionStandard; // 团建标准
+    @ApiModelProperty("是否使用食堂key")
+    private String isUseCanteenKey; // 是否使用食堂key
+    @ApiModelProperty("是否使用食堂value")
+    private String isUseCanteenValue; // 是否使用食堂value
+    @ApiModelProperty("是否领酒水key")
+    private String isGetADrinkKey; // 是否领酒水key
+    @ApiModelProperty("是否领酒水value")
+    private String isGetADrinkValue; // 是否领酒水value
+    @ApiModelProperty("预计费用")
+    private BigDecimal expectCost; // 预计费用
+    @ApiModelProperty("费用明细")
+    private String costRemarks; // 费用明细
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamdetail/AdTeamDetailDto.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adteamdetail;
+
+import com.yxt.anrui.oa.biz.oaform.FormCommon;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "团建列表 数据传输对象", description = "团建列表 数据传输对象")
+public class AdTeamDetailDto implements Dto {
+
+    @ApiModelProperty("部门")
+    private FormCommon deptObj;
+    private String deptKey;
+    private String deptValue;
+    @ApiModelProperty("团建时间")
+    private String leagueConstructionDate;
+    @ApiModelProperty("团建人数")
+    private String leagueConstructionNum;
+    @ApiModelProperty("团建标准")
+    private String leagueConstructionStandard;
+    @ApiModelProperty("是否使用食堂")
+    private FormCommon isUseCanteenObj;
+    private String isUseCanteenKey;
+    private String isUseCanteenValue;
+    @ApiModelProperty("是否领酒水")
+    private FormCommon isGetADrinkObj;
+    private String isGetADrinkKey;
+    private String isGetADrinkValue;
+    @ApiModelProperty("预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("费用明细")
+    private String costRemarks;
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamdetail/AdTeamDetailMapper.java

@@ -0,0 +1,40 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adteamdetail;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import java.util.List;
+
+@Mapper
+public interface AdTeamDetailMapper extends BaseMapper<AdTeamDetail> {
+
+	List<AdTeamDetailVo> getUpdateInit(String sid);
+
+	@Select("select * from ad_team_detail where mainSid = #{mainSid}")
+	List<AdTeamDetail> selectByMainSid(String mainSid);
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamdetail/AdTeamDetailMapper.xml

@@ -0,0 +1,22 @@
+<?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.adteamdetail.AdTeamDetailMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="getUpdateInit" resultType="com.yxt.anrui.oa.biz.adteamdetail.AdTeamDetailVo">
+		select sid,
+			   deptSid as deptKey,
+			   deptName as deptValue,
+			   leagueConstructionDate,
+			   leagueConstructionNum,
+			   leagueConstructionStandard,
+			   isUseCanteenKey,
+			   isUseCanteenValue,
+			   isGetADrinkKey,
+			   isGetADrinkValue,
+			   expectCost,
+			   costRemarks
+		from ad_team_detail
+		where mainSid = #{sid}
+	</select>
+</mapper>

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamdetail/AdTeamDetailService.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adteamdetail;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class AdTeamDetailService extends MybatisBaseService<AdTeamDetailMapper, AdTeamDetail> {
+
+	public void saveDetails(List<AdTeamDetailDto> list, String sid) {
+		//根据sid查询明细并删除
+		List<AdTeamDetail> list2 = baseMapper.selectByMainSid(sid);
+		list2.removeAll(Collections.singleton(null));
+		if (!list2.isEmpty()) {
+			list2.stream().forEach(v -> {
+				deleteBySid(v.getSid());
+			});
+		}
+		list.removeAll(Collections.singleton(null));
+		if (!list.isEmpty()) {
+			list.stream().forEach(details -> {
+				AdTeamDetail adTeamDetail = new AdTeamDetail();
+				BeanUtil.copyProperties(details, adTeamDetail);
+				adTeamDetail.setDeptSid(details.getDeptKey());
+				adTeamDetail.setDeptName(details.getDeptValue());
+				adTeamDetail.setMainSid(sid);
+				baseMapper.insert(adTeamDetail);
+			});
+		}
+	}
+
+	public List<AdTeamDetailVo> getUpdateInit(String sid) {
+		return baseMapper.getUpdateInit(sid);
+	}
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamdetail/AdTeamDetailVo.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adteamdetail;
+
+import com.yxt.anrui.oa.biz.oaform.FormCommon;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "团建列表 视图数据对象", description = "团建列表 视图数据对象")
+public class AdTeamDetailVo implements Vo {
+
+    private String sid;
+
+    @ApiModelProperty("部门")
+    private FormCommon deptObj;
+    private String deptKey;
+    private String deptValue;
+    @ApiModelProperty("团建时间")
+    private String leagueConstructionDate;
+    @ApiModelProperty("团建人数")
+    private String leagueConstructionNum;
+    @ApiModelProperty("团建标准")
+    private String leagueConstructionStandard;
+    @ApiModelProperty("是否使用食堂")
+    private FormCommon isUseCanteenObj;
+    private String isUseCanteenKey;
+    private String isUseCanteenValue;
+    @ApiModelProperty("是否领酒水")
+    private FormCommon isGetADrinkObj;
+    private String isGetADrinkKey;
+    private String isGetADrinkValue;
+    @ApiModelProperty("预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("费用明细")
+    private String costRemarks;
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adteamdetail/AdTeamListDetailVo.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adteamdetail;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "团建列表 视图数据对象", description = "团建列表 视图数据对象")
+public class AdTeamListDetailVo implements Vo {
+
+    private String sid;
+
+    @ApiModelProperty("部门")
+    private String deptValue;
+    @ApiModelProperty("团建时间")
+    private String leagueConstructionDate;
+    @ApiModelProperty("团建人数")
+    private String leagueConstructionNum;
+    @ApiModelProperty("团建标准")
+    private String leagueConstructionStandard;
+    @ApiModelProperty("是否使用食堂")
+    private String isUseCanteenValue;
+    @ApiModelProperty("是否领酒水")
+    private String isGetADrinkValue;
+    @ApiModelProperty("预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("费用明细")
+    private String costRemarks;
+
+}

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

@@ -24,6 +24,8 @@ public enum OaFileEnum {
     ADSENPIRCARPULAPPLY("015", "总经理级固定私车公用附件"),
     ADSALECARPULAPPLY("016", "销售人员固定私车公用方案附件"),
     ADFETEAPPLY("017", "商务宴请事前附件"),
+    ADTEAMAPPLY("018", "团建附件"),
+    ADSEATAPPLY("019", "乘坐交通工具特殊坐席附件"),
     ;
 
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -479,12 +479,13 @@
         i.supplierName provider,
         i.taxRate rate,
         i.unit,
-        CONCAT(i.warehouseName, '-',a.areaName, '-',i.warehouseRackCode ) title
+        CONCAT(i.warehouseName, '-',z.zoneName,'-',a.areaName, ' ',i.warehouseRackCode ) title
         FROM
         wms_inventory AS i
         LEFT JOIN wms_warehouse_rack as r ON i.warehouseRackSid = r.sid
         LEFT JOIN wms_warehouse_area as a ON r.locationSid = a.sid
         LEFT JOIN wms_warehouse_info as wi ON wi.sid = i.warehouseSid
+        LEFT JOIN wms_warehouse_zone as z ON z.sid = r.zoneSid
         LEFT JOIN anrui_portal.sys_organization as s ON i.useOrgSid = s.sid
         <where>
             ${ew.sqlSegment}
@@ -529,7 +530,7 @@
         DATEDIFF( NOW(), i.firstInDate ) inventoryAge,
         i.cost price,
         i.unit,
-        CONCAT( i.warehouseName, '-', a.areaName, '-', i.warehouseRackCode ) title,
+        CONCAT( i.warehouseName,'-', z.zoneName, '-', a.areaName, ' ', i.warehouseRackCode ) title,
         i.sid,
         s.orgSidPath,
         i.createBySid
@@ -538,7 +539,9 @@
         LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid
         LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid
         LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid
+        LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid
         LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
+        where w.warehouseTypeValue = '旧件库'
         ) e) a
         <where>
             ${ew.sqlSegment}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@@ -984,6 +984,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
                     .or().like("i.manufacturerName", query.getName())
                     .or().like("i.supplierName", query.getName())
                     .or().like("i.goodsSkuCode", query.getName())
+                    .or().like("z.zoneName", query.getName())
             );
         }
         qw.notLike("i.goodsID","-O");
@@ -1109,7 +1110,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         if (StringUtils.isNotBlank(query.getName())) {
             qw.and(wrapper -> wrapper.like("a.title", query.getName())
                     .or().like("a.goodsSpuName", query.getName())
-                    .or().like("a.manufacturerName", query.getName())
+                    .or().like("a.factory", query.getName())
                     .or().like("a.goodsSkuCode", query.getName())
                     .or().like("a.repairId", query.getName())
             );

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java

@@ -650,7 +650,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                     WmsHouseInfoVo houseInfoVo = wmsHouseInfoVoResultBean.getData();
                     if (null != houseInfoVo) {
                         vo.setHouseCode(houseCode);
-                        vo.setHouseName(houseInfoVo.getWarehouseName() + "-" + houseInfoVo.getWareAreaName());
+                        vo.setHouseName(houseInfoVo.getWarehouseName() + "-" + houseInfoVo.getWarehouseZoneName() + "-" + houseInfoVo.getWareAreaName());
                         vo.setHouseAddress(houseInfoVo.getWarehouseRackCode());
                         vo.setType(1);
                     }