|
|
|
@ -26,8 +26,6 @@ |
|
|
|
package com.yxt.anrui.oa.biz.oamendapply; |
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
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; |
|
|
|
@ -36,18 +34,12 @@ import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; |
|
|
|
import com.yxt.anrui.oa.biz.oaform.OaForm; |
|
|
|
import com.yxt.anrui.oa.biz.oaform.OaFormDto; |
|
|
|
import com.yxt.anrui.oa.biz.oaform.OaFormService; |
|
|
|
import com.yxt.anrui.oa.biz.oamendapply.flowable.*; |
|
|
|
import com.yxt.anrui.oa.feign.base.Rule; |
|
|
|
import com.yxt.anrui.oa.biz.oaform.flowable.OaFormFlowDto; |
|
|
|
import com.yxt.anrui.oa.feign.file.OaFileEnum; |
|
|
|
import com.yxt.anrui.oa.feign.flowable.flow.BusinessVariables; |
|
|
|
import com.yxt.anrui.oa.feign.flowable.flow.FlowableFeign; |
|
|
|
import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum; |
|
|
|
import com.yxt.anrui.oa.feign.flowable.flow.UpdateFlowFieldVo; |
|
|
|
import com.yxt.anrui.oa.feign.flowable.flow2.FlowDelegateQuery; |
|
|
|
import com.yxt.anrui.oa.feign.flowable.flow2.FlowFeign; |
|
|
|
import com.yxt.anrui.oa.feign.flowable.flowtask.FlowTaskFeign; |
|
|
|
import com.yxt.anrui.oa.feign.flowable.flowtask.FlowTaskVo; |
|
|
|
import com.yxt.anrui.oa.feign.flowable.flowtask.LatestTaskVo; |
|
|
|
import com.yxt.anrui.oa.feign.message.MessageFeign; |
|
|
|
import com.yxt.anrui.oa.feign.message.MessageFlowVo; |
|
|
|
import com.yxt.anrui.oa.feign.message.MessageFlowableQuery; |
|
|
|
@ -55,7 +47,6 @@ import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.anrui.oa.feign.portal.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.oa.feign.sysuser.SysUserFeign; |
|
|
|
import com.yxt.anrui.oa.feign.sysuser.SysUserVo; |
|
|
|
import com.yxt.common.base.config.component.FileUploadComponent; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import com.yxt.common.base.service.MybatisBaseService; |
|
|
|
@ -66,13 +57,11 @@ 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; |
|
|
|
|
|
|
|
import java.util.*; |
|
|
|
import java.util.concurrent.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
@Service |
|
|
|
public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, OaMendApply> { |
|
|
|
@ -80,18 +69,10 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa |
|
|
|
@Autowired |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
@Autowired |
|
|
|
private SysStaffOrgFeign sysStaffOrgFeign; |
|
|
|
@Autowired |
|
|
|
private FlowableFeign flowableFeign; |
|
|
|
@Autowired |
|
|
|
private FlowTaskFeign flowTaskFeign; |
|
|
|
@Autowired |
|
|
|
private FlowFeign flowFeign; |
|
|
|
@Autowired |
|
|
|
private MessageFeign messageFeign; |
|
|
|
@Autowired |
|
|
|
private SysUserFeign sysUserFeign; |
|
|
|
@Autowired |
|
|
|
private FileUploadComponent fileUploadComponent; |
|
|
|
@Autowired |
|
|
|
private OaAppendixService oaAppendixService; |
|
|
|
@ -174,48 +155,11 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa |
|
|
|
// 新建操作
|
|
|
|
OaMendApply entity = new OaMendApply(); |
|
|
|
BeanUtil.copyProperties(dto, entity, "sid"); |
|
|
|
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); |
|
|
|
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); |
|
|
|
String deptName = ""; |
|
|
|
String deptSid = ""; |
|
|
|
List<String> 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 = "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); |
|
|
|
} |
|
|
|
|
|
|
|
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); |
|
|
|
oaForm.setCreateOrgSid(useOrgSid); |
|
|
|
oaForm.setCreateOrgName(organizationVo.getName()); |
|
|
|
|
|
|
|
// 获取用户信息
|
|
|
|
SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getCreateBySid()).getData(); |
|
|
|
oaForm.setCreateByName(sysUserVo.getName()); |
|
|
|
|
|
|
|
OaFormDto oaFormDto = new OaFormDto(); |
|
|
|
BeanUtil.copyProperties(oaForm, oaFormDto, "sid"); |
|
|
|
ResultBean<String> resultBean = oaFormService.saveOrUpdateForm(oaFormDto); |
|
|
|
BeanUtil.copyProperties(dto, oaFormDto, "sid"); |
|
|
|
oaFormDto.setBillNo("BKSQ"); |
|
|
|
ResultBean<String> resultBean = oaFormService.saveOaForm(oaFormDto); |
|
|
|
|
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb; |
|
|
|
@ -289,12 +233,14 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa |
|
|
|
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(oaMendApply.getOaForm().getDeptSid()).getData(); |
|
|
|
bv.setOrgSidPath(deptVo.getOrgSidPath()); |
|
|
|
//业务sid
|
|
|
|
bv.setBusinessSid(businessSid); |
|
|
|
// bv.setBusinessSid(businessSid);
|
|
|
|
bv.setBusinessSid(oaMendApply.getFormSid()); |
|
|
|
//用户sid
|
|
|
|
bv.setUserSid(oaMendApply.getCreateBySid()); |
|
|
|
//若app移动端有此功能，则传递appMap参数
|
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
// appMap.put("sid", businessSid);
|
|
|
|
appMap.put("sid", oaMendApply.getFormSid()); |
|
|
|
//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
|
|
|
|
variables.put("app", appMap); |
|
|
|
//网关
|
|
|
|
@ -310,15 +256,9 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa |
|
|
|
if (r == 1) { |
|
|
|
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv); |
|
|
|
UpdateFlowFieldVo ufVo = voResultBean.getData(); |
|
|
|
// updateFlowFiled(BeanUtil.beanToMap(ufVo));
|
|
|
|
//更新oaform中的流程数据
|
|
|
|
ufVo.setSid(oaMendApply.getFormSid()); |
|
|
|
oaFormService.updateFlow(BeanUtil.beanToMap(ufVo)); |
|
|
|
//极光推送
|
|
|
|
oaMendApply = fetchBySid(businessSid); |
|
|
|
oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid()); |
|
|
|
oaMendApply.setOaForm(oaForm); |
|
|
|
|
|
|
|
OaFormFlowDto oaFormFlowDto = new OaFormFlowDto(); |
|
|
|
BeanUtil.copyProperties(ufVo, oaFormFlowDto); |
|
|
|
oaFormService.updateFlow(oaFormFlowDto); |
|
|
|
//==================================添加线程
|
|
|
|
try { |
|
|
|
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() |
|
|
|
@ -326,9 +266,8 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa |
|
|
|
ExecutorService pool = new ThreadPoolExecutor(2, 100, |
|
|
|
0L, TimeUnit.MILLISECONDS, |
|
|
|
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); |
|
|
|
OaMendApply mendApply = oaMendApply; |
|
|
|
oaForm = oaFormService.fetchBySid(mendApply.getFormSid()); |
|
|
|
mendApply.setOaForm(oaForm); |
|
|
|
oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid()); |
|
|
|
OaForm finalOaForm = oaForm; |
|
|
|
Future future1 = pool.submit(() -> { |
|
|
|
//极光推送
|
|
|
|
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); |
|
|
|
@ -337,9 +276,9 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa |
|
|
|
messageFlowableQuery.setUfVo(messageFlowVo); |
|
|
|
messageFlowableQuery.setAppMap(appMap); |
|
|
|
messageFlowableQuery.setBusinessSid(businessSid); |
|
|
|
messageFlowableQuery.setModuleName("补卡申请"); |
|
|
|
messageFlowableQuery.setMsgContent(mendApply.getOaForm().getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); |
|
|
|
messageFlowableQuery.setMsgTitle("补卡申请"); |
|
|
|
messageFlowableQuery.setModuleName(finalOaForm.getFormType()); |
|
|
|
messageFlowableQuery.setMsgContent(finalOaForm.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); |
|
|
|
messageFlowableQuery.setMsgTitle(finalOaForm.getFormType()); |
|
|
|
messageFeign.pushMessage(messageFlowableQuery); |
|
|
|
}); |
|
|
|
} catch (Exception e) { |
|
|
|
@ -357,7 +296,7 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa |
|
|
|
bv.setTaskDefKey(oaMendApply.getOaForm().getNodeId()); |
|
|
|
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); |
|
|
|
bv.setInstanceId(dto.getInstanceId()); |
|
|
|
return complete(bv); |
|
|
|
return oaFormService.complete(bv); |
|
|
|
} |
|
|
|
return rb; |
|
|
|
} |
|
|
|
@ -386,296 +325,6 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa |
|
|
|
return r; |
|
|
|
} |
|
|
|
|
|
|
|
private int updateFlowFiled(Map<String, Object> map) { |
|
|
|
return baseMapper.updateFlowFiled(map); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean complete(BusinessVariables bv) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String businessSid = bv.getBusinessSid(); |
|
|
|
OaMendApply oaMendApply = fetchBySid(businessSid); |
|
|
|
OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid()); |
|
|
|
oaMendApply.setOaForm(oaForm); |
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
//网关
|
|
|
|
|
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
variables.put("app", appMap); |
|
|
|
//=======================================
|
|
|
|
bv.setFormVariables(variables); |
|
|
|
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(oaMendApply.getOaForm().getDeptSid()).getData(); |
|
|
|
bv.setOrgSidPath(deptVo.getOrgSidPath()); |
|
|
|
bv.setModelId(oaMendApply.getOaForm().getProcDefId()); |
|
|
|
if (bv.getTaskId().equals(oaMendApply.getOaForm().getTaskId())) { |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
UpdateFlowFieldVo ufVo = resultBean.getData(); |
|
|
|
// updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
|
|
|
|
//更新oaform中的流程数据
|
|
|
|
ufVo.setSid(oaMendApply.getFormSid()); |
|
|
|
oaFormService.updateFlow(BeanUtil.beanToMap(ufVo)); |
|
|
|
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { |
|
|
|
|
|
|
|
} else { |
|
|
|
//极光推送
|
|
|
|
oaMendApply = fetchBySid(businessSid); |
|
|
|
//==================================添加线程
|
|
|
|
try { |
|
|
|
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() |
|
|
|
.setNameFormat("demo-pool-%d").build(); |
|
|
|
ExecutorService pool = new ThreadPoolExecutor(2, 100, |
|
|
|
0L, TimeUnit.MILLISECONDS, |
|
|
|
new LinkedBlockingQueue<Runnable>(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.getOaForm().getProcDefId()); |
|
|
|
ufVo.setProcInsId(mendApply.getOaForm().getProcInstId()); |
|
|
|
messageFlowableQuery.setUfVo(messageFlowVo); |
|
|
|
messageFlowableQuery.setAppMap(appMap); |
|
|
|
messageFlowableQuery.setBusinessSid(businessSid); |
|
|
|
messageFlowableQuery.setModuleName("补卡申请"); |
|
|
|
messageFlowableQuery.setMsgContent(mendApply.getOaForm().getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); |
|
|
|
messageFlowableQuery.setMsgTitle("补卡申请"); |
|
|
|
messageFeign.pushMessage(messageFlowableQuery); |
|
|
|
}); |
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
//==================================添加线程
|
|
|
|
} |
|
|
|
return rb.success().setData(resultBean.getData()); |
|
|
|
} else { |
|
|
|
return rb.setMsg("操作失败!提交的数据不一致"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<List<OaMendApplyNodeVo>> getPreviousNodesForReject(OaMendApplyNodeQuery query) { |
|
|
|
ResultBean<List<OaMendApplyNodeVo>> rb = ResultBean.fireFail(); |
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
BeanUtil.copyProperties(query, bv); |
|
|
|
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
|
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
//查询业务信息
|
|
|
|
OaMendApply oaMendApply = fetchBySid(query.getBusinessSid()); |
|
|
|
OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid()); |
|
|
|
oaMendApply.setOaForm(oaForm); |
|
|
|
//网关
|
|
|
|
|
|
|
|
bv.setModelId(oaMendApply.getOaForm().getProcDefId()); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
//=======================================
|
|
|
|
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); |
|
|
|
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
|
|
|
|
List<OaMendApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), OaMendApplyNodeVo.class)).collect(Collectors.toList()); |
|
|
|
return rb.success().setData(voList); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<List<OaMendApplyNodeVo>> getNextNodesForSubmit(OaMendApplyNodeQuery query) { |
|
|
|
ResultBean<List<OaMendApplyNodeVo>> rb = ResultBean.fireFail(); |
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
BeanUtil.copyProperties(query, bv); |
|
|
|
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
|
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
//查询业务信息
|
|
|
|
OaMendApply oaMendApply = fetchBySid(query.getBusinessSid()); |
|
|
|
OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid()); |
|
|
|
oaMendApply.setOaForm(oaForm); |
|
|
|
//网关
|
|
|
|
|
|
|
|
bv.setModelId(oaMendApply.getOaForm().getProcDefId()); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
//=======================================
|
|
|
|
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); |
|
|
|
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
|
|
|
|
List<OaMendApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), OaMendApplyNodeVo.class)).collect(Collectors.toList()); |
|
|
|
return rb.success().setData(voList); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean reject(OaMendApplyTaskQuery query) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String businessSid = query.getBusinessSid(); |
|
|
|
OaMendApply oaMendApply = fetchBySid(businessSid); |
|
|
|
if (oaMendApply == null) { |
|
|
|
return rb.setMsg("该申请不存在"); |
|
|
|
} |
|
|
|
OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid()); |
|
|
|
oaMendApply.setOaForm(oaForm); |
|
|
|
String businessTaskId = oaMendApply.getOaForm().getTaskId(); |
|
|
|
if (StringUtils.isNotBlank(businessTaskId)) { |
|
|
|
if (businessTaskId.equals(query.getTaskId())) { |
|
|
|
if (StringUtils.isBlank(query.getComment())) { |
|
|
|
return rb.setMsg("请填写意见"); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(query.getUserSid())) { |
|
|
|
return rb.setMsg("参数错误：userSid"); |
|
|
|
} |
|
|
|
FlowTaskVo flowTaskVo = new FlowTaskVo(); |
|
|
|
BeanUtil.copyProperties(query, flowTaskVo); |
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
variables.put("app", appMap); |
|
|
|
//网关
|
|
|
|
|
|
|
|
flowTaskVo.setValues(variables); |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
UpdateFlowFieldVo ufVo = resultBean.getData(); |
|
|
|
Map<String, Object> map = BeanUtil.beanToMap(ufVo); |
|
|
|
//更新业务中的流程相关的参数
|
|
|
|
// updateFlowFiled(map);
|
|
|
|
//更新oaform中的流程数据
|
|
|
|
ufVo.setSid(oaMendApply.getFormSid()); |
|
|
|
oaFormService.updateFlow(BeanUtil.beanToMap(ufVo)); |
|
|
|
//极光推送
|
|
|
|
oaMendApply = fetchBySid(businessSid); |
|
|
|
//==================================添加线程
|
|
|
|
try { |
|
|
|
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() |
|
|
|
.setNameFormat("demo-pool-%d").build(); |
|
|
|
ExecutorService pool = new ThreadPoolExecutor(2, 100, |
|
|
|
0L, TimeUnit.MILLISECONDS, |
|
|
|
new LinkedBlockingQueue<Runnable>(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.getOaForm().getProcInstId(); |
|
|
|
ufVo.setProcInsId(procId); |
|
|
|
ufVo.setProcDefId(mendApply.getOaForm().getProcDefId()); |
|
|
|
messageFlowableQuery.setUfVo(messageFlowVo); |
|
|
|
messageFlowableQuery.setAppMap(appMap); |
|
|
|
messageFlowableQuery.setBusinessSid(businessSid); |
|
|
|
messageFlowableQuery.setModuleName("补卡申请"); |
|
|
|
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId); |
|
|
|
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); |
|
|
|
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); |
|
|
|
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(mendApply.getCreateBySid())) { |
|
|
|
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); |
|
|
|
} else { |
|
|
|
messageFlowableQuery.setMsgContent(mendApply.getOaForm().getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); |
|
|
|
} |
|
|
|
messageFlowableQuery.setMsgTitle("补卡申请"); |
|
|
|
messageFeign.pushMessage(messageFlowableQuery); |
|
|
|
}); |
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
//==================================添加线程
|
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
} |
|
|
|
return rb.setMsg("操作失败!提交的数据不一致!"); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean revokeProcess(OaMendApplyTaskQuery query) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
if (StringUtils.isBlank(query.getUserSid())) { |
|
|
|
return rb.setMsg("参数错误：userSid"); |
|
|
|
} |
|
|
|
OaMendApply oaMendApply = fetchBySid(query.getBusinessSid()); |
|
|
|
OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid()); |
|
|
|
oaMendApply.setOaForm(oaForm); |
|
|
|
String businessTaskId = oaMendApply.getOaForm().getTaskId(); |
|
|
|
if (StringUtils.isNotBlank(businessTaskId)) { |
|
|
|
if (businessTaskId.equals(query.getTaskId())) { |
|
|
|
FlowTaskVo flowTaskVo = new FlowTaskVo(); |
|
|
|
BeanUtil.copyProperties(query, flowTaskVo); |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
// updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
|
|
|
|
//更新oaform中的流程数据
|
|
|
|
resultBean.getData().setSid(oaMendApply.getFormSid()); |
|
|
|
oaFormService.updateFlow(BeanUtil.beanToMap(resultBean.getData())); |
|
|
|
return rb.success().setData(resultBean.getData()); |
|
|
|
} |
|
|
|
} |
|
|
|
return rb.setMsg("操作失败，提交的数据不一致!"); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean breakProcess(OaMendApplyTaskQuery query) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
if (StringUtils.isBlank(query.getInstanceId())) { |
|
|
|
return rb.setMsg("参数错误：instanceId"); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(query.getUserSid())) { |
|
|
|
return rb.setMsg("参数错误：userSid"); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(query.getComment())) { |
|
|
|
return rb.setMsg("请填写意见"); |
|
|
|
} |
|
|
|
OaMendApply oaMendApply = fetchBySid(query.getBusinessSid()); |
|
|
|
OaForm oaForm = oaFormService.fetchBySid(oaMendApply.getFormSid()); |
|
|
|
oaMendApply.setOaForm(oaForm); |
|
|
|
String businessTaskId = oaMendApply.getOaForm().getTaskId(); |
|
|
|
if (StringUtils.isNotBlank(businessTaskId)) { |
|
|
|
if (query.getUserSid().equals(oaMendApply.getCreateBySid())) { |
|
|
|
FlowTaskVo flowTaskVo = new FlowTaskVo(); |
|
|
|
BeanUtil.copyProperties(query, flowTaskVo); |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData()); |
|
|
|
// updateFlowFiled(map);
|
|
|
|
//更新oaform中的流程数据
|
|
|
|
resultBean.getData().setSid(oaMendApply.getFormSid()); |
|
|
|
oaFormService.updateFlow(BeanUtil.beanToMap(resultBean.getData())); |
|
|
|
return rb.success().setData(resultBean.getData()); |
|
|
|
} else { |
|
|
|
if (businessTaskId.equals(query.getTaskId())) { |
|
|
|
FlowTaskVo flowTaskVo = new FlowTaskVo(); |
|
|
|
BeanUtil.copyProperties(query, flowTaskVo); |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData()); |
|
|
|
// updateFlowFiled(map);
|
|
|
|
//更新oaform中的流程数据
|
|
|
|
resultBean.getData().setSid(oaMendApply.getFormSid()); |
|
|
|
oaFormService.updateFlow(BeanUtil.beanToMap(resultBean.getData())); |
|
|
|
return rb.success().setData(resultBean.getData()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
return rb.setMsg("操作失败!提交的数据不一致!"); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean delegate(OaMendApplyDelegateQuery query) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
FlowDelegateQuery delegateQuery = new FlowDelegateQuery(); |
|
|
|
BeanUtil.copyProperties(query, delegateQuery); |
|
|
|
flowFeign.delegate(delegateQuery); |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean assignTask(OaMendApplyDelegateQuery query) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
FlowDelegateQuery delegateQuery = new FlowDelegateQuery(); |
|
|
|
BeanUtil.copyProperties(query, delegateQuery); |
|
|
|
flowFeign.assignTask(delegateQuery); |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean delAll(String[] sids) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
//查询该sid中是否有流程不是待提交的
|
|
|
|
|
ligaode
4 months ago