yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

移动端调车流程修改

master
dimengzhe 3 years ago
parent
735e14714e
commit
404b01944c
3 changed files with 114 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 105
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
  2. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingDto.java
  3. 19
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java

105
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
View File

@ -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.flowtask.FlowTaskFeign;
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.sqloperationsymbol.BusinessVariables;
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.result.ResultBean;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -122,6 +126,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
private BaseVehmodelConfigService baseVehmodelConfigService;
@Autowired
private AppSubsetVersionFeign appSubsetVersionFeign;
@Autowired
private MessageFeign messageFeign;
private QueryWrapper<BaseInternalPurchase> createQueryWrapper(BaseInternalPurchaseQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -342,6 +348,19 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
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;
}
@ -437,6 +456,11 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
}
}
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);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -503,6 +527,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());
} else {
@ -561,11 +600,30 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
bv.setNextNodeUserSids(substring);
}
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);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
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());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
@ -595,11 +653,30 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
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);
if (!resultBean1.getSuccess()) {
return rb.setMsg(resultBean1.getMsg());
}
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());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
@ -641,6 +718,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new 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);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -648,6 +728,31 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
//更新业务中的流程相关的参数
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();
}
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingDto.java
View File

@ -1,13 +1,11 @@
package com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingList;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.List;
/**
* @Author dimengzhe
@ -37,7 +35,9 @@ public class CompanyShuntingDto implements Dto {
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误：businessSid")
private String businessSid;
private List<CompanyShuntingList> json;
// private List<CompanyShuntingList> json;
private String json;
}

19
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java
View File

@ -1,6 +1,8 @@
package com.yxt.anrui.terminal.biz.supplychain.companyShunting;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.yxt.anrui.base.api.baseinternalpurchase.AppCompanyShuntingVo;
import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign;
import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseCompleteDto;
@ -11,7 +13,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingList;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingVo;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingDto;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingQuery;
@ -24,7 +25,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @Author dimengzhe
@ -79,16 +79,9 @@ public class CompanyShuntingService {
public ResultBean upDateAgreeCompanyShuntingInfo(CompanyShuntingDto dto) {
ResultBean rb = ResultBean.fireFail();
List<CompanyShuntingList> list = dto.getJson();
if (list.isEmpty()) {
return rb.setMsg("车辆list不能为空");
}
List<Map<String, Object>> dataList = list.stream().map(companyShuting -> {
Map<String, Object> map = new HashMap<>();
map.put("sid", companyShuting.getSid());
map.put("guidedPrice", companyShuting.getGuidedPrice());
return map;
}).collect(Collectors.toList());
String json = dto.getJson();
List<Map<String, Object>> list2 = JSON.parseObject(json, new TypeReference<List<Map<String, Object>>>() {
});
Map<String, Object> map = new HashMap<>();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
@ -104,7 +97,7 @@ public class CompanyShuntingService {
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto();
BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto);
map.put("baseInternalPurchaseVehicles", dataList);
map.put("baseInternalPurchaseVehicles", list2);
baseInterNalPurchaseCompleteDto.setFormVariables(map);
baseInterNalPurchaseCompleteDto.setOrgSidPath(orgSidPath);
ResultBean resultBean = baseInternalPurchaseFeign.complete(baseInterNalPurchaseCompleteDto);

Write Preview
Loading…
Cancel
Save