|
|
|
@ -2,14 +2,25 @@ package com.yxt.anrui.terminal.biz.autoservice.deliveryConfirm; |
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
import com.yxt.anrui.buscenter.api.busdeliveredapply.*; |
|
|
|
import com.yxt.anrui.buscenter.api.bushandover.*; |
|
|
|
import com.yxt.anrui.buscenter.api.bushandover.app.*; |
|
|
|
import com.yxt.anrui.buscenter.api.bushandover.flow.BusHandoverCompleteDto; |
|
|
|
import com.yxt.anrui.buscenter.api.bushandover.flow.BusHandoverTaskQuery; |
|
|
|
import com.yxt.anrui.buscenter.api.bushandover.flow.SubmitBusHandoverDto; |
|
|
|
import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsQuery; |
|
|
|
import com.yxt.anrui.buscenter.api.bushandoveritems.BusHandoverItemsVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitFeign; |
|
|
|
import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitQuery; |
|
|
|
import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitVo; |
|
|
|
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.autoservice.deliveryConfirm.*; |
|
|
|
import com.yxt.anrui.terminal.api.autoservice.deliveryConfirm.flowable.CompleteDeliveryConfirmDto; |
|
|
|
import com.yxt.anrui.terminal.api.autoservice.deliveryConfirm.flowable.DeliveryConfirmTaskQuery; |
|
|
|
import com.yxt.anrui.terminal.api.autoservice.deliveryConfirm.flowable.DeliveryFlowableQuery; |
|
|
|
import com.yxt.anrui.terminal.api.autoservice.deliveryConfirm.flowable.SubmitDeliveryConfirmDto; |
|
|
|
import com.yxt.anrui.terminal.config.CoverUtils; |
|
|
|
import com.yxt.common.core.query.PagerQuery; |
|
|
|
import com.yxt.common.core.result.ResultBean; |
|
|
|
@ -18,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Collections; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Optional; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
@ -36,6 +48,10 @@ public class DeliveryConfirmService { |
|
|
|
private BusHandoverFeign busHandoverFeign; |
|
|
|
@Autowired |
|
|
|
private BusHandoverItemsFeign busHandoverItemsFeign; |
|
|
|
@Autowired |
|
|
|
private SysUserFeign sysUserFeign; |
|
|
|
@Autowired |
|
|
|
private SysStaffOrgFeign sysStaffOrgFeign; |
|
|
|
|
|
|
|
public ResultBean<PagerVo<DeliveryConfirmVo>> getDeliveryConfirmNotList(PagerQuery<DeliveryConfirmQuery> pagerQuery) { |
|
|
|
ResultBean<PagerVo<DeliveryConfirmVo>> rb = ResultBean.fireFail(); |
|
|
|
@ -51,39 +67,55 @@ public class DeliveryConfirmService { |
|
|
|
public ResultBean<DeliveryConVo> getDeliveryBill(DeliveryConQuery deliveryConQuery) { |
|
|
|
ResultBean<DeliveryConVo> rb = ResultBean.fireFail(); |
|
|
|
DeliveryConVo vo = new DeliveryConVo(); |
|
|
|
BusHandoverItemsQuery busHandoverItemsQuery = new BusHandoverItemsQuery(); |
|
|
|
BeanUtil.copyProperties(deliveryConQuery, busHandoverItemsQuery); |
|
|
|
ResultBean<BusHandoverItemsVo> resultBean = busHandoverItemsFeign.getDeliveryBill(busHandoverItemsQuery); |
|
|
|
if (resultBean.getSuccess()) { |
|
|
|
BusHandoverItemsVo busHandoverItemsVo = resultBean.getData(); |
|
|
|
BeanUtil.copyProperties(busHandoverItemsVo, vo); |
|
|
|
} else { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
AppDeliveryConQuery query = new AppDeliveryConQuery(); |
|
|
|
BeanUtil.copyProperties(deliveryConQuery, query); |
|
|
|
ResultBean<AppDeliveryConVo> deliveryBill = busHandoverFeign.getDeliveryBill(query); |
|
|
|
if (deliveryBill.getSuccess()) { |
|
|
|
AppDeliveryConVo data = deliveryBill.getData(); |
|
|
|
BeanUtil.copyProperties(data, vo); |
|
|
|
} |
|
|
|
// DeliveryConVo vo = new DeliveryConVo();
|
|
|
|
// BusHandoverItemsQuery busHandoverItemsQuery = new BusHandoverItemsQuery();
|
|
|
|
// BeanUtil.copyProperties(deliveryConQuery, busHandoverItemsQuery);
|
|
|
|
// ResultBean<BusHandoverItemsVo> resultBean = busHandoverItemsFeign.getDeliveryBill(busHandoverItemsQuery);
|
|
|
|
// if (resultBean.getSuccess()) {
|
|
|
|
// BusHandoverItemsVo busHandoverItemsVo = resultBean.getData();
|
|
|
|
// BeanUtil.copyProperties(busHandoverItemsVo, vo);
|
|
|
|
// } else {
|
|
|
|
// return rb.setMsg(resultBean.getMsg());
|
|
|
|
// }
|
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<List<DeliveryBillListVo>> saveDeliverybill(DeliveryDto dto) { |
|
|
|
ResultBean<List<DeliveryBillListVo>> rb = ResultBean.fireFail(); |
|
|
|
BusHandoverDto busHandoverDto = new BusHandoverDto(); |
|
|
|
BeanUtil.copyProperties(dto, busHandoverDto); |
|
|
|
ResultBean<List<BusHandoverListVo>> resultBean = busHandoverFeign.saveDeliverybill(busHandoverDto); |
|
|
|
if(!resultBean.getSuccess()){ |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
List<DeliveryBillListVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveryBillListVo.class)).collect(Collectors.toList()); |
|
|
|
return rb.success().setData(list); |
|
|
|
} |
|
|
|
// public ResultBean<List<DeliveryBillListVo>> saveDeliverybill(DeliveryDto dto) {
|
|
|
|
// ResultBean<List<DeliveryBillListVo>> rb = ResultBean.fireFail();
|
|
|
|
// BusHandoverDto busHandoverDto = new BusHandoverDto();
|
|
|
|
// BeanUtil.copyProperties(dto, busHandoverDto);
|
|
|
|
// ResultBean<List<BusHandoverListVo>> resultBean = busHandoverFeign.saveDeliverybill(busHandoverDto);
|
|
|
|
// if (!resultBean.getSuccess()) {
|
|
|
|
// return rb.setMsg(resultBean.getMsg());
|
|
|
|
// }
|
|
|
|
// List<DeliveryBillListVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveryBillListVo.class)).collect(Collectors.toList());
|
|
|
|
// return rb.success().setData(list);
|
|
|
|
// }
|
|
|
|
|
|
|
|
public ResultBean<PagerVo<DeliveryListVo>> getDeliveryConfirmList(PagerQuery<DeliveryListQuery> pagerQuery) { |
|
|
|
ResultBean<PagerVo<DeliveryListVo>> rb = ResultBean.fireFail(); |
|
|
|
PagerQuery<BusHandoverQuery> pq = CoverUtils.getPagerQuery(pagerQuery); |
|
|
|
ResultBean<PagerVo<BusHandoverVo>> resultBean = busHandoverFeign.getDeliveryConfirmList(pq); |
|
|
|
List<DeliveryListVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveryListVo.class)).collect(Collectors.toList()); |
|
|
|
PagerVo<DeliveryListVo> v = new PagerVo<>(); |
|
|
|
BeanUtil.copyProperties(resultBean.getData(), v); |
|
|
|
v.setRecords(voList); |
|
|
|
return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v); |
|
|
|
PagerQuery<AppDeliveryListQuery> query = new PagerQuery<>(); |
|
|
|
BeanUtil.copyProperties(pagerQuery, query); |
|
|
|
ResultBean<PagerVo<AppDeliveryListVo>> voResultBean = busHandoverFeign.appgetDeliveryConfirmList(query); |
|
|
|
PagerVo<DeliveryListVo> vo = new PagerVo<>(); |
|
|
|
if (voResultBean.getSuccess()) { |
|
|
|
PagerVo<AppDeliveryListVo> data = voResultBean.getData(); |
|
|
|
BeanUtil.copyProperties(data, vo); |
|
|
|
} |
|
|
|
// PagerQuery<BusHandoverQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
|
|
|
|
// ResultBean<PagerVo<BusHandoverVo>> resultBean = busHandoverFeign.getDeliveryConfirmList(pq);
|
|
|
|
// List<DeliveryListVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveryListVo.class)).collect(Collectors.toList());
|
|
|
|
// PagerVo<DeliveryListVo> v = new PagerVo<>();
|
|
|
|
// BeanUtil.copyProperties(resultBean.getData(), v);
|
|
|
|
// v.setRecords(voList);
|
|
|
|
return rb.success().setMsg("当前共查询到" + vo.getTotal() + "条记录").setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<DeliveryInitVo> getDeliveryConfirmInfo(String sid) { |
|
|
|
@ -98,11 +130,13 @@ public class DeliveryConfirmService { |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean save(DeliveryInitDto dto) { |
|
|
|
public ResultBean<String> save(DeliveryInitDto dto) { |
|
|
|
ResultBean<String> rb = ResultBean.fireFail(); |
|
|
|
BusHandoverInitDto busHandoverInitDto = new BusHandoverInitDto(); |
|
|
|
BeanUtil.copyProperties(dto, busHandoverInitDto); |
|
|
|
ResultBean<BusHandoverInitVo> resultBean = busHandoverFeign.saveDeliveryConfirmInfo(busHandoverInitDto); |
|
|
|
return resultBean; |
|
|
|
// ResultBean<BusHandoverInitVo> resultBean = busHandoverFeign.saveDeliveryConfirmInfo(busHandoverInitDto);
|
|
|
|
ResultBean<String> stringResultBean = busHandoverFeign.saveDeliveryConfirmInfo(busHandoverInitDto); |
|
|
|
return rb.success().setData(stringResultBean.getData()); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<DeliveryDetailsVo> details(String sid) { |
|
|
|
@ -116,4 +150,156 @@ public class DeliveryConfirmService { |
|
|
|
BeanUtil.copyProperties(busHandoverDetailsVo, vo); |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 移动端保存确认信息并打印pdf |
|
|
|
* |
|
|
|
* @param dto |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<String> saveDeliverybill(DeliveryDto dto) throws Exception { |
|
|
|
ResultBean<String> rb = ResultBean.fireFail(); |
|
|
|
AppDeliveryDto appDto = new AppDeliveryDto(); |
|
|
|
BeanUtil.copyProperties(dto, appDto); |
|
|
|
ResultBean<String> resultBean = busHandoverFeign.saveDeliverybill(appDto); |
|
|
|
String path = ""; |
|
|
|
if (resultBean.getSuccess()) { |
|
|
|
path = resultBean.getData(); |
|
|
|
} |
|
|
|
return rb.success().setData(path); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean submitDeliveryConfirmInfo(SubmitDeliveryConfirmDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
SubmitBusHandoverDto submitBusHandoverDto = new SubmitBusHandoverDto(); |
|
|
|
BeanUtil.copyProperties(dto, submitBusHandoverDto); |
|
|
|
ResultBean resultBean = busHandoverFeign.submitRecordApplication(submitBusHandoverDto); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean agreeDeliveryConfirmInfo(CompleteDeliveryConfirmDto 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(); |
|
|
|
BusHandoverCompleteDto busHandoverCompleteDto = new BusHandoverCompleteDto(); |
|
|
|
BeanUtil.copyProperties(dto, busHandoverCompleteDto); |
|
|
|
busHandoverCompleteDto.setOrgSidPath(orgSidPath); |
|
|
|
ResultBean resultBean = busHandoverFeign.complete(busHandoverCompleteDto); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
return rb.success().setData(resultBean.getData()); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean rejectDeliveryConfirmInfo(DeliveryConfirmTaskQuery query) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BusHandoverTaskQuery taskQuery = new BusHandoverTaskQuery(); |
|
|
|
BeanUtil.copyProperties(query, taskQuery); |
|
|
|
ResultBean resultBean = busHandoverFeign.taskReject(taskQuery); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
return rb.success().setData(resultBean.getData()); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean recallDeliveryConfirmInfo(DeliveryConfirmTaskQuery query) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BusHandoverTaskQuery taskQuery = new BusHandoverTaskQuery(); |
|
|
|
BeanUtil.copyProperties(query, taskQuery); |
|
|
|
ResultBean resultBean = busHandoverFeign.revokeProcess(taskQuery); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
return rb.success().setData(resultBean.getData()); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean stopDeliveryConfirmInfo(DeliveryConfirmTaskQuery query) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
BusHandoverTaskQuery taskQuery = new BusHandoverTaskQuery(); |
|
|
|
BeanUtil.copyProperties(query, taskQuery); |
|
|
|
ResultBean resultBean = busHandoverFeign.breakProcess(taskQuery); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
return rb.success().setData(resultBean.getData()); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<String> getFlowOperateTitle(DeliveryFlowableQuery query) { |
|
|
|
ResultBean<String> rb = ResultBean.fireFail(); |
|
|
|
//0 上一环节 1下一环节
|
|
|
|
int next = query.getNext(); |
|
|
|
com.yxt.anrui.buscenter.api.bushandover.flow.GetNodeQuery getNodeQuery = new com.yxt.anrui.buscenter.api.bushandover.flow.GetNodeQuery(); |
|
|
|
BeanUtil.copyProperties(query, getNodeQuery); |
|
|
|
String data = ""; |
|
|
|
if (next == 0) { |
|
|
|
ResultBean<List<com.yxt.anrui.buscenter.api.bushandover.flow.GetNodeVo>> getPreviousNodesForReject = busHandoverFeign.getPreviousNodesForReject(getNodeQuery); |
|
|
|
if (getPreviousNodesForReject.getSuccess()) { |
|
|
|
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); |
|
|
|
data = getPreviousNodesForReject.getData().get(0).getName(); |
|
|
|
} else { |
|
|
|
return rb.setMsg(getPreviousNodesForReject.getMsg()); |
|
|
|
} |
|
|
|
} else if (next == 1) { |
|
|
|
ResultBean<List<com.yxt.anrui.buscenter.api.bushandover.flow.GetNodeVo>> getNextNodesForSubmit = busHandoverFeign.getNextNodesForSubmit(getNodeQuery); |
|
|
|
if (getNextNodesForSubmit.getSuccess()) { |
|
|
|
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); |
|
|
|
data = getNextNodesForSubmit.getData().get(0).getName(); |
|
|
|
} else { |
|
|
|
return rb.setMsg(getNextNodesForSubmit.getMsg()); |
|
|
|
} |
|
|
|
} else { |
|
|
|
return rb.setMsg("参数错误：next"); |
|
|
|
} |
|
|
|
return rb.success().setData(data); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 挂车保存交付信息 |
|
|
|
* |
|
|
|
* @param dto |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<String> saveGcBill(GcBillDto dto) { |
|
|
|
ResultBean<String> rb = ResultBean.fireFail(); |
|
|
|
AppGcBillDto appGcBillDto = new AppGcBillDto(); |
|
|
|
BeanUtil.copyProperties(dto, appGcBillDto); |
|
|
|
ResultBean<String> saveGcBill = busHandoverFeign.saveGcBill(appGcBillDto); |
|
|
|
if (saveGcBill.getSuccess()) { |
|
|
|
String data = saveGcBill.getData(); |
|
|
|
return rb.success().setData(data); |
|
|
|
} |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<GcInitVo> getDeliveryConfirmGcInfo(String sid) { |
|
|
|
ResultBean<GcInitVo> rb = ResultBean.fireFail(); |
|
|
|
GcInitVo vo = new GcInitVo(); |
|
|
|
ResultBean<BusHandoverInitVo> deliveryConfirmGcInfo = busHandoverFeign.getDeliveryConfirmGcInfo(sid); |
|
|
|
if (deliveryConfirmGcInfo.getSuccess()) { |
|
|
|
BusHandoverInitVo infoData = deliveryConfirmGcInfo.getData(); |
|
|
|
BeanUtil.copyProperties(infoData, vo); |
|
|
|
} |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<String> saveDeliveryConfirmGcInfo(DeliveryInitDto dto) { |
|
|
|
ResultBean<String> rb = ResultBean.fireFail(); |
|
|
|
BusHandoverInitDto busHandoverInitDto = new BusHandoverInitDto(); |
|
|
|
BeanUtil.copyProperties(dto, busHandoverInitDto); |
|
|
|
ResultBean<String> stringResultBean = busHandoverFeign.saveDeliveryConfirmGcInfo(busHandoverInitDto); |
|
|
|
return rb.success().setData(stringResultBean.getData()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
God
2 years ago