|
|
|
@ -29,12 +29,14 @@ 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.yxt.anrui.base.api.commonappendix.CommonAppendixDto; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; |
|
|
|
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.*; |
|
|
|
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; |
|
|
|
import com.yxt.anrui.base.api.commoncontract.CommonContractVo; |
|
|
|
import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; |
|
|
|
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AdCarListDto; |
|
|
|
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapply; |
|
|
|
import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDetailsVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelFeign; |
|
|
|
@ -697,7 +699,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
FinBillApplication finBillApplication = fetchBySid(businessSid); |
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
appMap.put("contractSid", businessSid); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
variables.put("app", appMap); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
bv.setOrgSidPath(finBillApplication.getOrgSidPath()); |
|
|
|
@ -715,7 +717,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
MessageFlowVo messageFlowVo = new MessageFlowVo(); |
|
|
|
BeanUtil.copyProperties(ufVo, messageFlowVo); |
|
|
|
ufVo.setProcDefId(finBillApplication.getProcDefId()); |
|
|
|
ufVo.setProcInsId(finBillApplication.getProcInstSid()); |
|
|
|
ufVo.setProcInsId(finBillApplication.getProcInstId()); |
|
|
|
messageFlowableQuery.setUfVo(messageFlowVo); |
|
|
|
messageFlowableQuery.setAppMap(appMap); |
|
|
|
messageFlowableQuery.setBusinessSid(businessSid); |
|
|
|
@ -779,7 +781,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
BeanUtil.copyProperties(query, flowTaskVo); |
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
appMap.put("contractSid", businessSid); |
|
|
|
appMap.put("sid", businessSid); |
|
|
|
variables.put("app", appMap); |
|
|
|
flowTaskVo.setValues(variables); |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo); |
|
|
|
@ -795,7 +797,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); |
|
|
|
MessageFlowVo messageFlowVo = new MessageFlowVo(); |
|
|
|
BeanUtil.copyProperties(ufVo, messageFlowVo); |
|
|
|
String procId = finBillApplication.getProcInstSid(); |
|
|
|
String procId = finBillApplication.getProcInstId(); |
|
|
|
ufVo.setProcInsId(procId); |
|
|
|
ufVo.setProcDefId(finBillApplication.getProcDefId()); |
|
|
|
messageFlowableQuery.setUfVo(messageFlowVo); |
|
|
|
@ -871,85 +873,85 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
|
|
|
|
public ResultBean submitFinBillApplication(SubmitFinBillApplicationDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
//根据用户sid获取staffSid
|
|
|
|
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); |
|
|
|
if (!userVoResultBean.getSuccess()) { |
|
|
|
return rb.setMsg(userVoResultBean.getMsg()); |
|
|
|
} |
|
|
|
//根据staffSid获取用户的组织全路径
|
|
|
|
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); |
|
|
|
if (!staffOrgResultBean.getSuccess()) { |
|
|
|
return rb.setMsg(staffOrgResultBean.getMsg()); |
|
|
|
} |
|
|
|
//用户的组织全路径
|
|
|
|
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); |
|
|
|
dto.setOrgSidPath(orgSidPath); |
|
|
|
FinBillApplication finBillApplication = fetchBySid(dto.getSid()); |
|
|
|
int r = submitBusinessData(dto, finBillApplication); |
|
|
|
if (r == 3) { |
|
|
|
return rb.setMsg("该申请不存在"); |
|
|
|
} |
|
|
|
if (r == 0) { |
|
|
|
return rb.setMsg("操作失败!提交的数据不一致"); |
|
|
|
} |
|
|
|
//新增修改保存
|
|
|
|
ResultBean<String> resultBean = saveOrUpdateDto(dto); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
|
|
|
|
String businessSid = resultBean.getData(); |
|
|
|
//创建BusinessVariables实体对象
|
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
|
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
appMap.put("contractSid", businessSid); |
|
|
|
variables.put("app", appMap); |
|
|
|
//用户的部门全路径sid
|
|
|
|
bv.setOrgSidPath(orgSidPath); |
|
|
|
//业务sid
|
|
|
|
bv.setBusinessSid(businessSid); |
|
|
|
//用户sid
|
|
|
|
bv.setUserSid(dto.getUserSid()); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
//流程定义id
|
|
|
|
bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId()); |
|
|
|
if (r == 1) { |
|
|
|
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); |
|
|
|
if (!voResultBean.getSuccess()) { |
|
|
|
return rb.setMsg(voResultBean.getMsg()); |
|
|
|
} |
|
|
|
UpdateFlowFieldVo ufVo = voResultBean.getData(); |
|
|
|
updateFlowFiled(BeanUtil.beanToMap(ufVo)); |
|
|
|
//极光推送
|
|
|
|
finBillApplication = fetchBySid(businessSid); |
|
|
|
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); |
|
|
|
MessageFlowVo messageFlowVo = new MessageFlowVo(); |
|
|
|
BeanUtil.copyProperties(ufVo, messageFlowVo); |
|
|
|
messageFlowableQuery.setUfVo(messageFlowVo); |
|
|
|
messageFlowableQuery.setAppMap(appMap); |
|
|
|
messageFlowableQuery.setBusinessSid(businessSid); |
|
|
|
messageFlowableQuery.setModuleName("开票申请"); |
|
|
|
messageFlowableQuery.setMsgContent(finBillApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); |
|
|
|
messageFlowableQuery.setMsgTitle("开票申请"); |
|
|
|
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); |
|
|
|
return voResultBean; |
|
|
|
} |
|
|
|
if (r == 2) { |
|
|
|
if (StringUtils.isBlank(dto.getInstanceId())) { |
|
|
|
return rb.setMsg("参数错误：instanceId"); |
|
|
|
} |
|
|
|
bv.setTaskId(finBillApplication.getTaskId()); |
|
|
|
bv.setTaskDefKey(finBillApplication.getNodeSid()); |
|
|
|
bv.setComment("重新提交"); |
|
|
|
bv.setInstanceId(dto.getInstanceId()); |
|
|
|
return complete(bv); |
|
|
|
} |
|
|
|
return rb; |
|
|
|
// //根据用户sid获取staffSid
|
|
|
|
// ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
|
|
|
|
// if (!userVoResultBean.getSuccess()) {
|
|
|
|
// return rb.setMsg(userVoResultBean.getMsg());
|
|
|
|
// }
|
|
|
|
// //根据staffSid获取用户的组织全路径
|
|
|
|
// ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
|
|
|
|
// if (!staffOrgResultBean.getSuccess()) {
|
|
|
|
// return rb.setMsg(staffOrgResultBean.getMsg());
|
|
|
|
// }
|
|
|
|
// //用户的组织全路径
|
|
|
|
// String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
|
|
|
|
// dto.setOrgSidPath(orgSidPath);
|
|
|
|
// FinBillApplication finBillApplication = fetchBySid(dto.getSid());
|
|
|
|
// int r = submitBusinessData(dto, finBillApplication);
|
|
|
|
// if (r == 3) {
|
|
|
|
// return rb.setMsg("该申请不存在");
|
|
|
|
// }
|
|
|
|
// if (r == 0) {
|
|
|
|
// return rb.setMsg("操作失败!提交的数据不一致");
|
|
|
|
// }
|
|
|
|
// //新增修改保存
|
|
|
|
// ResultBean<String> resultBean = saveOrUpdateDto(dto);
|
|
|
|
// if (!resultBean.getSuccess()) {
|
|
|
|
// return rb.setMsg(resultBean.getMsg());
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// String businessSid = resultBean.getData();
|
|
|
|
// //创建BusinessVariables实体对象
|
|
|
|
// BusinessVariables bv = new BusinessVariables();
|
|
|
|
// //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
|
|
|
|
// Map<String, Object> variables = new HashMap<>();
|
|
|
|
// Map<String, Object> appMap = new HashMap<>();
|
|
|
|
// appMap.put("contractSid", businessSid);
|
|
|
|
// variables.put("app", appMap);
|
|
|
|
// //用户的部门全路径sid
|
|
|
|
// bv.setOrgSidPath(orgSidPath);
|
|
|
|
// //业务sid
|
|
|
|
// bv.setBusinessSid(businessSid);
|
|
|
|
// //用户sid
|
|
|
|
// bv.setUserSid(dto.getUserSid());
|
|
|
|
// bv.setFormVariables(variables);
|
|
|
|
// //流程定义id
|
|
|
|
// bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
|
|
|
|
// if (r == 1) {
|
|
|
|
// ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
|
|
|
|
// if (!voResultBean.getSuccess()) {
|
|
|
|
// return rb.setMsg(voResultBean.getMsg());
|
|
|
|
// }
|
|
|
|
// UpdateFlowFieldVo ufVo = voResultBean.getData();
|
|
|
|
// updateFlowFiled(BeanUtil.beanToMap(ufVo));
|
|
|
|
// //极光推送
|
|
|
|
// finBillApplication = fetchBySid(businessSid);
|
|
|
|
// MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
|
|
|
|
// MessageFlowVo messageFlowVo = new MessageFlowVo();
|
|
|
|
// BeanUtil.copyProperties(ufVo, messageFlowVo);
|
|
|
|
// messageFlowableQuery.setUfVo(messageFlowVo);
|
|
|
|
// messageFlowableQuery.setAppMap(appMap);
|
|
|
|
// messageFlowableQuery.setBusinessSid(businessSid);
|
|
|
|
// messageFlowableQuery.setModuleName("开票申请");
|
|
|
|
// messageFlowableQuery.setMsgContent(finBillApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
|
|
|
|
// messageFlowableQuery.setMsgTitle("开票申请");
|
|
|
|
// ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
|
|
|
|
// return voResultBean;
|
|
|
|
// }
|
|
|
|
// if (r == 2) {
|
|
|
|
// if (StringUtils.isBlank(dto.getInstanceId())) {
|
|
|
|
// return rb.setMsg("参数错误：instanceId");
|
|
|
|
// }
|
|
|
|
// bv.setTaskId(finBillApplication.getTaskId());
|
|
|
|
// bv.setTaskDefKey(finBillApplication.getNodeSid());
|
|
|
|
// bv.setComment("重新提交");
|
|
|
|
// bv.setInstanceId(dto.getInstanceId());
|
|
|
|
// return complete(bv);
|
|
|
|
// }
|
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
private synchronized int submitBusinessData(SubmitFinBillApplicationDto dto, FinBillApplication finBillApplication) { |
|
|
|
private synchronized int submitBusinessData(SubmitBillApplicationDto dto, FinBillApplication finBillApplication) { |
|
|
|
int r = 0; |
|
|
|
if (StringUtils.isBlank(dto.getSid())) { |
|
|
|
r = 1; |
|
|
|
@ -979,10 +981,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) { |
|
|
|
qw.eq("fba.useOrgSid", pagerQuery.getParams().getUseOrgSid()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) { |
|
|
|
qw.like("fba.customerName", pagerQuery.getParams().getName()); |
|
|
|
} |
|
|
|
IPage<AppBillApplicationPageVo> iPage = baseMapper.getInvoicedApplyList(page, qw); |
|
|
|
String name = pagerQuery.getParams().getName(); |
|
|
|
IPage<AppBillApplicationPageVo> iPage = baseMapper.getInvoicedApplyList(page, qw,name); |
|
|
|
List<AppBillApplicationPageVo> records = iPage.getRecords(); |
|
|
|
for (AppBillApplicationPageVo record : records) { |
|
|
|
String createBySid = record.getCreateBySid(); |
|
|
|
@ -992,16 +992,22 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
return iPage; |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<AppBillApplicationIInfoVo> getInvoicedApply(String sid) { |
|
|
|
public ResultBean<AppBillApplicationIInfoVo> getInvoicedApply(AppBillApplicationPageInfoQuery query) { |
|
|
|
String sid = query.getSid(); |
|
|
|
ResultBean<AppBillApplicationIInfoVo> rb = ResultBean.fireFail(); |
|
|
|
AppBillApplicationIInfoVo vo = baseMapper.getInvoicedApply(sid); |
|
|
|
List<AppVinListVo> vinList = vo.getVinList(); |
|
|
|
List<AppVinListVo> vinList = new ArrayList<>(); |
|
|
|
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); |
|
|
|
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { |
|
|
|
AppVinListVo appVinListVo = new AppVinListVo(); |
|
|
|
BeanUtil.copyProperties(finBillVehicleVo, appVinListVo, "sid"); |
|
|
|
appVinListVo.setVIN(finBillVehicleVo.getVIN()); |
|
|
|
appVinListVo.setInvoiceName(finBillVehicleVo.getBillName()); |
|
|
|
appVinListVo.setInvoiceNameKey(finBillVehicleVo.getBillNameSid()); |
|
|
|
appVinListVo.setBillTypeKey(finBillVehicleVo.getBillTypeKey()); |
|
|
|
appVinListVo.setBillTypeValue(finBillVehicleVo.getBillTypeValue()); |
|
|
|
vinList.add(appVinListVo); |
|
|
|
} |
|
|
|
vo.setVinList(vinList); |
|
|
|
List<String> customerInvoiceApplyImages = new ArrayList<>(); |
|
|
|
List<String> registerContractImages = new ArrayList<>(); |
|
|
|
List<String> invoiceApplyConfirmImages = new ArrayList<>(); |
|
|
|
@ -1029,7 +1035,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
String s1 = "";//客户开票申请书
|
|
|
|
String s2 = "";//车辆登记合同
|
|
|
|
String s3 = "";//开票信息确认书
|
|
|
|
String userSid = dto.getCreateBySid();//用户sid
|
|
|
|
String userSid = dto.getUserSid();//用户sid
|
|
|
|
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();//分公司sid
|
|
|
|
if (StringUtils.isBlank(dto.getSid())) { |
|
|
|
FinBillApplication finBillApplication = new FinBillApplication(); |
|
|
|
@ -1042,6 +1048,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
FinBillVehicle finBillVehicle = new FinBillVehicle(); |
|
|
|
BeanUtil.copyProperties(appVinListDto, finBillVehicle, "sid"); |
|
|
|
finBillVehicle.setBillAppSid(sid); |
|
|
|
finBillVehicle.setBillName(appVinListDto.getInvoiceName()); |
|
|
|
finBillVehicle.setBillNameSid(appVinListDto.getInvoiceNameKey()); |
|
|
|
finBillVehicleService.save(finBillVehicle); |
|
|
|
} |
|
|
|
|
|
|
|
@ -1090,6 +1098,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
FinBillApplication finBillApplication = fetchBySid(dto.getSid()); |
|
|
|
BeanUtil.copyProperties(dto, finBillApplication, "sid"); |
|
|
|
String sid = finBillApplication.getSid(); |
|
|
|
finBillVehicleService.delByBillAppSid(sid); |
|
|
|
List<AppVinListDto> vinList = dto.getVinList(); |
|
|
|
for (AppVinListDto appVinListDto : vinList) { |
|
|
|
FinBillVehicle finBillVehicle = new FinBillVehicle(); |
|
|
|
BeanUtil.copyProperties(appVinListDto, finBillVehicle, "sid"); |
|
|
|
finBillVehicle.setBillName(appVinListDto.getInvoiceName()); |
|
|
|
finBillVehicle.setBillNameSid(appVinListDto.getInvoiceNameKey()); |
|
|
|
finBillVehicle.setBillAppSid(sid); |
|
|
|
finBillVehicleService.save(finBillVehicle); |
|
|
|
} |
|
|
|
|
|
|
|
finBillFileService.deleteByFinAppSid(sid); |
|
|
|
List<String> INVOICE_KHKPSQS = dto.getCustomerInvoiceApplyImages(); |
|
|
|
if (INVOICE_KHKPSQS.size() > 0) { |
|
|
|
@ -1151,6 +1170,85 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean submitBillApplication(SubmitBillApplicationDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
//根据用户sid获取staffSid
|
|
|
|
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); |
|
|
|
if (!userVoResultBean.getSuccess()) { |
|
|
|
return rb.setMsg(userVoResultBean.getMsg()); |
|
|
|
} |
|
|
|
//根据staffSid获取用户的组织全路径
|
|
|
|
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); |
|
|
|
if (!staffOrgResultBean.getSuccess()) { |
|
|
|
return rb.setMsg(staffOrgResultBean.getMsg()); |
|
|
|
} |
|
|
|
//用户的组织全路径
|
|
|
|
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); |
|
|
|
FinBillApplication finBillApplication = fetchBySid(dto.getSid()); |
|
|
|
int r = submitBusinessData(dto, finBillApplication); |
|
|
|
if (r == 3) { |
|
|
|
return rb.setMsg("该申请不存在"); |
|
|
|
} |
|
|
|
if (r == 0) { |
|
|
|
return rb.setMsg("操作失败!提交的数据不一致"); |
|
|
|
} |
|
|
|
dto.setOrgSidPath(orgSidPath); |
|
|
|
//新增修改保存
|
|
|
|
ResultBean<String> resultBean = saveInvoicedApplyInfo(dto); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
String businessSid = resultBean.getData(); |
|
|
|
//创建BusinessVariables实体对象
|
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
|
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
//用户的部门全路径sid
|
|
|
|
bv.setOrgSidPath(orgSidPath); |
|
|
|
//业务sid
|
|
|
|
bv.setBusinessSid(businessSid); |
|
|
|
//用户sid
|
|
|
|
bv.setUserSid(dto.getUserSid()); |
|
|
|
bv.setFormVariables(variables); |
|
|
|
//若app移动端有此功能，则传递appMap参数
|
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
|
|
|
|
appMap.put("sid", businessSid); |
|
|
|
variables.put("app", appMap); |
|
|
|
//流程定义id
|
|
|
|
bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId()); |
|
|
|
if (r == 1) { |
|
|
|
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv); |
|
|
|
UpdateFlowFieldVo ufVo = voResultBean.getData(); |
|
|
|
updateFlowFiled(BeanUtil.beanToMap(ufVo)); |
|
|
|
//极光推送
|
|
|
|
finBillApplication = fetchBySid(businessSid); |
|
|
|
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); |
|
|
|
MessageFlowVo messageFlowVo = new MessageFlowVo(); |
|
|
|
BeanUtil.copyProperties(ufVo, messageFlowVo); |
|
|
|
messageFlowableQuery.setUfVo(messageFlowVo); |
|
|
|
messageFlowableQuery.setAppMap(appMap); |
|
|
|
messageFlowableQuery.setBusinessSid(businessSid); |
|
|
|
messageFlowableQuery.setModuleName("开票申请"); |
|
|
|
messageFlowableQuery.setMsgContent(finBillApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); |
|
|
|
messageFlowableQuery.setMsgTitle("开票申请"); |
|
|
|
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); |
|
|
|
return voResultBean; |
|
|
|
} |
|
|
|
if (r == 2) { |
|
|
|
// ToDo:驳回到发起人后再次提交
|
|
|
|
if (StringUtils.isBlank(dto.getInstanceId())) { |
|
|
|
return rb.setMsg("参数错误：instanceId"); |
|
|
|
} |
|
|
|
bv.setTaskId(finBillApplication.getTaskId()); |
|
|
|
bv.setTaskDefKey(finBillApplication.getNodeId()); |
|
|
|
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); |
|
|
|
bv.setInstanceId(dto.getInstanceId()); |
|
|
|
return complete(bv); |
|
|
|
} |
|
|
|
return rb; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/* public ResultBean submitFinBillApplicationPageList(SubmitFinBillApplicationPageListDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
|
hp
2 years ago