diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index f8b345174a..900e3c4d32 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -817,6 +817,8 @@ public class BusDeliveredApplyService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为销售专员 + variables.put("isAdj", busDeliveredApply.getCreateBySid().equals(busDeliveredApply.getStaffUserSid())); //若app移动端有此功能,则传递appMap参数 Map appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index a12444aa46..c01d52a1ee 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -330,9 +330,6 @@ public class InvoicedService { registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); } } - if (StringUtils.isNotBlank(data.getOneBillMoney())){ - billApplicationIInfoVo.setInvoiceTotal(new BigDecimal(data.getOneBillMoney()).multiply(new BigDecimal(busBillVehicleVos.size())).toString()); - } billApplicationIInfoVo.setCarBuyContractImages(appCarBuyContractImages); billApplicationIInfoVo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages); billApplicationIInfoVo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages); @@ -342,6 +339,9 @@ public class InvoicedService { if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { billApplicationIInfoVo.setIsCanEdit(false); billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); + if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){ + billApplicationIInfoVo.setInvoiceTotal(new BigDecimal(busSalesOrderIsDTKPJVo.getOneBillMoney()).multiply(new BigDecimal(busBillVehicleVos.size())).toString()); + } } else { billApplicationIInfoVo.setIsCanEdit(true); }