From 606e83ed513a9f27bfa33812b4069bc8ecefc3e3 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 22 Mar 2023 10:07:13 +0800 Subject: [PATCH 1/2] =?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 --- .../BusSalesOrderReturnVehApplyDetailsVo.java | 4 +- .../bussalesorder/BusSalesOrderService.java | 11 +- .../BusSalesOrderReturnVehApplyService.java | 5 +- .../AppBusSalesOrderReturnVehDto.java | 80 +++++++++++++ .../flowable/OrderRetVehSubmitDto.java | 112 ++++++++++-------- .../flowable/SubmitOrderRetVehDto.java | 7 ++ 6 files changed, 162 insertions(+), 57 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/AppBusSalesOrderReturnVehDto.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyDetailsVo.java index e5baf11a76..000a3262c2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyDetailsVo.java @@ -30,6 +30,8 @@ import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVeh import com.yxt.common.core.vo.Vo; import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -113,5 +115,5 @@ public class BusSalesOrderReturnVehApplyDetailsVo implements Vo { @ApiModelProperty("制单日期") private String creatTime; //制单日期 @ApiModelProperty("退库车辆列表") - private List busSalesOrderReturnVehs; + private List busSalesOrderReturnVehs = new ArrayList<>(); } \ No newline at end of file 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 53e40000e9..5d15657329 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 @@ -1479,11 +1479,14 @@ public class BusSalesOrderService extends MybatisBaseService vinListsVos = appOrderDetailsVo.getModelInfo().getVinListsVos(); + AppOrderModelInfoVo modelInfo = appOrderDetailsVo.getModelInfo(); List vinSids = new ArrayList<>(); - for (VinListsVo vinListsVo : vinListsVos) { - if (StringUtils.isNotBlank(vinListsVo.getVinSid())){ - vinSids.add(vinListsVo.getVinSid()); + if (modelInfo != null){ + List vinListsVos = modelInfo.getVinListsVos(); + for (VinListsVo vinListsVo : vinListsVos) { + if (StringUtils.isNotBlank(vinListsVo.getVinSid())){ + vinSids.add(vinListsVo.getVinSid()); + } } } if (vinSids.size() > 0){ diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java index 095b151911..69dd9f6790 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java @@ -289,6 +289,9 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid", businessSid); + appMap.put("orderSid", businessSid); variables.put("app", appMap); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/AppBusSalesOrderReturnVehDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/AppBusSalesOrderReturnVehDto.java new file mode 100644 index 0000000000..6a702b8d90 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/AppBusSalesOrderReturnVehDto.java @@ -0,0 +1,80 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_buscenter(销售订单退车)
+ * File: BusSalesOrderReturnVehDto.java
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDto
+ * Description: 销售订单退库车辆表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-03-09 14:26:23
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单退库车辆表 数据传输对象", description = "销售订单退库车辆表 数据传输对象") +public class AppBusSalesOrderReturnVehDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("主表sid") + private String mainSid; // 主表sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车身颜色key") + private String carColorKey; // 车身颜色key + @ApiModelProperty("车身颜色value") + private String carColorValue; // 车身颜色value + @ApiModelProperty("合格证状态key") + private String certificateStateKey; // 合格证状态key + @ApiModelProperty("合格证状态value") + private String certificateStateValue; // 合格证状态value + @ApiModelProperty("开票状态key") + private String invoicingStateKey; // 开票状态key + @ApiModelProperty("开票状态value") + private String invoicingStateValue; // 开票状态value + @ApiModelProperty("投保状态key") + private String insureStateKey; // 投保状态key + @ApiModelProperty("投保状态value") + private String insureStateValue; // 投保状态value + @ApiModelProperty("库存状态key") + private String stockStateKey; // 库存状态key + @ApiModelProperty("库存状态value") + private String stockStateValue; // 库存状态value + +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/OrderRetVehSubmitDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/OrderRetVehSubmitDto.java index 360ca4a727..b444fb76fe 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/OrderRetVehSubmitDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/OrderRetVehSubmitDto.java @@ -5,6 +5,9 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * @Author dimengzhe * @Date 2022/8/9 8:58 @@ -14,57 +17,64 @@ import lombok.Data; public class OrderRetVehSubmitDto implements Dto { private static final long serialVersionUID = 6988372341832062114L; - @ApiModelProperty(value = "价格说明") - private String priceRemarks; - @ApiModelProperty(value = "优惠说明") - private String discountRemarks; - @ApiModelProperty(value = "中介名称") - @JsonProperty("intermediaryName") - private String distributorName; - @JsonProperty("intermediaryMobile") - @ApiModelProperty(value = "联系电话") - private String distributorMobile; - - @ApiModelProperty(value = "中介单位sid") - @JsonProperty("intermediarySid") - private String distributorSid; - @ApiModelProperty(value = "单车中介服务费") - @JsonProperty("agencyFee") - private String distributorPrice; - @ApiModelProperty(value = "内部引荐人") - @JsonProperty("recommender") - private String name; - @ApiModelProperty(value = "内部引荐人sid") - @JsonProperty("recommenderSid") - private String userSid; - @ApiModelProperty(value = "数量") - @JsonProperty("number") - private Integer num; + private String sid; // sid - @ApiModelProperty("中介返利备注") + @ApiModelProperty(value = "备注") private String remarks; - - @ApiModelProperty(value = "中介名称") - @JsonProperty("intermediaryName2") - private String distributorNameTwo; - @JsonProperty("intermediaryMobile2") - @ApiModelProperty(value = "联系电话") - private String distributorMobileTwo; - - @ApiModelProperty(value = "中介单位sid") - @JsonProperty("intermediarySid2") - private String distributorSidTwo; - @ApiModelProperty(value = "单车中介服务费") - @JsonProperty("agencyFee2") - private String distributorPriceTwo; - - @ApiModelProperty("所在单位1") - @JsonProperty("intermediaryUnit") - private String distributorUnit; - @ApiModelProperty("所在单位2") - @JsonProperty("intermediaryUnit2") - private String distributorUnitTwo; - - @ApiModelProperty("当前组织机构全路径sid") - private String orgPath; + @ApiModelProperty("申请人sid") + private String createBySid; // 申请人sid + @ApiModelProperty("申请人姓名") + private String createByName; // 申请人姓名 + @ApiModelProperty("销售类型key") + private String saleTypeKey; // 销售类型key + @ApiModelProperty("销售类型value") + private String saleTypeValue; // 销售类型value + @ApiModelProperty("成交价") + private String salePrice; // 成交价 + @ApiModelProperty("收款情况") + private String collection; // 收款情况 + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("客户sid") + private String customerSid; // 客户sid + @ApiModelProperty("客户编码") + private String customerNo; // 客户编码 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty(value = "客户头像") + private String customerPhoto; + @ApiModelProperty(value = "客户电话") + private String customerPhone; + @ApiModelProperty("车型品牌名称") + private String brandName; // 车型品牌名称 + @ApiModelProperty("车型图片") + private String modelImage; // 车型图片 + @ApiModelProperty("配置sid") + private String configSid; // 配置sid + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型小名") + private String modelName; // 车型小名 + @ApiModelProperty("订单台数") + private String orderNum; // 订单台数 + @ApiModelProperty("终止原因") + private String stopRemarks; // 终止原因 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("分公司名称") + private String useOrgName; // 分公司名称 + @ApiModelProperty("流程实例id") + private String procInstId; // 流程实例id + @ApiModelProperty("任务编号id") + private String taskId; // 任务编号id + @ApiModelProperty("组织机构全路径sid") + private String orgSidPath; // 组织机构全路径sid + @ApiModelProperty("申请编号") + private String applyNo; // 申请编号 + @ApiModelProperty("资金来源") + private String fundsSource; //资金来源 + @ApiModelProperty("制单日期") + private String creatTime; //制单日期 + @ApiModelProperty("退库车辆列表") + private List busSalesOrderReturnVehs = new ArrayList<>(); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/SubmitOrderRetVehDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/SubmitOrderRetVehDto.java index ec4ee229cc..93117e7a8c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/SubmitOrderRetVehDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/SubmitOrderRetVehDto.java @@ -12,10 +12,17 @@ import lombok.Data; @Data public class SubmitOrderRetVehDto implements Dto { private static final long serialVersionUID = -3341005368687646398L; + + @ApiModelProperty("销售订单退车申请sid") + private String businessSid; + @ApiModelProperty("任务id") private String taskId; @ApiModelProperty("流程实例id") private String procInsId; + @ApiModelProperty("组织全路径") private String orgPath; + + private OrderRetVehSubmitDto info; } From 06f5bc67b27ff0d43bbda49c7bb3515ad9148300 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 22 Mar 2023 10:18:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 2521f45e42..dbf8a40373 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 @@ -878,6 +878,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService