From 30637b877544dbaecadd75f3a813e6dd106b0258 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 12 Aug 2022 19:23:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E5=AE=8C=E5=96=84+=E6=8E=92=E4=BA=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B7=BB=E5=8A=A0=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusVehicleApplyService.java | 151 +++++++++--------- .../api/bussalesorder/BusSalesOrderFeign.java | 2 + .../app/order/AppBusSaleOrderStateVo.java | 9 ++ .../app/order/AppOrderDepositInfoVo.java | 2 + .../app/order/AppOrderDetailsVo.java | 14 ++ .../flowable/BusSaleOrderNodeQuery.java | 1 + .../BusSalesOrderSubmitDto.java | 3 + .../biz/bussalesorder/BusSalesOrderMapper.xml | 8 +- .../bussalesorder/BusSalesOrderService.java | 12 +- .../BusSalesOrderDepositMapper.xml | 2 +- .../BusSalesOrderDepositService.java | 3 +- .../BusSalesOrderSubmitMapper.java | 2 + .../BusSalesOrderSubmitMapper.xml | 9 ++ .../BusSalesOrderSubmitService.java | 46 ++++-- .../portal/biz/flow/FlowableService.java | 18 ++- .../saleOrders/flowable/OrderSubmitDto.java | 2 + .../saleOrders/order/OrderDepositInfoVo.java | 3 + .../saleOrders/order/OrderDetailsVo.java | 13 ++ .../saleOrders/order/OrderDiscountListVo.java | 2 +- .../saleOrders/order/OrderStateVo.java | 10 ++ 20 files changed, 206 insertions(+), 106 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.xml diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 1e8cac8f2b..d8936694b0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -33,6 +33,8 @@ 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.sysprourl.SysProUrlFeign; +import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -42,26 +44,21 @@ 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.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.JPushServer; 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.AppMessageDto; import com.yxt.messagecenter.api.message.MessageFeign; -import com.yxt.messagecenter.api.messagelist.MessageListDto; +import com.yxt.messagecenter.api.message.MessageFlowableDto; +import com.yxt.messagecenter.api.message.MessageJsonDto; import com.yxt.messagecenter.api.messagelist.MessageListFeign; import com.yxt.messagecenter.api.messagetype.MessageTypeFeign; -import com.yxt.messagecenter.api.messagetype.MessageTypeVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; import java.util.stream.Collectors; /** @@ -110,6 +107,8 @@ public class BusVehicleApplyService extends MybatisBaseService stringList = Arrays.asList(nextSid.split(",")); - //根据用户的sid查询用户的id - ResultBean stringList1 = sysUserFeign.selectIdBySid(stringList); - List stringList2 = Arrays.asList(stringList1.getData().split(",")); - //标题、内容、消息类别key、消息类别名称、 - String msgSid = getMessage(stringList); - for (int i = 0; i < stringList2.size(); i++) { - JPushServer.sendPushAlias("排产申请审批", busVehicleApply.getCreateByName() + "的排产申请", "msg_type", "审批中心", stringList2.get(i)); - } - - - } - - public String getMessage(List list) { - //1、buttons:int[]{3,4,5}、taskId、taskName、procInsId、taskDefKey - //根据taskDefKey、流程标识、以及 - - - // 1、保存消息体 - AppMessageDto messageDto = new AppMessageDto(); - ResultBean> messageBean = messageTypeFeign.selectAppMsgTypeList("0002"); - if (messageBean.getSuccess() && messageBean.getData() != null) { - List typeVoList = messageBean.getData(); - for (MessageTypeVo message : typeVoList) { - if (message.getMsgType().equals("审批中心")) { - messageDto.setMsgTypeSid(message.getMsgTypeSid()); - messageDto.setMsgType(message.getMsgType()); - } - } - } - messageDto.setMsgTitle("排产申请审批"); - messageDto.setMsgContent("排产申请审批"); - messageDto.setMsgSource("排产"); - String msgSid = messageFeign.saveOrUpdateAppMessage(messageDto).getData(); - String msgTypeSid = messageDto.getMsgTypeSid(); - // 2、保存至消息列表 - // 使用多线程保存 - List> futures = new ArrayList>(); - ExecutorService executor = Executors.newFixedThreadPool(4); - for (String receverSid : list) { - Future f = executor.submit(new Runnable() { - @Override - public void run() { - try { - System.out.println("run start-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName()); - MessageListDto messageList = new MessageListDto(); - messageList.setMsgSid(msgSid); - messageList.setRDelStatus(0); - messageList.setSDelStatus(0); - messageList.setReceiverSid(receverSid); - messageListFeign.save(messageList); - System.out.println("run end-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName()); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - futures.add(f); - } - executor.shutdown(); - return msgSid; - } - /** * 判断提交的流程是否被允许 * @@ -503,8 +437,12 @@ public class BusVehicleApplyService extends MybatisBaseService variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); //根据业务sid查询排产信息 variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0); bv.setFormVariables(variables); @@ -513,6 +451,7 @@ public class BusVehicleApplyService extends MybatisBaseService variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); //根据业务sid查询排产信息 variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0); flowTaskVo.setValues(variables); @@ -656,9 +598,11 @@ public class BusVehicleApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); + UpdateFlowFieldVo ufVo = resultBean.getData(); + Map map = BeanUtil.beanToMap(ufVo); //更新业务中的流程相关的参数 updateFlowFiled(map); + String msgSid = getMessage(ufVo, appMap, busVehicleApply); return rb.success(); } } @@ -766,4 +710,53 @@ public class BusVehicleApplyService extends MybatisBaseService appMap, BusVehicleApply busVehicleApply) { + //=====极光推送信息========================================参数组装 + List receiveSidList = Arrays.asList(ufVo.getNextNodeUserSids().split(",")); + //根据用户的sid查询用户的id + ResultBean stringList1 = sysUserFeign.selectIdBySid(receiveSidList); + List reveiveIdList = Arrays.asList(stringList1.getData().split(",")); + MessageFlowableDto messageFlowableDto = new MessageFlowableDto(); + MessageJsonDto messageJsonDto = new MessageJsonDto(); + BeanUtil.copyProperties(ufVo, messageJsonDto); + //查询流程审批的页面操作地址组装json的参数 + //根据taskDef和移动端标识 + ResultBean selectUrlByKey = sysProUrlFeign.selectUrlByKey(ProcDefEnum.VEHICLEAPPLY.getProDefId(), ufVo.getTaskDefKey(), "1", "2"); + SysProUrlVo sysProUrlVo = selectUrlByKey.getData(); + messageFlowableDto.setBusinessSid(busVehicleApply.getSid()); + messageFlowableDto.setApp_type("2"); + if (sysProUrlVo.getUrl().contains("#")) { + messageFlowableDto.setModuleAction(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(0)); + List codesInteger = Arrays.asList(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(1).split(",")).stream().map(Integer::parseInt).collect(Collectors.toList()); + int[] ints = codesInteger.stream().mapToInt(Integer::valueOf).toArray(); + ; + messageJsonDto.setButtons(ints); + } else { + messageFlowableDto.setModuleAction(sysProUrlVo.getUrl()); + } + messageFlowableDto.setModuleSid(Arrays.asList(sysProUrlVo.getModulePluginName().split("#")).get(0)); + messageJsonDto.setTaskName(ufVo.getNodeState()); + messageJsonDto.setProcInsId(ufVo.getProcInsId()); + messageJsonDto.setAppMap(appMap); + messageFlowableDto.setJson(messageJsonDto); + messageFlowableDto.setList(receiveSidList); + messageFlowableDto.setReceiveIdList(reveiveIdList); + messageFlowableDto.setModuleName("排产申请"); + messageFlowableDto.setMsgContent("排产申请"); + messageFlowableDto.setMsgTitle("排产申请"); + messageFlowableDto.setCreateName(busVehicleApply.getCreateByName()); + ResultBean stringResultBean = messageFeign.getMessage(messageFlowableDto); + String msgSid = stringResultBean.getData(); + return msgSid; + + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 5e53558e23..ef9d61f019 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -115,10 +115,12 @@ public interface BusSalesOrderFeign { @ApiOperation(value = "获取上一个环节") @GetMapping(value = "/getPreviousNodesForReject") + @ResponseBody ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap BusSaleOrderNodeQuery query); @ApiOperation(value = "获取下一个环节") @GetMapping(value = "/getNextNodesForSubmit") + @ResponseBody ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap BusSaleOrderNodeQuery query); /*-------------------------------------App销售订单接口------------------------------------------------*/ diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSaleOrderStateVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSaleOrderStateVo.java index 4710a1dacf..d4840eef0d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSaleOrderStateVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSaleOrderStateVo.java @@ -61,4 +61,13 @@ public class AppBusSaleOrderStateVo implements Vo { @ApiModelProperty("客户名称") private String customerName; + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("流程id") + private String procInsId; + + @ApiModelProperty("任务id") + private String taskId; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDepositInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDepositInfoVo.java index e609b5a7e1..d7fee415c2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDepositInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDepositInfoVo.java @@ -25,4 +25,6 @@ public class AppOrderDepositInfoVo implements Vo { @ApiModelProperty(value = "订金sid:后端内部使用") private String sid; + @ApiModelProperty(value = "订金交纳方式") + private String type; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java index d8a01568e2..1048256f47 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java @@ -65,4 +65,18 @@ public class AppOrderDetailsVo implements Vo { @ApiModelProperty(value = "销售部门sid") private String orgSid; + + @ApiModelProperty("是否有保险信息") + private Boolean insuranceState; + + @ApiModelProperty("是否有保险说明") + private Boolean remarksState; + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("流程实例id") + private String procInsId; + + @ApiModelProperty("任务id") + private String taskId; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/BusSaleOrderNodeQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/BusSaleOrderNodeQuery.java index a8770f1a2d..bca3058345 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/BusSaleOrderNodeQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/BusSaleOrderNodeQuery.java @@ -20,4 +20,5 @@ public class BusSaleOrderNodeQuery implements Query { private String taskDefKey; @ApiModelProperty(value = "业务sid") private String businessSid; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java index b34b61b020..6b736579c7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java @@ -37,5 +37,8 @@ public class BusSalesOrderSubmitDto implements Dto { @ApiModelProperty(value = "数量") private Integer num; + @ApiModelProperty("返利备注") + private String remarks; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index aab191ac94..b0639aab8a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -54,7 +54,7 @@ case bo.isInsurance when 0 then '否' when 1 then '是' end as insuranceInfo, - if(bo.state = '2', true, false) as showContractBtn, + if(bo.nodeState = '已办结', true, false) as showContractBtn, bo.nodeState is null as showUpdateBtn, bo.nodeState is null as showDeleteBtn, 0 as showFinancialBtn @@ -149,7 +149,11 @@ bs.remarks, bs.userSid as recommenderSid, bs.name as recommender, - bs.distributorPrice as agencyFee + bs.distributorPrice as agencyFee, + bs.distributorName intermediaryName, + bs.distributorMobile intermediaryMobile, + bs.distributorSid intermediarySid, + bo.customerPhoto mobile from bus_sales_order bo left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid 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 e48094c756..b652884928 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 @@ -1027,6 +1027,9 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = sysStaffOrgFeign.getOrgSidBySid(vo.getOrgSid()); if (!"0".equals(resultBean.getData())) { @@ -2380,10 +2388,10 @@ public class BusSalesOrderService extends MybatisBaseService getOrderMap(BusSalesOrder busSalesOrder) { Map variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid", busSalesOrder.getSid()); + appMap.put("saleOrderSid", busSalesOrder.getSid()); variables.put("app", appMap); //是否是全款 - variables.put("isLoan", "01".equals(busSalesOrder.getPayTypeKey())); + variables.put("isLoan", "1".equals(busSalesOrder.getPayTypeKey())); //查询是否超权限 BusSalesOrderPowerVo busSalesOrderPowerVo = isHavePower(busSalesOrder.getSid()); //销售部经理是否超权限 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml index 5eacd68a63..6c8e4bbf81 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml @@ -71,7 +71,7 @@ diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java index cbb22d2be0..5eae998c6f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java @@ -260,8 +260,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService { + + BusSalesOrderSubmit seletByOrderSid(String businessSid); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.xml new file mode 100644 index 0000000000..5e9320b8ca --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java index 81f3ef8824..c7c5ac23a3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java @@ -18,21 +18,41 @@ import java.math.BigDecimal; public class BusSalesOrderSubmitService extends MybatisBaseService { public void saveOrderSubmit(BusSalesOrderSubmitDto busSalesOrderSubmitDto, String businessSid) { if (busSalesOrderSubmitDto != null) { - BusSalesOrderSubmit busSalesOrderSubmit1 = new BusSalesOrderSubmit(); - BeanUtil.copyProperties(busSalesOrderSubmitDto, busSalesOrderSubmit1, "sid"); - BigDecimal priceBig = new BigDecimal("0"); - BigDecimal priceAll = new BigDecimal("0"); - if (StringUtils.isNotBlank(busSalesOrderSubmitDto.getDistributorPrice())) { - priceBig = new BigDecimal(busSalesOrderSubmitDto.getDistributorPrice()); - busSalesOrderSubmit1.setDistributorPrice(priceBig); + //查询该销售订单是否有提交信息 + BusSalesOrderSubmit busSalesOrderSubmit = baseMapper.seletByOrderSid(businessSid); + if (busSalesOrderSubmit == null) { + busSalesOrderSubmit = new BusSalesOrderSubmit(); + BeanUtil.copyProperties(busSalesOrderSubmitDto, busSalesOrderSubmit, "sid"); + BigDecimal priceBig = new BigDecimal("0"); + BigDecimal priceAll = new BigDecimal("0"); + if (StringUtils.isNotBlank(busSalesOrderSubmitDto.getDistributorPrice())) { + priceBig = new BigDecimal(busSalesOrderSubmitDto.getDistributorPrice()); + busSalesOrderSubmit.setDistributorPrice(priceBig); + } + if (StringUtils.isNotBlank(busSalesOrderSubmitDto.getDistributorPriceAll())) { + priceAll = new BigDecimal(busSalesOrderSubmitDto.getDistributorPriceAll()); + busSalesOrderSubmit.setDistributorPriceAll(priceAll); + } + busSalesOrderSubmit.setSalesOrderSid(businessSid); + save(busSalesOrderSubmit); + } else { + BeanUtil.copyProperties(busSalesOrderSubmitDto, busSalesOrderSubmit); + BigDecimal priceBig = new BigDecimal("0"); + BigDecimal priceAll = new BigDecimal("0"); + if (StringUtils.isNotBlank(busSalesOrderSubmitDto.getDistributorPrice())) { + priceBig = new BigDecimal(busSalesOrderSubmitDto.getDistributorPrice()); + busSalesOrderSubmit.setDistributorPrice(priceBig); + + } + if (StringUtils.isNotBlank(busSalesOrderSubmitDto.getDistributorPriceAll())) { + priceAll = new BigDecimal(busSalesOrderSubmitDto.getDistributorPriceAll()); + busSalesOrderSubmit.setDistributorPriceAll(priceAll); + } + busSalesOrderSubmit.setSalesOrderSid(businessSid); + updateById(busSalesOrderSubmit); } - if (StringUtils.isNotBlank(busSalesOrderSubmitDto.getDistributorPriceAll())) { - priceAll = new BigDecimal(busSalesOrderSubmitDto.getDistributorPriceAll()); - busSalesOrderSubmit1.setDistributorPriceAll(priceAll); - } - busSalesOrderSubmit1.setSalesOrderSid(businessSid); - save(busSalesOrderSubmit1); + } } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java index 7867178740..e6086bf14a 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java @@ -549,10 +549,11 @@ public class FlowableService extends MybatisBaseService integers = appVer.get(key); for (int i = 0; i < integers.size(); i++) { + Integer integer = integers.get(i); String path = fileUploadComponent.getUrlPrefix(); - voList.get(i).getAppVariables().setPath(path+appSubsetVersions.getUpdateUrl()); - voList.get(i).getAppVariables().setModuleVersion(appSubsetVersions.getVersionCode()); - voList.get(i).getAppVariables().setModulePluginName(appSubsetVersions.getModulePluginName()); + voList.get(integer).getAppVariables().setPath(path+appSubsetVersions.getUpdateUrl()); + voList.get(integer).getAppVariables().setModuleVersion(appSubsetVersions.getVersionCode()); + voList.get(integer).getAppVariables().setModulePluginName(appSubsetVersions.getModulePluginName()); } } } @@ -560,6 +561,8 @@ public class FlowableService extends MybatisBaseService integers = appVer.get(key); for (int i = 0; i < integers.size(); i++) { + Integer integer = integers.get(i); String path = fileUploadComponent.getUrlPrefix(); - voList.get(i).getAppVariables().setPath(path+appSubsetVersions.getUpdateUrl()); - voList.get(i).getAppVariables().setModuleVersion(appSubsetVersions.getVersionCode()); - voList.get(i).getAppVariables().setModulePluginName(appSubsetVersions.getModulePluginName()); + voList.get(integer).getAppVariables().setPath(path+appSubsetVersions.getUpdateUrl()); + voList.get(integer).getAppVariables().setModuleVersion(appSubsetVersions.getVersionCode()); + voList.get(integer).getAppVariables().setModulePluginName(appSubsetVersions.getModulePluginName()); } } } @@ -644,6 +648,8 @@ public class FlowableService extends MybatisBaseService