From 394ab9de1cf5307c6c4ebd4bf8f4f5fc107ad4a5 Mon Sep 17 00:00:00 2001 From: ligaode Date: Mon, 24 Feb 2025 18:30:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/oa/api/AdFeteApplyRest.java | 104 ++++++ .../yxt/anrui/oa/api/AdFeteDetailRest.java | 36 ++ .../anrui/oa/biz/adfeteapply/AdFeteApply.java | 44 +++ .../biz/adfeteapply/AdFeteApplyDetailsVo.java | 51 +++ .../oa/biz/adfeteapply/AdFeteApplyDto.java | 52 +++ .../oa/biz/adfeteapply/AdFeteApplyMapper.java | 35 ++ .../oa/biz/adfeteapply/AdFeteApplyMapper.xml | 33 ++ .../biz/adfeteapply/AdFeteApplyService.java | 311 ++++++++++++++++++ .../oa/biz/adfeteapply/AdFeteApplyVo.java | 60 ++++ .../oa/biz/adfetedetail/AdFeteDetail.java | 68 ++++ .../oa/biz/adfetedetail/AdFeteDetailDto.java | 63 ++++ .../biz/adfetedetail/AdFeteDetailMapper.java | 40 +++ .../biz/adfetedetail/AdFeteDetailMapper.xml | 23 ++ .../biz/adfetedetail/AdFeteDetailService.java | 60 ++++ .../oa/biz/adfetedetail/AdFeteDetailVo.java | 66 ++++ .../biz/adfetedetail/AdFeteListDetailVo.java | 59 ++++ .../AdFrockallotApplyDetailsVo.java | 4 +- 17 files changed, 1107 insertions(+), 2 deletions(-) create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFeteApplyRest.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFeteDetailRest.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApply.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyDetailsVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyDto.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.xml create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyService.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetail.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailDto.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailMapper.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailMapper.xml create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailService.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteListDetailVo.java diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFeteApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFeteApplyRest.java new file mode 100644 index 0000000000..bd6f5405c2 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFeteApplyRest.java @@ -0,0 +1,104 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.api; + +import com.yxt.anrui.oa.biz.adfeteapply.*; +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/adfeteapply") +public class AdFeteApplyRest { + + @Autowired + private AdFeteApplyService adFeteApplyService; + + @ApiOperation("初始化（新增或修改）") + @GetMapping({"/getInit", "/getInit/{sid}"}) + public ResultBean getInit( + @PathVariable(value = "sid", required = false) String sid, + @RequestParam(value = "userSid", required = false) String userSid, + @RequestParam(value = "orgPath", required = false) String orgPath) { + ResultBean rb = ResultBean.fireFail(); + if (sid == null || sid.isEmpty()) { + // 执行新增初始化 + if (userSid == null || orgPath == null) { + return rb.setMsg("userSid和orgPath不能为空"); + } + return adFeteApplyService.getSaveInit(userSid, orgPath); + } else { + // 执行修改初始化 + return adFeteApplyService.getUpdateInit(sid); + } + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody AdFeteApplyDto dto) { + return adFeteApplyService.saveOrUpdateDto(dto); + } + + @ApiOperation("详情") + @GetMapping("/details/{sid}") + ResultBean details(@PathVariable("sid") String sid + , @RequestParam(value = "application", required = false) String application) { + return adFeteApplyService.details(sid,application); + } + + @ApiOperation("提交审批流程") + @PostMapping("/submit") + public ResultBean submit(@RequestBody AdFeteApplyDto dto) { + return adFeteApplyService.submit(dto); + } + + @ApiOperation(value = "办理（同意）") + @PutMapping("/complete") + public ResultBean complete(@Valid @RequestBody CompleteDto dto) { + return adFeteApplyService.complete(dto); + } + + @ApiOperation(value = "驳回任务") + @PutMapping(value = "/reject") + public ResultBean reject(@Valid @RequestBody TaskDto dto) { + return adFeteApplyService.reject(dto); + } + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap NodeQuery query) { + return adFeteApplyService.getFlowOperateTitle(query); + } +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFeteDetailRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFeteDetailRest.java new file mode 100644 index 0000000000..edf8cf7fc1 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFeteDetailRest.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/adfetedetail") +public class AdFeteDetailRest { + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApply.java new file mode 100644 index 0000000000..d5513f7a5b --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApply.java @@ -0,0 +1,44 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfeteapply; + +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_fete_apply") +public class AdFeteApply extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("基础表单sid") + private String formSid; // 基础表单sid + @ApiModelProperty("关联审批sid列表,英文逗号分隔") + private String linkFormSids; // 关联审批sid列表,英文逗号分隔 +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyDetailsVo.java new file mode 100644 index 0000000000..9bb91cd42c --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyDetailsVo.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfeteapply; + +import com.yxt.anrui.oa.biz.adfetedetail.AdFeteListDetailVo; +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 AdFeteApplyDetailsVo implements Vo { + + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("附件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyDto.java new file mode 100644 index 0000000000..4f455b4888 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyDto.java @@ -0,0 +1,52 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfeteapply; + +import com.yxt.anrui.oa.biz.adfetedetail.AdFeteDetailDto; +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 AdFeteApplyDto extends OaFormDto { + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("基础表单sid") + private String formSid; + @ApiModelProperty("关联审批单") + private String linkFormSids; + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("文件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.java new file mode 100644 index 0000000000..8c3442c28d --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.java @@ -0,0 +1,35 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfeteapply; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AdFeteApplyMapper extends BaseMapper { + + AdFeteApplyDetailsVo details(String sid); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.xml new file mode 100644 index 0000000000..a3e86ea38f --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyService.java new file mode 100644 index 0000000000..54eb7a8aa3 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyService.java @@ -0,0 +1,311 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfeteapply; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.adfetedetail.AdFeteDetailDto; +import com.yxt.anrui.oa.biz.adfetedetail.AdFeteDetailService; +import com.yxt.anrui.oa.biz.adfetedetail.AdFeteDetailVo; +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 AdFeteApplyService extends MybatisBaseService { + + @Autowired + private OaAppendixService oaAppendixService; + @Autowired + private OaFormService oaFormService; + @Autowired + private AdFeteDetailService adFeteDetailService; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + + public ResultBean getSaveInit(String userSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); + AdFeteApplyVo adFeteApplyVo = new AdFeteApplyVo(); + adFeteApplyVo.setCreateBySid(userSid); + adFeteApplyVo.setOrgSidPath(orgPath); + return rb.success().setData(adFeteApplyVo); + } + + public ResultBean getUpdateInit(String sid) { + ResultBean rb = ResultBean.fireFail(); + AdFeteApplyVo adFeteApplyVo = new AdFeteApplyVo(); + AdFeteApply adFeteApply = fetchBySid(sid); + if (adFeteApplyVo == null) { + return rb.setMsg("该申请不存在"); + } +// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage()); + OaForm oaForm = oaFormService.fetchBySid(sid); + adFeteApplyVo.setTaskId(oaForm.getTaskId()); + adFeteApplyVo.setProcInsId(oaForm.getProcInstId()); + //根据部门sid获取orgPath并赋值 + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData(); + String orgSidPath = organizationVo.getOrgSidPath(); + adFeteApplyVo.setOrgSidPath(orgSidPath); + adFeteApplyVo.setCreateBySid(oaForm.getCreateBySid()); + BeanUtil.copyProperties(adFeteApply, adFeteApplyVo); + List list = adFeteDetailService.getUpdateInit(sid); + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + list.stream().forEach(details -> { + FormCommon deptObj = FormCommon.of(details.getDeptSid(), details.getDeptName()); + 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 files = oaAppendixService.selectByLinkSid(sid, "图片"); + adFeteApplyVo.setFiles(files); + List appes = oaAppendixService.selectByLinkSid(sid, "文件"); + adFeteApplyVo.setAppes(appes); + adFeteApplyVo.setList(list); + adFeteApplyVo.setSid(sid); + return rb.success().setData(adFeteApplyVo); + } + + public ResultBean saveOrUpdateDto(AdFeteApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + List files = dto.getFiles(); + List appes = dto.getAppes(); + List list = dto.getList(); + if (StringUtils.isBlank(sid)) { + // 新建操作 + AdFeteApply entity = new AdFeteApply(); + BeanUtil.copyProperties(dto, entity, "sid"); + + dto.setBillNo("SWYQSQSQ"); + dto.setSid(entity.getSid()); + ResultBean resultBean = oaFormService.saveOaForm(dto); + + if (!resultBean.getSuccess()) { + return rb; + } + + entity.setFormSid(resultBean.getData()); + baseMapper.insert(entity); + sid = entity.getSid(); + } else { + // 更新操作 + AdFeteApply entity = fetchBySid(sid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + adFeteDetailService.saveDetails(list, sid); + // 处理附件 + saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片"); + saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件"); + return rb.success().setData(sid); + } + + // 保存文件 + private void saveFiles(String sid, List files, String attachType, String fileType) { + files.removeAll(Collections.singleton(null)); + oaAppendixService.saveFile(sid, files, attachType, fileType); + } + + public ResultBean details(String sid, String application) { + ResultBean rb = ResultBean.fireFail(); + AdFeteApplyDetailsVo adFeteApplyDetailsVo = baseMapper.details(sid); + if (adFeteApplyDetailsVo == null) { + return rb.setMsg("该申请不存在"); + } + List files = oaAppendixService.selectByLinkSid(sid, "图片"); + List appes = oaAppendixService.selectByLinkSid(sid, "文件"); + adFeteApplyDetailsVo.setFiles(files); + adFeteApplyDetailsVo.setAppes(appes); + //基础字段赋值 + BeanUtil.copyProperties(oaFormService.getDetails(sid), adFeteApplyDetailsVo); + return rb.success().setData(adFeteApplyDetailsVo); + } + + /** + * 提交 + * + * @param dto + * @return + */ + public ResultBean submit(AdFeteApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + ResultBean 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 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 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 formVariables = dto.getFormVariables(); + formVariables = getMap(formVariables, dto.getBusinessSid()); + dto.setFormVariables(formVariables); + return oaFormService.reject(dto); + } + + public ResultBean getFlowOperateTitle(NodeQuery query) { + // 默认失败返回 + ResultBean rb = ResultBean.fireFail(); + + // 获取next值和formVariables + int next = query.getNext(); + + // 获取并更新formVariables + Map 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 getMap(Map formVariables, String sid) { + Map 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); + AdFeteApply adFeteApply = 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> 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; + } +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyVo.java new file mode 100644 index 0000000000..7b57b8e496 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyVo.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfeteapply; + +import com.yxt.anrui.oa.biz.adfetedetail.AdFeteDetailVo; +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 AdFeteApplyVo implements Vo { + + private String sid; + /* private String userSid; + private String orgPath;*/ + private String orgSidPath; + private String createBySid; + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("附件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); + + private String taskId; + @ApiModelProperty("流程实例id") + private String procInsId; + +// private String testPage; +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetail.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetail.java new file mode 100644 index 0000000000..9e99383c4d --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetail.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfetedetail; + +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_fete_detail") +public class AdFeteDetail 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 banquetDate; // 宴请时间 + @ApiModelProperty("宴请人数") + private String banquetNum; // 宴请人数 + @ApiModelProperty("宴请对象") + private String banquetObject; // 宴请对象 + @ApiModelProperty("计划宴请标准") + private String banquetStandard; // 计划宴请标准 + @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; // 费用明细 + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailDto.java new file mode 100644 index 0000000000..e77b9b900e --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailDto.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfetedetail; + +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 AdFeteDetailDto implements Dto { + + @ApiModelProperty("部门") + private FormCommon deptObj; + private String deptSid; + private String deptName; + @ApiModelProperty("宴请时间") + private String banquetDate; + @ApiModelProperty("宴请人数") + private String banquetNum; + @ApiModelProperty("宴请对象") + private String banquetObject; + @ApiModelProperty("计划宴请标准") + private String banquetStandard; + @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; +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailMapper.java new file mode 100644 index 0000000000..dada7f66e0 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailMapper.java @@ -0,0 +1,40 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfetedetail; + +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 AdFeteDetailMapper extends BaseMapper { + + List getUpdateInit(String sid); + + @Select("select * from ad_fete_detail where mainSid = #{mainSid}") + List selectByMainSid(String mainSid); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailMapper.xml new file mode 100644 index 0000000000..f32bac387a --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailMapper.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailService.java new file mode 100644 index 0000000000..58f20e1dd2 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailService.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfetedetail; + +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 AdFeteDetailService extends MybatisBaseService { + + public void saveDetails(List list, String sid) { + //根据sid查询明细并删除 + List 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 -> { + AdFeteDetail adFeteDetail = new AdFeteDetail(); + BeanUtil.copyProperties(details, adFeteDetail); + adFeteDetail.setMainSid(sid); + baseMapper.insert(adFeteDetail); + }); + } + } + + public List getUpdateInit(String sid) { + return baseMapper.getUpdateInit(sid); + } +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailVo.java new file mode 100644 index 0000000000..2c133ab07d --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailVo.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfetedetail; + +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 AdFeteDetailVo implements Vo { + + private String sid; + + @ApiModelProperty("部门") + private FormCommon deptObj; + private String deptSid; + private String deptName; + @ApiModelProperty("宴请时间") + private String banquetDate; + @ApiModelProperty("宴请人数") + private String banquetNum; + @ApiModelProperty("宴请对象") + private String banquetObject; + @ApiModelProperty("计划宴请标准") + private String banquetStandard; + @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; + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteListDetailVo.java new file mode 100644 index 0000000000..a738f1d8df --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteListDetailVo.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfetedetail; + +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 AdFeteListDetailVo implements Vo { + + private String sid; + + @ApiModelProperty("部门") + private String deptName; + @ApiModelProperty("宴请时间") + private String banquetDate; + @ApiModelProperty("宴请人数") + private String banquetNum; + @ApiModelProperty("宴请对象") + private String banquetObject; + @ApiModelProperty("计划宴请标准") + private String banquetStandard; + @ApiModelProperty("是否使用食堂") + private String isUseCanteenValue; + @ApiModelProperty("是否领酒水") + private String isGetADrinkValue; + @ApiModelProperty("预计费用") + private BigDecimal expectCost; + @ApiModelProperty("费用明细") + private String costRemarks; + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDetailsVo.java index 42b111a5fc..e3ce6c1992 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDetailsVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDetailsVo.java @@ -25,7 +25,7 @@ *********************************************************/ package com.yxt.anrui.oa.biz.adfrockallotapply; -import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostListDetailVo; +import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotListDetailVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -45,5 +45,5 @@ public class AdFrockallotApplyDetailsVo implements Vo { @ApiModelProperty("附件") private List appes = new ArrayList<>(); - private List list = new ArrayList<>(); + private List list = new ArrayList<>(); } \ No newline at end of file