From 7984b6c9ec387cc46a4fc9784cdb5bb6ffb85a35 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 2 Feb 2023 14:23:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractService.java | 2 +- .../api/bussalesorder/BusSalesOrderFeign.java | 8 ++ .../BusSalesOrderFeignFallback.java | 10 +++ .../flowable/BusSalesOrderFlowQuery.java | 1 - .../flowable/OrderFlowableQuery.java | 42 ++++++++++ .../biz/bussalesorder/BusSalesOrderRest.java | 10 +++ .../bussalesorder/BusSalesOrderService.java | 29 +++++++ .../FinCollectionConfirmationService.java | 5 +- .../saleOrders/AppBusSalesOrderFeign.java | 17 +++- .../AppBusSalesOrderFeignFallback.java | 15 +++- .../saleOrders/flowable/SaleOrderQuery.java | 3 + .../saleOrders/flowable/SaleOrderQueryBy.java | 42 ++++++++++ .../saleOrders/order/FlowOrderVo.java | 30 +++++++ .../saleOrders/AppBusSalesOrderRest.java | 15 +++- .../saleOrders/AppBusSalesOrderService.java | 79 ++++++++++++++++--- 15 files changed, 282 insertions(+), 26 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/OrderFlowableQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQueryBy.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/FlowOrderVo.java diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 46af515170..ed1f2ddab9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -2082,7 +2082,7 @@ public class CommonContractService extends MybatisBaseService> getSaleOrdersByOrgPath(@RequestBody PagerQuery pq); + @ApiOperation("App销售订单根据组织机构查询") + @GetMapping("/selectBySid") + @ResponseBody + ResultBean selectBySid(@RequestParam("businessSid") String businessSid); + @ApiOperation(value = "销售支持部经理审批办理（同意）") + @PutMapping("/completeBy") + @ResponseBody + public ResultBean completeBy(@RequestBody OrderFlowableQuery orderFlowableQuery); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index 4173a81cb5..2297913a96 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -239,4 +239,14 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { public ResultBean> getSaleOrdersByOrgPath(PagerQuery pq) { return null; } + + @Override + public ResultBean selectBySid(String businessSid) { + return null; + } + + @Override + public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/BusSalesOrderFlowQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/BusSalesOrderFlowQuery.java index dcf34db5b5..feac9e140f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/BusSalesOrderFlowQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/BusSalesOrderFlowQuery.java @@ -19,7 +19,6 @@ public class BusSalesOrderFlowQuery implements Query { @NotBlank(message = "参数错误：userSid") private String userSid; @ApiModelProperty(value = "用户全路径sid") - @NotBlank(message = "参数错误：orgSidPath") private String orgSidPath; @ApiModelProperty(value = "节点id") @NotBlank(message = "参数错误：taskDefKey") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/OrderFlowableQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/OrderFlowableQuery.java new file mode 100644 index 0000000000..d04e99ae36 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/OrderFlowableQuery.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2023/2/2 13:54 + * @Description + */ +@Data +public class OrderFlowableQuery implements Query { + private static final long serialVersionUID = -8969469601635793219L; + + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "用户全路径sid") + private String orgSidPath; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：instanceId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index 998c39df2a..f715c59f90 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -318,4 +318,14 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { PagerVo pv = busSalesOrderService.getSaleOrdersByOrgPath(pq); return rb.success().setData(pv); } + + @Override + public ResultBean selectBySid(String businessSid) { + return busSalesOrderService.selectBySid(businessSid); + } + + @Override + public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) { + return busSalesOrderService.completeBy(orderFlowableQuery); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 5f08291b6e..90d3f72f51 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -3764,6 +3764,7 @@ public class BusSalesOrderService extends MybatisBaseService pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName()); for (AppBusSalesOrderVo record : pagging.getRecords()) { record.setShowStopBtn(false); + record.setShowContractBtn(false); if (StringUtils.isNotBlank(record.getCustomerImage())) { record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage()); } @@ -3808,4 +3809,32 @@ public class BusSalesOrderService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public ResultBean selectBySid(String businessSid) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrder busSalesOrder = fetchBySid(businessSid); + if(busSalesOrder == null){ + return rb; + } + return rb.success().setData(busSalesOrder); + } + + public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) { + ResultBean rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(orderFlowableQuery, bv); + bv.setModelId(ProcDefEnum.SALESORDER.getProDefId()); + ResultBean resultBean = complete(bv); + if(resultBean.getSuccess()){ + //更新销售订单的采购系统 + //根据销售订单sid更新采购系统sid和采购系统名称 + String purchaseSystemName = orderFlowableQuery.getPurchaseSystemName(); + String purchaseSystemSid = orderFlowableQuery.getPurchaseSystemSid(); + String salesOrderSid = orderFlowableQuery.getBusinessSid(); + updatePurchaseSystem(purchaseSystemName, purchaseSystemSid, salesOrderSid); + }else{ + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 1c9d4eaeba..c694505926 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -703,6 +703,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService> getSaleOrdersByOrgPath(@RequestBody PagerQuery pq); + @ApiOperation("销售支持部经理获取下一环节") + @GetMapping("/getFlowOperateTitleBy") + @ResponseBody + ResultBean getFlowOperateTitleBy(@SpringQueryMap SaleOrderQuery query); + + @ApiOperation("办理") + @PutMapping("/agreeSaleOrderInfoBy") + @ResponseBody + ResultBean agreeSaleOrderInfoBy(@RequestBody SaleOrderQueryBy dto); + + + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java index 025d35dcf4..2c229dca7d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java @@ -31,10 +31,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfo import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositListVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderDto; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderQuery; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderTaskQuery; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SubmitOrderDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*; import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo; @@ -266,4 +263,14 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { public ResultBean> getSaleOrdersByOrgPath(PagerQuery pq) { return null; } + + @Override + public ResultBean getFlowOperateTitleBy(SaleOrderQuery query) { + return null; + } + + @Override + public ResultBean agreeSaleOrderInfoBy(SaleOrderQueryBy dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQuery.java index db06b6b239..e929508a0e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQuery.java @@ -22,4 +22,7 @@ public class SaleOrderQuery implements Query { @ApiModelProperty(value = "0 上一环节 1下一环节") @NotNull(message = "参数错误：next") private Integer next; + + @ApiModelProperty("组织机构全路径") + private String orgPath; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQueryBy.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQueryBy.java new file mode 100644 index 0000000000..77ba5c2ef1 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQueryBy.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2023/2/2 13:47 + * @Description + */ +@Data +public class SaleOrderQueryBy implements Query { + private static final long serialVersionUID = 2845814240351212265L; + + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：procInsId") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/FlowOrderVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/FlowOrderVo.java new file mode 100644 index 0000000000..08f9497e5b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/FlowOrderVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.order; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.terminal.api.base.common.SystemVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/2/2 11:48 + * @Description + */ +@Data +public class FlowOrderVo implements Vo { + private static final long serialVersionUID = -6393160265118686111L; + @ApiModelProperty("操作环节标题") + private String title; + @ApiModelProperty("采购系统下拉框") + private List list; + //默认的采购系统 + @ApiModelProperty("部门sid") + @JsonProperty("dictKey") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + @JsonProperty("dictValue") + private String purchaseSystemName; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index 533c35dfbf..964f8640e8 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java @@ -32,10 +32,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfo import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositListVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderDto; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderQuery; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderTaskQuery; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SubmitOrderDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*; import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo; @@ -354,4 +351,14 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { return appBusSalesOrderService.getSaleOrdersByOrgPath(pq); } + @Override + public ResultBean getFlowOperateTitleBy(SaleOrderQuery query) { + return appBusSalesOrderService.getFlowOperateTitleBy(query); + } + + @Override + public ResultBean agreeSaleOrderInfoBy(SaleOrderQueryBy dto) { + return appBusSalesOrderService.agreeSaleOrderInfoBy(dto); + } + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 05bbca76f0..3f7a7b509c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -27,6 +27,8 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; +import com.yxt.anrui.base.api.basepurchasesystem.AppBasePurchSystemVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; @@ -36,6 +38,7 @@ import com.yxt.anrui.base.api.commoncontract.PrintConfirmVo; import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositFeign; import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderQuery; import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderVo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo; @@ -70,6 +73,8 @@ 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.saleOrders.flowable.*; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.FlowOrderVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoQuery; import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo; @@ -77,10 +82,6 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositList import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountListVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderDto; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderQuery; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SaleOrderTaskQuery; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.SubmitOrderDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo; @@ -95,6 +96,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery; import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo; +import com.yxt.anrui.terminal.api.base.common.SystemVo; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; @@ -153,6 +155,8 @@ public class AppBusSalesOrderService { private CommonContractFeign commonContractFeign; @Autowired private BaseVehicleFeign baseVehicleFeign; + @Autowired + private BasePurchaseSystemFeign basePurchaseSystemFeign; /************************************* 销售订单接口 *********************************************/ @@ -194,8 +198,6 @@ public class AppBusSalesOrderService { /** * 初始化销售订单单据信息 * - * @param saleOrderSid - * @param userSid * @return */ public ResultBean getBillInfo(OrderInitQuery orderInitQuery) { @@ -564,7 +566,7 @@ public class AppBusSalesOrderService { PrintConfirmDto printConfirmDto = new PrintConfirmDto(); BeanUtil.copyProperties(insuranceDto, printConfirmDto); ResultBean> resultBean = commonContractFeign.printConfirm(printConfirmDto); - if(!resultBean.getSuccess()){ + if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()).setCode(resultBean.getCode()).setMessage(resultBean.getMessage()); } List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InsurancePrintVo.class)).collect(Collectors.toList()); @@ -602,7 +604,7 @@ public class AppBusSalesOrderService { public ResultBean deleteVirtualDepositList(String saleOrderSid, String virtualOrderSid, String depositRecordSid) { ResultBean rb = ResultBean.fireFail(); ResultBean resultBean = busSalesOrderFeign.deleteVirtualDepositList(saleOrderSid, virtualOrderSid, depositRecordSid); - if(!resultBean.getSuccess()){ + if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } return rb.success(); @@ -611,13 +613,13 @@ public class AppBusSalesOrderService { public ResultBean getOrderRemarksInfo(String saleOrderSid) { ResultBean rb = ResultBean.fireFail(); ResultBean resultBean = busSalesOrderFeign.getOrderRemarksInfo(saleOrderSid); - if(!resultBean.getSuccess()){ + if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } RemarksVo remarksVo = new RemarksVo(); OrderRemarksVo orderRemarksVo = resultBean.getData(); - if(orderRemarksVo != null){ - BeanUtil.copyProperties(orderRemarksVo,remarksVo); + if (orderRemarksVo != null) { + BeanUtil.copyProperties(orderRemarksVo, remarksVo); } return rb.success().setData(remarksVo); } @@ -629,4 +631,59 @@ public class AppBusSalesOrderService { PagerVo vo = CoverUtils.selectPagerVo(resultBean.getData()); return rb.success().setMsg("当前共查询到" + vo.getTotal() + "条记录").setData(vo); } + + public ResultBean getFlowOperateTitleBy(SaleOrderQuery query) { + ResultBean rb = ResultBean.fireFail(); + FlowOrderVo flowOrderVo = new FlowOrderVo(); + //0 上一环节 1下一环节 + int next = query.getNext(); + BusSaleOrderNodeQuery getNodeQuery = new BusSaleOrderNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = busSalesOrderFeign.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> getNextNodesForSubmit = busSalesOrderFeign.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"); + } + flowOrderVo.setTitle(data); + //查询销售订单 + ResultBean busSalesOrderResultBean = busSalesOrderFeign.selectBySid(query.getBusinessSid()); + if (busSalesOrderResultBean.getSuccess()) { + BusSalesOrder busSalesOrder = busSalesOrderResultBean.getData(); + flowOrderVo.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName()); + flowOrderVo.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid()); + //查询该分公司下的采购系统 + if (StringUtils.isNotBlank(query.getOrgPath())) { + ResultBean> resultBean = basePurchaseSystemFeign.fetchDetailsByUseOrgPath(query.getOrgPath()); + List list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList()); + flowOrderVo.setList(list); + } + } + return rb.success().setData(flowOrderVo); + } + + public ResultBean agreeSaleOrderInfoBy(SaleOrderQueryBy dto) { + ResultBean rb = ResultBean.fireFail(); + OrderFlowableQuery busSalesOrderFlowQuery = new OrderFlowableQuery(); + BeanUtil.copyProperties(dto, busSalesOrderFlowQuery); + ResultBean resultBean = busSalesOrderFeign.completeBy(busSalesOrderFlowQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } } \ No newline at end of file From 3500b7707c7f074f2db125cf34a48d51ab9621ba Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 2 Feb 2023 14:27:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index c694505926..38d733b32c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -1696,7 +1696,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService Date: Thu, 2 Feb 2023 15:08:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppFinCollectionConfirmationDetailedVo.java | 2 ++ .../FinCollectionConfirmationDetailsVo.java | 2 ++ .../FinCollectionConfirmationService.java | 16 ++++++++++++++++ .../ConfirmationDetailedVo.java | 2 ++ 4 files changed, 22 insertions(+) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java index edacb59ca2..f0e8cef7d1 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java @@ -68,5 +68,7 @@ public class AppFinCollectionConfirmationDetailedVo implements Vo { @ApiModelProperty("采购系统名称") private String purchaseSystemName; + private String reason; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java index ae0edd2edb..e61f4cf205 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java @@ -112,5 +112,7 @@ public class FinCollectionConfirmationDetailsVo implements Vo { @ApiModelProperty("采购系统名称") private String purchaseSystemName; + private String reason; + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 38d733b32c..501bb0c9cd 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -595,6 +595,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetaileds(finSelectedReceivablesDetailedVos); + if(finCollectionConfirmation.getAuditState() ==2){ + String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason(); + finCollectionConfirmationDetailsVo.setReason(confirmationDetails); + }else if(finCollectionConfirmation.getAuditState() == 3){ + String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已确认"; + finCollectionConfirmationDetailsVo.setReason(confirmationDetails); + } return rb.success().setData(finCollectionConfirmationDetailsVo); } @@ -886,6 +893,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService