|
|
@ -2,13 +2,19 @@ package com.yxt.anrui.scm.biz.scmapplyinbound; |
|
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
|
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDto; |
|
|
|
|
|
import com.yxt.anrui.base.api.baseoutsourcingapplication.SubmitBaseOutSourcingApplicationDto; |
|
|
|
|
|
import com.yxt.anrui.flowable.api.flow.FlowableFeign; |
|
|
|
|
|
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; |
|
|
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; |
|
|
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; |
|
|
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; |
|
|
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; |
|
|
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; |
|
|
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; |
|
|
import com.yxt.anrui.flowable.api.utils.ProcDefEnum; |
|
|
import com.yxt.anrui.flowable.api.utils.ProcDefEnum; |
|
|
import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; |
|
|
import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; |
|
|
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; |
|
|
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; |
|
|
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; |
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
import com.yxt.anrui.scm.api.flow.FlowTaskVo; |
|
|
import com.yxt.anrui.scm.api.flow.FlowTaskVo; |
|
|
@ -57,7 +63,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa |
|
|
@Autowired |
|
|
@Autowired |
|
|
private SysStaffOrgFeign sysStaffOrgFeign; |
|
|
private SysStaffOrgFeign sysStaffOrgFeign; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private FlowableService flowableService; |
|
|
private FlowableFeign flowableFeign; |
|
|
|
|
|
// private FlowableService flowableService;
|
|
|
@Autowired |
|
|
@Autowired |
|
|
private FlowTaskFeign flowTaskFeign; |
|
|
private FlowTaskFeign flowTaskFeign; |
|
|
|
|
|
|
|
|
@ -69,10 +76,12 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa |
|
|
PagerVo<ScmApplyInbound> p = PagerUtil.pageToVo(pagging, null); |
|
|
PagerVo<ScmApplyInbound> p = PagerUtil.pageToVo(pagging, null); |
|
|
return p; |
|
|
return p; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public List<ScmApplyInbound> listAll(ScmApplyInboundQuery query) { |
|
|
public List<ScmApplyInbound> listAll(ScmApplyInboundQuery query) { |
|
|
QueryWrapper<ScmApplyInbound> qw = createQueryWrapper(query); |
|
|
QueryWrapper<ScmApplyInbound> qw = createQueryWrapper(query); |
|
|
return baseMapper.selectList(qw); |
|
|
return baseMapper.selectList(qw); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private QueryWrapper<ScmApplyInbound> createQueryWrapper(ScmApplyInboundQuery query) { |
|
|
private QueryWrapper<ScmApplyInbound> createQueryWrapper(ScmApplyInboundQuery query) { |
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
|
|
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
|
|
@ -108,10 +117,11 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 新增和修改车辆入账单 |
|
|
* 新增和修改车辆入账单 |
|
|
|
|
|
* |
|
|
* @param dto |
|
|
* @param dto |
|
|
*/ |
|
|
*/ |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
public ResultBean saveOrUpdateApplyInBound(ScmApplyInboundDto dto){ |
|
|
public ResultBean<String> saveOrUpdateApplyInBound(ScmApplyInboundDto dto) { |
|
|
// 验证车架号：不能为空、不能重复
|
|
|
// 验证车架号：不能为空、不能重复
|
|
|
List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList(); |
|
|
List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList(); |
|
|
List<String> vinNoList = vehicleList.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList()); |
|
|
List<String> vinNoList = vehicleList.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList()); |
|
|
@ -159,6 +169,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 根据sid查询车辆入账单详情 |
|
|
* 根据sid查询车辆入账单详情 |
|
|
|
|
|
* |
|
|
* @param sid |
|
|
* @param sid |
|
|
* @return |
|
|
* @return |
|
|
*/ |
|
|
*/ |
|
|
@ -189,6 +200,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 更新流程相关的状态 |
|
|
* 更新流程相关的状态 |
|
|
|
|
|
* |
|
|
* @param map |
|
|
* @param map |
|
|
* @return |
|
|
* @return |
|
|
*/ |
|
|
*/ |
|
|
@ -196,76 +208,131 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa |
|
|
return baseMapper.updateFlowFiled(map); |
|
|
return baseMapper.updateFlowFiled(map); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 更新流程相关的状态 |
|
|
|
|
|
* |
|
|
|
|
|
* @param updateFlowFieldVo |
|
|
|
|
|
* @return |
|
|
|
|
|
*/ |
|
|
|
|
|
private int updateFlowFiled(UpdateFlowFieldVo updateFlowFieldVo) { |
|
|
|
|
|
UpdateWrapper<ScmApplyInbound> uw = new UpdateWrapper<>(); |
|
|
|
|
|
uw.eq("sid", updateFlowFieldVo.getSid()); |
|
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(updateFlowFieldVo.getProcDefId())) { |
|
|
|
|
|
uw.set("procDefId", updateFlowFieldVo.getProcDefId()); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(updateFlowFieldVo.getNodeState())) { |
|
|
|
|
|
uw.set("nodeState", updateFlowFieldVo.getNodeState()); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(updateFlowFieldVo.getProcInsId())) { |
|
|
|
|
|
uw.set("procInsId", updateFlowFieldVo.getProcInsId()); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(updateFlowFieldVo.getTaskDefKey())) { |
|
|
|
|
|
uw.set("taskDefKey", updateFlowFieldVo.getTaskDefKey()); |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isNotBlank(updateFlowFieldVo.getTaskId())) { |
|
|
|
|
|
uw.set("taskId", updateFlowFieldVo.getTaskId()); |
|
|
|
|
|
} |
|
|
|
|
|
// if (StringUtils.isNotBlank(updateFlowFieldVo.getNextNodeUserSids())) {
|
|
|
|
|
|
// uw.set("", updateFlowFieldVo.getNextNodeUserSids());
|
|
|
|
|
|
// }
|
|
|
|
|
|
return baseMapper.update(null, uw); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 提交入账申请 |
|
|
* 提交入账申请 |
|
|
|
|
|
* |
|
|
* @param dto |
|
|
* @param dto |
|
|
* @return |
|
|
* @return |
|
|
*/ |
|
|
*/ |
|
|
public ResultBean submitRecordApplication(SubmitScmApplyInboundDto dto) { |
|
|
public ResultBean submitRecordApplication(SubmitScmApplyInboundDto dto) { |
|
|
String orgSid = checkUserOrg(dto.getUserSid()); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean resultBean = saveOrUpdateApplyInBound(dto); |
|
|
//取组织架构的全路径sid
|
|
|
String businessSid = resultBean.getData().toString(); |
|
|
// SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(dto.getUserSid()).getData();
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
String orgSidPath = dto.getOrgSidPath(); //sysStaffOrg.getOrgSidPath();
|
|
|
variables.put("businessSid", businessSid); |
|
|
Map<String, Object> variables = BeanUtil.beanToMap(dto); |
|
|
variables.put("orgSid", orgSid); //部门sid
|
|
|
|
|
|
if (StringUtils.isBlank(dto.getTaskId())) { // 新提交
|
|
|
ScmApplyInbound booad = new ScmApplyInbound(); |
|
|
ResultBean resultBean1 = flowableService.businessStart(ProcDefEnum.RECORDAPPLICATION.getProDefId(), dto.getUserSid(), variables); |
|
|
int r = submitBusinessData(dto, booad); |
|
|
if (resultBean1.getSuccess() && resultBean1.getData() != null) { |
|
|
if (r == 0) { |
|
|
Map<String, String> map = (Map<String, String>) resultBean1.getData(); |
|
|
return rb.setMsg("操作失败，提交的数据不一致!"); |
|
|
//更新业务表中的流程状态
|
|
|
|
|
|
Map<String, Object> paramMap = new HashMap<>(); |
|
|
|
|
|
paramMap.put("sid", businessSid); |
|
|
|
|
|
paramMap.put("procDefId", ProcDefEnum.RECORDAPPLICATION.getProDefId()); |
|
|
|
|
|
paramMap.put("nodeState", map.get("nodeState")); |
|
|
|
|
|
paramMap.put("procInsId", map.get("procInsId")); |
|
|
|
|
|
paramMap.put("taskDefKey", map.get("taskDefKey")); |
|
|
|
|
|
updateFlowFiled(paramMap); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ResultBean<String> resultBean = saveOrUpdateApplyInBound(dto); |
|
|
|
|
|
String businessSid = resultBean.getData(); |
|
|
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
|
|
bv.setOrgSidPath(orgSidPath); |
|
|
|
|
|
bv.setBusinessSid(businessSid); |
|
|
|
|
|
bv.setUserSid(dto.getUserSid()); |
|
|
|
|
|
variables.put("businessSid", businessSid); |
|
|
|
|
|
bv.setFormVariables(variables); |
|
|
|
|
|
bv.setModelId(ProcDefEnum.RECORDAPPLICATION.getProDefId()); |
|
|
|
|
|
if (r == 1) { |
|
|
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv); |
|
|
|
|
|
UpdateFlowFieldVo uff = resultBean1.getData(); |
|
|
|
|
|
updateFlowFiled(uff); |
|
|
return resultBean1; |
|
|
return resultBean1; |
|
|
} else { // 驳回到发起人后再次提交
|
|
|
} else if (r == 2) { |
|
|
variables.put("comment", StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); |
|
|
bv.setTaskDefKey(booad.getTaskDefKey()); |
|
|
variables.put("instanceId", dto.getInstanceId()); |
|
|
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); |
|
|
variables.put("taskId", dto.getTaskId()); |
|
|
bv.setInstanceId(booad.getProcInsId()); |
|
|
variables.put("userSid", dto.getUserSid()); |
|
|
ResultBean<UpdateFlowFieldVo> rrb = flowableFeign.handleProsess(bv); |
|
|
return complete(variables); |
|
|
updateFlowFiled(rrb.getData()); |
|
|
|
|
|
return rrb; |
|
|
} |
|
|
} |
|
|
|
|
|
return rb; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private synchronized int submitBusinessData(SubmitScmApplyInboundDto dto, ScmApplyInbound booad) { |
|
|
|
|
|
int r = 0; |
|
|
|
|
|
booad = this.fetchBySid(dto.getSid()); |
|
|
|
|
|
String businessTaskid = booad.getTaskId(); |
|
|
|
|
|
if (StringUtils.isBlank(businessTaskid) && StringUtils.isBlank(dto.getTaskId())) { |
|
|
|
|
|
// 新提交 taskid都是空的
|
|
|
|
|
|
r = 1; |
|
|
|
|
|
} else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
|
|
|
|
|
|
r = 2; |
|
|
|
|
|
} |
|
|
|
|
|
return r; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 办理 |
|
|
* 办理 |
|
|
* @param variables |
|
|
* |
|
|
|
|
|
* @param dto |
|
|
* @return |
|
|
* @return |
|
|
*/ |
|
|
*/ |
|
|
public ResultBean complete(Map<String, Object> variables) { |
|
|
public ResultBean complete(SubmitScmApplyInboundDto dto) { |
|
|
BusinessVariables bv= BusinessVariables.builder().build(); |
|
|
|
|
|
bv.setFormVariables(variables); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowTask> resultBean = flowTaskFeign.businessComplete(bv); |
|
|
ScmApplyInbound booad = this.fetchBySid(dto.getSid()); |
|
|
if (!resultBean.getSuccess()) { |
|
|
if (StringUtils.isBlank(booad.getTaskId()) || !booad.getTaskId().equals(dto.getTaskId())) { |
|
|
return resultBean; |
|
|
return rb.setMsg("操作失败，提交的数据不一致!"); |
|
|
} |
|
|
|
|
|
String nodeState = ""; |
|
|
|
|
|
String taskDefKey = ""; |
|
|
|
|
|
Map<String, Object> paramMap = new HashMap<>(); |
|
|
|
|
|
paramMap.put("sid", variables.get("businessSid").toString()); |
|
|
|
|
|
if (resultBean.getData() != null) { |
|
|
|
|
|
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId()); |
|
|
|
|
|
if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) { |
|
|
|
|
|
nodeState = listResultBean.getData().get(0).getName_(); |
|
|
|
|
|
taskDefKey = listResultBean.getData().get(0).getTask_def_key_(); |
|
|
|
|
|
} else { |
|
|
|
|
|
nodeState = ProcessStateEnum.FINISHED.getStateName(); |
|
|
|
|
|
taskDefKey = "Event_end"; |
|
|
|
|
|
paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode()); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
paramMap.put("nodeState", nodeState); |
|
|
|
|
|
paramMap.put("taskDefKey", taskDefKey); |
|
|
//取组织架构的全路径sid
|
|
|
updateFlowFiled(paramMap); |
|
|
// SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(dto.getApplicationSid()).getData();
|
|
|
return resultBean; |
|
|
String orgSidPath = dto.getOrgSidPath(); |
|
|
|
|
|
Map<String, Object> variables = BeanUtil.beanToMap(dto); |
|
|
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
|
|
bv.setTaskId(booad.getTaskId()); |
|
|
|
|
|
bv.setOrgSidPath(orgSidPath); |
|
|
|
|
|
bv.setBusinessSid(dto.getSid()); |
|
|
|
|
|
bv.setUserSid(dto.getUserSid()); |
|
|
|
|
|
variables.put("businessSid", dto.getSid()); |
|
|
|
|
|
bv.setTaskDefKey(booad.getTaskDefKey()); |
|
|
|
|
|
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); |
|
|
|
|
|
bv.setInstanceId(booad.getProcInsId()); |
|
|
|
|
|
bv.setFormVariables(variables); |
|
|
|
|
|
bv.setModelId(ProcDefEnum.RECORDAPPLICATION.getProDefId()); |
|
|
|
|
|
ResultBean<UpdateFlowFieldVo> rrb = flowableFeign.handleProsess(bv); |
|
|
|
|
|
updateFlowFiled(rrb.getData()); |
|
|
|
|
|
return rrb; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 撤回 |
|
|
* 撤回 |
|
|
|
|
|
* |
|
|
* @param userSid |
|
|
* @param userSid |
|
|
* @param businessSid |
|
|
* @param businessSid |
|
|
* @param flowTaskVo |
|
|
* @param flowTaskVo |
|
|
@ -298,6 +365,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 驳回 |
|
|
* 驳回 |
|
|
|
|
|
* |
|
|
* @param businessSid |
|
|
* @param businessSid |
|
|
* @param flowTaskVo |
|
|
* @param flowTaskVo |
|
|
* @return |
|
|
* @return |
|
|
@ -325,6 +393,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 终止流程 |
|
|
* 终止流程 |
|
|
|
|
|
* |
|
|
* @param businessSid |
|
|
* @param businessSid |
|
|
* @param flowTaskVo |
|
|
* @param flowTaskVo |
|
|
* @return |
|
|
* @return |
|
|
@ -347,6 +416,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 流程历史流转记录 |
|
|
* 流程历史流转记录 |
|
|
|
|
|
* |
|
|
* @param procInsId |
|
|
* @param procInsId |
|
|
* @param deployId |
|
|
* @param deployId |
|
|
* @return |
|
|
* @return |
|
|
@ -354,4 +424,26 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa |
|
|
public ResultBean flowRecord(String procInsId, String deployId) { |
|
|
public ResultBean flowRecord(String procInsId, String deployId) { |
|
|
return flowTaskFeign.businessFlowRecord(procInsId, deployId); |
|
|
return flowTaskFeign.businessFlowRecord(procInsId, deployId); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public ResultBean getNextNodesForSubmit(SubmitScmApplyInboundDto dto) { |
|
|
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
|
|
bv.setModelId(ProcDefEnum.RECORDAPPLICATION.getProDefId()); |
|
|
|
|
|
bv.setTaskDefKey(dto.getTaskDefKey()); |
|
|
|
|
|
bv.setFormVariables(BeanUtil.beanToMap(dto)); |
|
|
|
|
|
ResultBean processCirculationNodesByMap = flowTaskFeign.getNextNodesForSubmit(bv); |
|
|
|
|
|
processCirculationNodesByMap.setCode("200"); |
|
|
|
|
|
processCirculationNodesByMap.setSuccess(true); |
|
|
|
|
|
return processCirculationNodesByMap; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public ResultBean getPreviousNodesForReject(SubmitScmApplyInboundDto dto) { |
|
|
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
|
|
bv.setTaskDefKey(dto.getTaskDefKey()); |
|
|
|
|
|
bv.setModelId(ProcDefEnum.RECORDAPPLICATION.getProDefId()); |
|
|
|
|
|
bv.setFormVariables(BeanUtil.beanToMap(dto)); |
|
|
|
|
|
ResultBean processCirculationNodesByMap = flowTaskFeign.getPreviousNodesForReject(bv); |
|
|
|
|
|
processCirculationNodesByMap.setCode("200"); |
|
|
|
|
|
processCirculationNodesByMap.setSuccess(true); |
|
|
|
|
|
return processCirculationNodesByMap; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
lzh
3 years ago