diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDetailsVo.java index ce3a66567a..273eb8812b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDetailsVo.java @@ -81,6 +81,10 @@ public class BusValcustFilingDetailsVo implements Vo { private String isGdk; @ApiModelProperty("加装配置/销售让利金额") private String money; // 加装配置/销售让利金额 + @ApiModelProperty("合计加装配置/销售让利金额") + private String totalMoney; // 合计加装配置/销售让利金额 + @ApiModelProperty("台数") + private String num; @ApiModelProperty("应收手续费") private String ysMoney; // 应收手续费 @ApiModelProperty("实收手续费") 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 5ac4fc7c25..4a59c7456a 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 @@ -824,6 +824,8 @@ public class BusDeliveredApplyService extends MybatisBaseService variables = new HashMap<>(); //判断发起人是否为销售专员 variables.put("isAdj", busDeliveredApply.getCreateBySid().equals(busDeliveredApply.getStaffUserSid())); + //判断是否为贷款业务 + variables.put("isDk", "2".equals(busDeliveredApply.getPaymentMethodKey())); //若app移动端有此功能,则传递appMap参数 Map appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 @@ -1592,6 +1594,8 @@ public class BusDeliveredApplyService extends MybatisBaseService variables = new HashMap<>(); //判断发起人是否为销售专员 variables.put("isAdj", busDeliveredApply.getCreateBySid().equals(busDeliveredApply.getStaffUserSid())); + //判断是否为贷款业务 + variables.put("isDk", "2".equals(busDeliveredApply.getPaymentMethodKey())); //若app移动端有此功能,则传递appMap参数 Map appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 @@ -1654,6 +1658,8 @@ public class BusDeliveredApplyService extends MybatisBaseService variables = new HashMap<>(); //判断发起人是否为销售专员 variables.put("isAdj", busDeliveredApply.getCreateBySid().equals(busDeliveredApply.getStaffUserSid())); + //判断是否为贷款业务 + variables.put("isDk", "2".equals(busDeliveredApply.getPaymentMethodKey())); //若app移动端有此功能,则传递appMap参数 Map appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 @@ -1719,6 +1725,8 @@ public class BusDeliveredApplyService extends MybatisBaseService variables = new HashMap<>(); //判断发起人是否为销售专员 variables.put("isAdj", busDeliveredApply.getCreateBySid().equals(busDeliveredApply.getStaffUserSid())); + //判断是否为贷款业务 + variables.put("isDk", "2".equals(busDeliveredApply.getPaymentMethodKey())); //若app移动端有此功能,则传递appMap参数 Map appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 @@ -2752,6 +2760,8 @@ public class BusDeliveredApplyService extends MybatisBaseService appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java index 3b5521fd9c..a81c4dcb5a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java @@ -317,6 +317,8 @@ public class BusValcustFilingService extends MybatisBaseService busFileDtos = busFileService.getPathByLinkSid(sid); List fjImages = new ArrayList<>(); for (BusFileDto busFileDto : busFileDtos) { diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 5694f1875d..78b17d6f04 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -34,7 +34,7 @@ public enum ProcDefEnum { BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"), BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"), // BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:10:1700004"), - BUSDELIVEREDAPPLY("出库申请", "process_30ixry76:1:5320004"), + BUSDELIVEREDAPPLY("出库申请", "process_30ixry76:2:5357504"), BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"), BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"), SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"), diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/valcustfiling/AppValcustFilingDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/valcustfiling/AppValcustFilingDetailsVo.java index f5bce1d6a1..6c9da605f4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/valcustfiling/AppValcustFilingDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/valcustfiling/AppValcustFilingDetailsVo.java @@ -82,6 +82,12 @@ public class AppValcustFilingDetailsVo implements Vo { private String money; @ApiModelProperty("加装配置/销售让利名称") private String moneyName; + @ApiModelProperty("合计加装配置/销售让利金额") + private String totalMoney; + @ApiModelProperty("合计加装配置/销售让利名称") + private String totalMoneyName; + @ApiModelProperty("台数") + private String num; @ApiModelProperty("应收手续费") private String ysMoney; // 应收手续费 @ApiModelProperty("实收手续费") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/valcustfiling/AppValcustFilingService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/valcustfiling/AppValcustFilingService.java index 70e5931d28..69babcff36 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/valcustfiling/AppValcustFilingService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/valcustfiling/AppValcustFilingService.java @@ -100,9 +100,11 @@ public class AppValcustFilingService { BeanUtil.copyProperties(busValcustFilingDetailsVo, vo); vo.setProcInsId(busValcustFilingDetailsVo.getProcInstId()); if ("0".equals(busValcustFilingDetailsVo.getIsGdk())){ - vo.setMoneyName("加装配置金额(元):"); + vo.setMoneyName("单台加装配置金额(元):"); + vo.setTotalMoneyName("合计加装配置金额(元):"); }else { - vo.setMoneyName("销售让利金额(元):"); + vo.setMoneyName("单台销售让利金额(元):"); + vo.setTotalMoneyName("合计销售让利金额(元):"); } return rb.success().setData(vo); }