diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.java index 7407dcf7cb..84cbede976 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.java @@ -36,4 +36,6 @@ public interface OaAppendixMapper extends BaseMapper { @Select("select * from oa_appendix where linkSid = #{linkSid}") List fetchByLinkSid(String linkSid); + + int deleteByLinkSid(String sid); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.xml index 1c2b097be2..d46f360e2b 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.xml @@ -1,6 +1,12 @@ - - + + + + + delete + from oa_appendix + where linkSid = #{sid} + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java index 4ab4677d0f..ecc44bc7fe 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java @@ -36,4 +36,8 @@ public class OaAppendixService extends MybatisBaseService fetchByLinkSid(String linkSid) { return baseMapper.fetchByLinkSid(linkSid); } + + public int deleteByLinkSid(String sid) { + return baseMapper.deleteByLinkSid(sid); + } } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java index b155a0f9da..d28fd76849 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java @@ -44,10 +44,6 @@ public class OaForm extends BaseEntity { private String createOrgSid; @ApiModelProperty("创建组织") private String createOrgName; - @ApiModelProperty("图片，冗余字段") - private String imgs; - @ApiModelProperty("附件，冗余字段") - private String appendixs; @ApiModelProperty("关联审批单") private String linkFormSids; diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java index cd04d6381c..cb9a00d565 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java @@ -18,6 +18,7 @@ public class OaFormDto { private String createBySid; @ApiModelProperty("创建人") private String createByName; + private String billNo; @ApiModelProperty("公司sid") private String useOrgSid; @ApiModelProperty("公司名称") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.java index 2f6f2bd612..13c86ec2a6 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.java @@ -32,8 +32,6 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import com.yxt.anrui.oa.api.oahiredetails.OaHireDetails; -import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsVo; import java.util.List; @@ -53,13 +51,13 @@ import java.util.List; @Mapper public interface OaHireDetailsMapper extends BaseMapper { - //@Update("update oa_hire_details set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from oa_hire_details") - List selectListVo(); + //@Update("update oa_hire_details set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from oa_hire_details") + List selectListVo(); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.xml index cfad334c0e..3e9fe844a9 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.xml @@ -3,11 +3,11 @@ - SELECT * FROM oa_hire_details ${ew.sqlSegment} - SELECT * FROM oa_hire_details ${ew.sqlSegment} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsService.java index 5eabaa3835..171c298ea2 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsService.java @@ -34,12 +34,6 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.oa.api.oahiredetails.OaHireDetails; -import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsQuery; -import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsVo; -import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsDetailsVo; -import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsDto; -import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsFeign; import org.springframework.stereotype.Service; @@ -60,51 +54,51 @@ import java.util.List; */ @Service public class OaHireDetailsService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(OaHireDetailsQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - OaHireDetailsQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(OaHireDetailsDto dto){ + private QueryWrapper createQueryWrapper(OaHireDetailsQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + OaHireDetailsQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(OaHireDetailsDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(OaHireDetailsDto dto){ - OaHireDetails entity = new OaHireDetails(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(OaHireDetailsDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(OaHireDetailsDto dto) { + OaHireDetails entity = new OaHireDetails(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(OaHireDetailsDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - OaHireDetails entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public OaHireDetailsDetailsVo fetchDetailsVoBySid(String sid){ - OaHireDetails entity = fetchBySid(sid); - OaHireDetailsDetailsVo vo = new OaHireDetailsDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + OaHireDetails entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public OaHireDetailsDetailsVo fetchDetailsVoBySid(String sid) { + OaHireDetails entity = fetchBySid(sid); + OaHireDetailsDetailsVo vo = new OaHireDetailsDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java index 6be7cf024c..38268dc706 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.oa.biz.oamendapply; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.anrui.oa.biz.oaform.OaForm; import com.yxt.common.core.domain.BaseEntity; @@ -35,6 +36,7 @@ import java.util.Date; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.data.annotation.Transient; /** * Project: yxt-oa(补卡申请)
@@ -52,12 +54,15 @@ import lombok.Data; @Data @ApiModel(value = "补卡申请", description = "补卡申请") @TableName("oa_mend_apply") -public class OaMendApply extends OaForm { +public class OaMendApply extends BaseEntity { private static final long serialVersionUID = 1L; private String formSid; @ApiModelProperty("补卡时间") private String time; + @TableField(exist = false) + private OaForm oaForm = new OaForm(); + /* @ApiModelProperty("单据编号") private String billNo; diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java index 5f16c7e973..f37536be18 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java @@ -55,39 +55,41 @@ import lombok.Data; @ApiModel(value = "补卡申请 数据传输对象", description = "补卡申请 数据传输对象") public class OaMendApplyDto implements Dto { - private String sid; // sid - private String userSid; + private static final long serialVersionUID = -4536006302677264298L; + private String sid; + private String createBySid; private String orgPath; - @ApiModelProperty("补卡原因") private String remarks; - @ApiModelProperty("单据编号") + @ApiModelProperty("补卡时间") + private String time; + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + + /* @ApiModelProperty("单据编号") private String billNo; // 单据编号 - @ApiModelProperty("申请人") + @ApiModelProperty("申请人") private String createByName; - @ApiModelProperty("申请部门sid") + @ApiModelProperty("申请部门sid") private String deptSid; - @ApiModelProperty("申请部门名称") + @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("补卡时间") - private String time; - @ApiModelProperty("分公司sid") + + @ApiModelProperty("分公司sid") private String useOrgSid; - @ApiModelProperty("分公司名称") + @ApiModelProperty("分公司名称") private String useOrgName; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("办结日期") private Date finishTime; - @ApiModelProperty("实例id") + @ApiModelProperty("实例id") private String procInstId; - @ApiModelProperty("流程定义id") + @ApiModelProperty("流程定义id") private String procDefId; - @ApiModelProperty("任务id") + @ApiModelProperty("任务id") private String taskId; - @ApiModelProperty("环节id") + @ApiModelProperty("环节id") private String nodeId; - @ApiModelProperty("流程状态") - private String nodeState; - @ApiModelProperty("图片") - private List files = new ArrayList<>(); + @ApiModelProperty("流程状态") + private String nodeState;*/ } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java index 5e2d8d7bec..594c0ddaa8 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java @@ -66,6 +66,7 @@ import com.yxt.common.core.vo.PagerVo; import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -106,7 +107,7 @@ public class OaMendApplyService extends MybatisBaseService files = dto.getFiles(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); @@ -156,7 +157,7 @@ public class OaMendApplyService extends MybatisBaseService saveOrUpdateDto(OaMendApplyDto dto) { @@ -167,24 +168,46 @@ public class OaMendApplyService extends MybatisBaseService split = Arrays.asList(dto.getOrgPath().split("/")); + + if (split.size() > 1) { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptName = sysOrganization1.getName(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptName = sysOrganization.getName(); + deptSid = sysOrganization.getSid(); + } // 生成单据编号 - String billNo = generateBillNo(dto); - dto.setBillNo(billNo); + String billNo = "QJSQ" + useOrgSid + DateUtil.format(DateUtil.date(), "yyyyMM"); + String i = baseMapper.selectNum(billNo); + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } - // 复制 DTO 数据到实体 - BeanUtil.copyProperties(dto, entity, "sid"); - entity.setCreateBySid(dto.getUserSid()); + OaForm oaForm = entity.getOaForm(); + BeanUtil.copyProperties(dto, oaForm, "sid", "remarks"); + oaForm.setUseOrgSid(useOrgSid); + oaForm.setUseOrgName(organizationVo.getName()); + oaForm.setDeptSid(deptSid); + oaForm.setDeptName(deptName); + oaForm.setBillNo(billNo); // 获取用户信息 - SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); - entity.setCreateByName(sysUserVo.getName()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getCreateBySid()).getData(); + oaForm.setCreateByName(sysUserVo.getName()); - // 创建 OA 表单 - OaFormDto oaFormDto = createOaForm(dto, sysUserVo); + OaFormDto oaFormDto = new OaFormDto(); + BeanUtil.copyProperties(oaForm, oaFormDto, "sid"); ResultBean resultBean = oaFormService.saveOrUpdateForm(oaFormDto); if (!resultBean.getSuccess()) { @@ -196,6 +219,7 @@ public class OaMendApplyService extends MybatisBaseService split = Arrays.asList(dto.getOrgPath().split("/")); - - if (split.size() > 1) { - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); - SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); - deptName = sysOrganization1.getName(); - deptSid = sysOrganization1.getSid(); - } else { - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); - deptName = sysOrganization.getName(); - deptSid = sysOrganization.getSid(); - } - - dto.setDeptSid(deptSid); - dto.setDeptName(deptName); - } - - // 生成单据编号 - private String generateBillNo(OaMendApplyDto dto) { - String billNo = "QJSQ" + dto.getUseOrgSid() + DateUtil.format(DateUtil.date(), "yyyyMM"); - String i = baseMapper.selectNum(billNo); - if (StringUtils.isNotBlank(i)) { - return Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); - } - return Rule.getBillNo(billNo, 0); - } - - // 创建 OA 表单 - private OaFormDto createOaForm(OaMendApplyDto dto, SysUserVo sysUserVo) { - OaFormDto oaFormDto = new OaFormDto(); - BeanUtil.copyProperties(dto, oaFormDto, "sid"); - oaFormDto.setNodeState("待提交"); - oaFormDto.setCreateBySid(dto.getUserSid()); - oaFormDto.setCreateByName(sysUserVo.getName()); - return oaFormDto; - } - // 保存文件 private void saveFiles(String sid, List files) { + if (files == null || files.isEmpty()) { + return; // 如果没有文件，不做任何操作 + } + oaAppendixService.deleteByLinkSid(sid); + for (String file : files) { String filePath = file.replace(fileUploadComponent.getUrlPrefix(), ""); OaAppendix oaAppendix = new OaAppendix(); @@ -264,28 +247,6 @@ public class OaMendApplyService extends MybatisBaseService variables = new HashMap<>(); //用户的部门全路径sid - SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(oaMendApply.getDeptSid()).getData(); + SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(oaMendApply.getOaForm().getDeptSid()).getData(); bv.setOrgSidPath(deptVo.getOrgSidPath()); //业务sid bv.setBusinessSid(businessSid); @@ -333,7 +296,10 @@ public class OaMendApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); OaMendApply mendApply = oaMendApply; + oaForm = oaFormService.fetchBySid(mendApply.getFormSid()); + mendApply.setOaForm(oaForm); Future future1 = pool.submit(() -> { //极光推送 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); @@ -363,7 +333,7 @@ public class OaMendApplyService extends MybatisBaseService variables = new HashMap<>(); //网关 @@ -425,10 +399,10 @@ public class OaMendApplyService extends MybatisBaseService resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -451,18 +425,20 @@ public class OaMendApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); OaMendApply mendApply = oaMendApply; + oaForm = oaFormService.fetchBySid(mendApply.getFormSid()); + mendApply.setOaForm(oaForm); Future future1 = pool.submit(() -> { //极光推送 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); MessageFlowVo messageFlowVo = new MessageFlowVo(); BeanUtil.copyProperties(ufVo, messageFlowVo); - ufVo.setProcDefId(mendApply.getProcDefId()); - ufVo.setProcInsId(mendApply.getProcInstId()); + ufVo.setProcDefId(mendApply.getOaForm().getProcDefId()); + ufVo.setProcInsId(mendApply.getOaForm().getProcInstId()); messageFlowableQuery.setUfVo(messageFlowVo); messageFlowableQuery.setAppMap(appMap); messageFlowableQuery.setBusinessSid(businessSid); messageFlowableQuery.setModuleName("补卡申请"); - messageFlowableQuery.setMsgContent(mendApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgContent(mendApply.getOaForm().getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); messageFlowableQuery.setMsgTitle("补卡申请"); messageFeign.pushMessage(messageFlowableQuery); }); @@ -485,9 +461,11 @@ public class OaMendApplyService extends MybatisBaseService variables = new HashMap<>(); //查询业务信息 OaMendApply oaMendApply = fetchBySid(query.getBusinessSid()); + OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid()); + oaMendApply.setOaForm(oaForm); //网关 - bv.setModelId(oaMendApply.getProcDefId()); + bv.setModelId(oaMendApply.getOaForm().getProcDefId()); bv.setFormVariables(variables); //======================================= ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); @@ -504,9 +482,11 @@ public class OaMendApplyService extends MybatisBaseService variables = new HashMap<>(); //查询业务信息 OaMendApply oaMendApply = fetchBySid(query.getBusinessSid()); + OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid()); + oaMendApply.setOaForm(oaForm); //网关 - bv.setModelId(oaMendApply.getProcDefId()); + bv.setModelId(oaMendApply.getOaForm().getProcDefId()); bv.setFormVariables(variables); //======================================= ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); @@ -522,7 +502,9 @@ public class OaMendApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); OaMendApply mendApply = oaMendApply; + oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid()); + mendApply.setOaForm(oaForm); Future future1 = pool.submit(() -> { //极光推送 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); MessageFlowVo messageFlowVo = new MessageFlowVo(); BeanUtil.copyProperties(ufVo, messageFlowVo); - String procId = mendApply.getProcInstId(); + String procId = mendApply.getOaForm().getProcInstId(); ufVo.setProcInsId(procId); - ufVo.setProcDefId(mendApply.getProcDefId()); + ufVo.setProcDefId(mendApply.getOaForm().getProcDefId()); messageFlowableQuery.setUfVo(messageFlowVo); messageFlowableQuery.setAppMap(appMap); messageFlowableQuery.setBusinessSid(businessSid); @@ -579,7 +563,7 @@ public class OaMendApplyService extends MybatisBaseService