|
|
@ -55,6 +55,7 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign; |
|
|
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; |
|
|
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.FlowTaskVo; |
|
|
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; |
|
|
|
|
|
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; |
|
|
import com.yxt.anrui.flowable.api.utils.ProcDefEnum; |
|
|
import com.yxt.anrui.flowable.api.utils.ProcDefEnum; |
|
|
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; |
|
|
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; |
|
|
import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; |
|
|
import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; |
|
|
@ -76,6 +77,9 @@ import com.yxt.common.base.utils.PagerUtil; |
|
|
import com.yxt.common.core.query.PagerQuery; |
|
|
import com.yxt.common.core.query.PagerQuery; |
|
|
import com.yxt.common.core.result.ResultBean; |
|
|
import com.yxt.common.core.result.ResultBean; |
|
|
import com.yxt.common.core.vo.PagerVo; |
|
|
import com.yxt.common.core.vo.PagerVo; |
|
|
|
|
|
import com.yxt.messagecenter.api.message.MessageFeign; |
|
|
|
|
|
import com.yxt.messagecenter.api.message.MessageFlowVo; |
|
|
|
|
|
import com.yxt.messagecenter.api.message.MessageFlowableQuery; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
|
@ -122,6 +126,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal |
|
|
private BaseVehmodelConfigService baseVehmodelConfigService; |
|
|
private BaseVehmodelConfigService baseVehmodelConfigService; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private AppSubsetVersionFeign appSubsetVersionFeign; |
|
|
private AppSubsetVersionFeign appSubsetVersionFeign; |
|
|
|
|
|
@Autowired |
|
|
|
|
|
private MessageFeign messageFeign; |
|
|
|
|
|
|
|
|
private QueryWrapper<BaseInternalPurchase> createQueryWrapper(BaseInternalPurchaseQuery query) { |
|
|
private QueryWrapper<BaseInternalPurchase> createQueryWrapper(BaseInternalPurchaseQuery query) { |
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
@ -199,6 +205,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
String dtoSid = dto.getSid(); |
|
|
String dtoSid = dto.getSid(); |
|
|
List<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles(); |
|
|
List<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles(); |
|
|
|
|
|
if (baseInternalPurchaseVehicles.size() < 1) { |
|
|
|
|
|
return rb.setMsg("请选择调车申请车辆"); |
|
|
|
|
|
} |
|
|
if (StringUtils.isBlank(dtoSid)) {//新增
|
|
|
if (StringUtils.isBlank(dtoSid)) {//新增
|
|
|
if (StringUtils.isBlank(dto.getShuntingTypeKey())) { |
|
|
if (StringUtils.isBlank(dto.getShuntingTypeKey())) { |
|
|
return rb.setMsg("调车类型不能为空"); |
|
|
return rb.setMsg("调车类型不能为空"); |
|
|
@ -315,9 +324,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal |
|
|
//若有网关，则赋值网关中判断的字段。
|
|
|
//若有网关，则赋值网关中判断的字段。
|
|
|
variables.put("businessSid", businessSid); |
|
|
variables.put("businessSid", businessSid); |
|
|
//=====================添加app所需参数
|
|
|
//=====================添加app所需参数
|
|
|
Map<String,Object> appMap = new HashMap<>(); |
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
appMap.put("sid",businessSid); |
|
|
appMap.put("sid", businessSid); |
|
|
variables.put("app",appMap); |
|
|
variables.put("app", appMap); |
|
|
//用户的部门全路径sid
|
|
|
//用户的部门全路径sid
|
|
|
bv.setOrgSidPath(orgSidPath); |
|
|
bv.setOrgSidPath(orgSidPath); |
|
|
//业务sid
|
|
|
//业务sid
|
|
|
@ -342,6 +351,19 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal |
|
|
baseVehicleService.updateVeh(baseVehicle); |
|
|
baseVehicleService.updateVeh(baseVehicle); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
//=======================消息推送开始
|
|
|
|
|
|
baseInternalPurchase = 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(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); |
|
|
|
|
|
messageFlowableQuery.setMsgTitle("供应链"); |
|
|
|
|
|
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); |
|
|
|
|
|
//=======================消息推送结束
|
|
|
|
|
|
|
|
|
return voResultBean; |
|
|
return voResultBean; |
|
|
} |
|
|
} |
|
|
@ -437,6 +459,11 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) { |
|
|
if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) { |
|
|
|
|
|
Map<String,Object> variables = new HashMap<>(); |
|
|
|
|
|
Map<String,Object> appMap = new HashMap<>(); |
|
|
|
|
|
appMap.put("sid",bv.getBusinessSid()); |
|
|
|
|
|
variables.put("app",appMap); |
|
|
|
|
|
bv.setFormVariables(variables); |
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); |
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); |
|
|
if (!resultBean.getSuccess()) { |
|
|
if (!resultBean.getSuccess()) { |
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
@ -503,6 +530,21 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
}else{ |
|
|
|
|
|
//极光推送
|
|
|
|
|
|
UpdateFlowFieldVo ufVo = resultBean.getData(); |
|
|
|
|
|
baseInternalPurchase = fetchBySid(bv.getBusinessSid()); |
|
|
|
|
|
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); |
|
|
|
|
|
MessageFlowVo messageFlowVo = new MessageFlowVo(); |
|
|
|
|
|
BeanUtil.copyProperties(ufVo,messageFlowVo); |
|
|
|
|
|
ufVo.setProcInsId(baseInternalPurchase.getProcInstId()); |
|
|
|
|
|
messageFlowableQuery.setUfVo(messageFlowVo); |
|
|
|
|
|
messageFlowableQuery.setAppMap(appMap); |
|
|
|
|
|
messageFlowableQuery.setBusinessSid(bv.getBusinessSid()); |
|
|
|
|
|
messageFlowableQuery.setModuleName("分公司间调车申请"); |
|
|
|
|
|
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); |
|
|
|
|
|
messageFlowableQuery.setMsgTitle("供应链"); |
|
|
|
|
|
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); |
|
|
} |
|
|
} |
|
|
return rb.success().setData(resultBean.getData()); |
|
|
return rb.success().setData(resultBean.getData()); |
|
|
} else { |
|
|
} else { |
|
|
@ -561,11 +603,30 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal |
|
|
bv.setNextNodeUserSids(substring); |
|
|
bv.setNextNodeUserSids(substring); |
|
|
} |
|
|
} |
|
|
if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) { |
|
|
if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) { |
|
|
|
|
|
Map<String,Object> variables = new HashMap<>(); |
|
|
|
|
|
Map<String,Object> appMap = new HashMap<>(); |
|
|
|
|
|
appMap.put("sid",bv.getBusinessSid()); |
|
|
|
|
|
variables.put("app",appMap); |
|
|
|
|
|
bv.setFormVariables(variables); |
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); |
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv); |
|
|
if (!resultBean.getSuccess()) { |
|
|
if (!resultBean.getSuccess()) { |
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
} |
|
|
} |
|
|
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); |
|
|
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); |
|
|
|
|
|
//极光推送
|
|
|
|
|
|
UpdateFlowFieldVo ufVo = resultBean.getData(); |
|
|
|
|
|
baseInternalPurchase = fetchBySid(bv.getBusinessSid()); |
|
|
|
|
|
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); |
|
|
|
|
|
MessageFlowVo messageFlowVo = new MessageFlowVo(); |
|
|
|
|
|
BeanUtil.copyProperties(ufVo,messageFlowVo); |
|
|
|
|
|
ufVo.setProcInsId(baseInternalPurchase.getProcInstId()); |
|
|
|
|
|
messageFlowableQuery.setUfVo(messageFlowVo); |
|
|
|
|
|
messageFlowableQuery.setAppMap(appMap); |
|
|
|
|
|
messageFlowableQuery.setBusinessSid(bv.getBusinessSid()); |
|
|
|
|
|
messageFlowableQuery.setModuleName("分公司间调车申请"); |
|
|
|
|
|
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); |
|
|
|
|
|
messageFlowableQuery.setMsgTitle("供应链"); |
|
|
|
|
|
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); |
|
|
return rb.success().setData(resultBean.getData()); |
|
|
return rb.success().setData(resultBean.getData()); |
|
|
} else { |
|
|
} else { |
|
|
return rb.setMsg("操作失败!提交的数据不一致"); |
|
|
return rb.setMsg("操作失败!提交的数据不一致"); |
|
|
@ -595,11 +656,30 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal |
|
|
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(",")); |
|
|
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(",")); |
|
|
bv.setNextNodeUserSids(substring); |
|
|
bv.setNextNodeUserSids(substring); |
|
|
if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) { |
|
|
if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) { |
|
|
|
|
|
Map<String,Object> variables = new HashMap<>(); |
|
|
|
|
|
Map<String,Object> appMap = new HashMap<>(); |
|
|
|
|
|
appMap.put("sid",bv.getBusinessSid()); |
|
|
|
|
|
variables.put("app",appMap); |
|
|
|
|
|
bv.setFormVariables(variables); |
|
|
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv); |
|
|
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv); |
|
|
if (!resultBean1.getSuccess()) { |
|
|
if (!resultBean1.getSuccess()) { |
|
|
return rb.setMsg(resultBean1.getMsg()); |
|
|
return rb.setMsg(resultBean1.getMsg()); |
|
|
} |
|
|
} |
|
|
updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData())); |
|
|
updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData())); |
|
|
|
|
|
//极光推送
|
|
|
|
|
|
UpdateFlowFieldVo ufVo = resultBean1.getData(); |
|
|
|
|
|
baseInternalPurchase = fetchBySid(bv.getBusinessSid()); |
|
|
|
|
|
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); |
|
|
|
|
|
MessageFlowVo messageFlowVo = new MessageFlowVo(); |
|
|
|
|
|
BeanUtil.copyProperties(ufVo,messageFlowVo); |
|
|
|
|
|
ufVo.setProcInsId(baseInternalPurchase.getProcInstId()); |
|
|
|
|
|
messageFlowableQuery.setUfVo(messageFlowVo); |
|
|
|
|
|
messageFlowableQuery.setAppMap(appMap); |
|
|
|
|
|
messageFlowableQuery.setBusinessSid(bv.getBusinessSid()); |
|
|
|
|
|
messageFlowableQuery.setModuleName("分公司间调车申请"); |
|
|
|
|
|
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); |
|
|
|
|
|
messageFlowableQuery.setMsgTitle("供应链"); |
|
|
|
|
|
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); |
|
|
return rb.success().setData(resultBean1.getData()); |
|
|
return rb.success().setData(resultBean1.getData()); |
|
|
} else { |
|
|
} else { |
|
|
return rb.setMsg("操作失败!提交的数据不一致"); |
|
|
return rb.setMsg("操作失败!提交的数据不一致"); |
|
|
@ -641,6 +721,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal |
|
|
if (businessTaskId.equals(query.getTaskId())) { |
|
|
if (businessTaskId.equals(query.getTaskId())) { |
|
|
FlowTaskVo flowTaskVo = new FlowTaskVo(); |
|
|
FlowTaskVo flowTaskVo = new FlowTaskVo(); |
|
|
BeanUtil.copyProperties(query, flowTaskVo); |
|
|
BeanUtil.copyProperties(query, flowTaskVo); |
|
|
|
|
|
Map<String,Object> appMap = new HashMap<>(); |
|
|
|
|
|
appMap.put("sid",query.getBusinessSid()); |
|
|
|
|
|
flowTaskVo.getValues().put("app",appMap); |
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo); |
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo); |
|
|
if (!resultBean.getSuccess()) { |
|
|
if (!resultBean.getSuccess()) { |
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
@ -648,6 +731,31 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal |
|
|
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData()); |
|
|
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData()); |
|
|
//更新业务中的流程相关的参数
|
|
|
//更新业务中的流程相关的参数
|
|
|
updateFlowFiled(map); |
|
|
updateFlowFiled(map); |
|
|
|
|
|
|
|
|
|
|
|
//极光推送
|
|
|
|
|
|
UpdateFlowFieldVo ufVo = resultBean.getData(); |
|
|
|
|
|
String businessSid = query.getBusinessSid(); |
|
|
|
|
|
baseInternalPurchase = fetchBySid(businessSid); |
|
|
|
|
|
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); |
|
|
|
|
|
MessageFlowVo messageFlowVo = new MessageFlowVo(); |
|
|
|
|
|
BeanUtil.copyProperties(ufVo,messageFlowVo); |
|
|
|
|
|
String procId = baseInternalPurchase.getProcInstId(); |
|
|
|
|
|
ufVo.setProcInsId(procId); |
|
|
|
|
|
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(baseInternalPurchase.getCreateBySid())){ |
|
|
|
|
|
messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交"); |
|
|
|
|
|
}else{ |
|
|
|
|
|
messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
messageFlowableQuery.setMsgTitle("供应链"); |
|
|
|
|
|
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); |
|
|
return rb.success(); |
|
|
return rb.success(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -729,9 +837,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal |
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
map.put("modelSid", modelSid); |
|
|
map.put("modelSid", modelSid); |
|
|
map.put("configSid", configSid); |
|
|
map.put("configSid", configSid); |
|
|
map.put("selectType",0); |
|
|
map.put("selectType", 0); |
|
|
appSubVersionVo.setJson(JSONObject.toJSONString(map)); |
|
|
appSubVersionVo.setJson(JSONObject.toJSONString(map)); |
|
|
BeanUtil.copyProperties(appSubVersionVo,appVehicleVersionVo); |
|
|
BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo); |
|
|
appCompanyShuntingListVo.setCarDetailPage(appVehicleVersionVo); |
|
|
appCompanyShuntingListVo.setCarDetailPage(appVehicleVersionVo); |
|
|
appCompanyShuntingListVo.setEditVin("调入".equals(vo.getShuntingTypeValue())); |
|
|
appCompanyShuntingListVo.setEditVin("调入".equals(vo.getShuntingTypeValue())); |
|
|
appCompanyShuntingListVo.setEditPrice("调出".equals(vo.getShuntingTypeValue())); |
|
|
appCompanyShuntingListVo.setEditPrice("调出".equals(vo.getShuntingTypeValue())); |
|
|
|
