From c6464885957aae01785144c22b45af7c6a4805a7 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 24 May 2024 17:32:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8C=82=E8=BD=A6=E5=BC=80=E5=8F=91=20?= =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=8C=82=E8=BD=A6=E7=8A=B6=E6=80=81=20=E7=B4=A2=E8=B5=94?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=B5=8B=E8=AF=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/order/AppBusSaleOrderStateVo.java | 4 +- .../BusSalesOrderTrailer.java | 74 ++++++++++ .../BusSalesOrderTrailerDetailsVo.java | 79 +++++++++++ .../BusSalesOrderTrailerDto.java | 77 ++++++++++ .../BusSalesOrderTrailerFeign.java | 75 ++++++++++ .../BusSalesOrderTrailerFeignFallback.java | 65 +++++++++ .../BusSalesOrderTrailerFile.java | 56 ++++++++ .../bussalesorder/BusSalesOrderService.java | 15 ++ .../BusSalesOrderModelService.java | 6 + .../BusSalesOrderTrailerMapper.java | 65 +++++++++ .../BusSalesOrderTrailerMapper.xml | 6 + .../BusSalesOrderTrailerRest.java | 78 ++++++++++ .../BusSalesOrderTrailerService.java | 134 ++++++++++++++++++ .../saleOrders/AppBusSalesOrderFeign.java | 20 +++ .../AppBusSalesOrderFeignFallback.java | 18 +++ .../saleOrders/order/OrderStateVo.java | 4 +- .../AppSalesOrderTrailerDetailsVo.java | 80 +++++++++++ .../trailer/AppSalesOrderTrailerDto.java | 78 ++++++++++ .../saleOrders/trailer/TrailerVo.java | 20 +++ .../saleOrders/AppBusSalesOrderRest.java | 18 +++ .../saleOrders/AppBusSalesOrderService.java | 50 +++++++ doc/databases/yxt-as.sql | 2 +- .../AsBusclaimCheckApplyDetail.java | 2 +- .../AsBusclaimInvoiceBillDetailsVo.java | 19 ++- .../AsBusclaimInvoiceBillDto.java | 14 +- .../AsBusclaimInvoiceBillFile.java | 35 +++++ .../AsBusclaimInvoiceBillQuery.java | 2 +- .../AsBusclaimInvoiceBillVo.java | 5 +- .../asbusclaiminvoicebill/ExcelInfoVo.java | 16 ++- .../AsBusclaimInvoiceBillDetail.java | 4 +- .../AsBusclaimInvoiceBillDetailDto.java | 4 +- .../AsBusclaimInvoiceBillDetailVo.java | 4 +- .../AsBusclaimCheckApplyDetailMapper.xml | 2 +- .../AsBusclaimInvoiceBillMapper.java | 2 + .../AsBusclaimInvoiceBillMapper.xml | 17 ++- .../AsBusclaimInvoiceBillRest.java | 4 +- .../AsBusclaimInvoiceBillService.java | 65 +++++++-- .../AsBusclaimInvoiceBillDetailMapper.xml | 2 +- 38 files changed, 1182 insertions(+), 39 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailer.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerDetailsVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerDto.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeign.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeignFallback.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFile.java create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.java create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.xml create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerRest.java create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/TrailerVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillFile.java 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 5e72aad7b4..fd3dc08aef 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 @@ -31,7 +31,7 @@ public class AppBusSaleOrderStateVo implements Vo { @ApiModelProperty("上装名称") private String topName; - @ApiModelProperty("挂车状态") + @ApiModelProperty("挂车列表是否有数据（1有 0无）") private int trailerInfoState; @ApiModelProperty("价格信息") @@ -77,6 +77,8 @@ public class AppBusSaleOrderStateVo implements Vo { private String vehicleFunctionKey; @ApiModelProperty("是否有上装按钮") private boolean topState; + @ApiModelProperty("是否有挂车按钮") + private boolean trailerState; @ApiModelProperty("上装的采购类型是否允许修改") private boolean isMain; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailer.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailer.java new file mode 100644 index 0000000000..4806b2dd92 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailer.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bussalesordertrailer; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: anrui-buscenter(销售订单挂车信息)
+ * File: BusSalesOrderTrailer.java
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer
+ * Description: 销售订单-挂车信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-24 09:54:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-挂车信息", description = "销售订单-挂车信息") +@TableName("bus_sales_order_trailer") +public class BusSalesOrderTrailer extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("销售订单sid") + private String salesOrderSid; // 销售订单sid + @ApiModelProperty("挂车类型key") + private String trailerTypeKey; // 挂车类型key + @ApiModelProperty("挂车类型value") + private String trailerTypeValue; // 挂车类型value + @ApiModelProperty("外廓尺寸长") + private BigDecimal appearanceSizeLong; // 外廓尺寸长 + @ApiModelProperty("单台成交价") + private BigDecimal singleFinalPrice; // 单台成交价 + @ApiModelProperty("数量") + private Integer trailerCount; // 数量 + @ApiModelProperty("合同附件") + private String contractFile; // 合同附件 + @ApiModelProperty("同车型合格证附件") + private String certFile; // 同车型合格证附件 + @ApiModelProperty("0不过票，1过票") + private Integer isCompPassTicket; // 0不过票，1过票 + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerDetailsVo.java new file mode 100644 index 0000000000..f099c81ff2 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerDetailsVo.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bussalesordertrailer; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-buscenter(销售订单挂车信息)
+ * File: BusSalesOrderTrailerVo.java
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerVo
+ * Description: 销售订单-挂车信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-24 09:54:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-挂车信息 视图数据详情", description = "销售订单-挂车信息 视图数据详情") +public class BusSalesOrderTrailerDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("销售订单sid") + private String salesOrderSid; // 销售订单sid + @ApiModelProperty("挂车类型key") + private String trailerTypeKey; // 挂车类型key + @ApiModelProperty("挂车类型value") + private String trailerTypeValue; // 挂车类型value + @ApiModelProperty("外廓尺寸长") + private BigDecimal appearanceSizeLong; // 外廓尺寸长 + @ApiModelProperty("单台成交价") + private BigDecimal singleFinalPrice; // 单台成交价 + @ApiModelProperty("数量") + private Integer trailerCount; // 数量 + @ApiModelProperty("合同附件") + private List contractFile = new ArrayList<>(); // 合同附件 + @ApiModelProperty("同车型合格证附件") + private List certFile = new ArrayList<>(); // 同车型合格证附件 + @ApiModelProperty("0不过票，1过票") + private Integer isCompPassTicket; // 0不过票，1过票 + +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerDto.java new file mode 100644 index 0000000000..2c91abd29f --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerDto.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bussalesordertrailer; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-buscenter(销售订单挂车信息)
+ * File: BusSalesOrderTrailerDto.java
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDto
+ * Description: 销售订单-挂车信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-24 09:54:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-挂车信息 数据传输对象", description = "销售订单-挂车信息 数据传输对象") +public class BusSalesOrderTrailerDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("销售订单sid") + private String salesOrderSid; // 销售订单sid + @ApiModelProperty("挂车类型key") + private String trailerTypeKey; // 挂车类型key + @ApiModelProperty("挂车类型value") + private String trailerTypeValue; // 挂车类型value + @ApiModelProperty("外廓尺寸长") + private BigDecimal appearanceSizeLong; // 外廓尺寸长 + @ApiModelProperty("单台成交价") + private BigDecimal singleFinalPrice; // 单台成交价 + @ApiModelProperty("数量") + private Integer trailerCount; // 数量 + @ApiModelProperty("合同附件") + private List contractFile = new ArrayList<>(); // 合同附件 + @ApiModelProperty("同车型合格证附件") + private List certFile = new ArrayList<>(); // 同车型合格证附件 + @ApiModelProperty("0不过票，1过票") + private Integer isCompPassTicket; // 0不过票，1过票 + +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeign.java new file mode 100644 index 0000000000..697c3d73a9 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeign.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bussalesordertrailer; + +import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountDto; +import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui-buscenter(销售订单挂车信息)
+ * File: BusSalesOrderTrailerFeign.java
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFeign
+ * Description: 销售订单-挂车信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-24 09:54:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "销售订单-挂车信息") +@FeignClient( + contextId = "anrui-buscenter-BusSalesOrderTrailer", + name = "anrui-buscenter", + path = "v1/bussalesordertrailer", + fallback = BusSalesOrderTrailerFeignFallback.class) +public interface BusSalesOrderTrailerFeign { + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody List dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delete") + @ResponseBody + public ResultBean delete(@RequestParam(value = "sid") String sid); + + @ApiOperation("根据销售订单sid获取一条记录") + @GetMapping("/fetchDetailsByOrderSid/{orderSid}") + @ResponseBody + public ResultBean> fetchDetailsByOrderSid(@PathVariable("orderSid") String orderSid); +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeignFallback.java new file mode 100644 index 0000000000..a1c49bf30c --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeignFallback.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bussalesordertrailer; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-buscenter(销售订单挂车信息)
+ * File: BusSalesOrderTrailerFeignFallback.java
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFeignFallback
+ * Description: 销售订单-挂车信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-24 09:54:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class BusSalesOrderTrailerFeignFallback implements BusSalesOrderTrailerFeign { + + @Override + public ResultBean save(List dto) { + return null; + } + + @Override + public ResultBean delete(String sid) { + return null; + } + + @Override + public ResultBean> fetchDetailsByOrderSid(String orderSid) { + return null; + } +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFile.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFile.java new file mode 100644 index 0000000000..08badd8def --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFile.java @@ -0,0 +1,56 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bussalesordertrailer; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-buscenter(销售订单挂车信息)
+ * File: BusSalesOrderTrailerVo.java
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerVo
+ * Description: 销售订单-挂车信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-24 09:54:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-挂车信息 视图数据详情", description = "销售订单-挂车信息 视图数据详情") +public class BusSalesOrderTrailerFile implements Vo { + + private String url; +} \ 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 c2bf87c2eb..ec9c91d316 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 @@ -126,6 +126,7 @@ import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupServic import com.yxt.anrui.buscenter.biz.bussalesordermodel.BusSalesOrderModelService; import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService; import com.yxt.anrui.buscenter.biz.bussalesordersubmit.BusSalesOrderSubmitService; +import com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerService; import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService; import com.yxt.anrui.buscenter.biz.bussolutionschange.BusSolutionsChangeService; @@ -349,6 +350,8 @@ public class BusSalesOrderService extends MybatisBaseService 0){ + vo.setTrailerInfoState(1); + }else { + vo.setTrailerInfoState(0); + } + }else { + vo.setTrailerState(false); + vo.setTrailerInfoState(0); + } } else { vo.setModleInfoState(0); vo.setModelName("未完善"); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java index 5148dbe8b0..57bcdb87ae 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java @@ -59,6 +59,7 @@ import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService; import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService; import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService; +import com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerService; import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService; import com.yxt.common.base.service.MybatisBaseService; @@ -113,6 +114,8 @@ public class BusSalesOrderModelService extends MybatisBaseService_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.bussalesordertrailer; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer; + +import java.util.List; + +/** + * Project: anrui-buscenter(销售订单挂车信息)
+ * File: BusSalesOrderTrailerMapper.java
+ * Class: com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerMapper
+ * Description: 销售订单-挂车信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-24 09:54:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface BusSalesOrderTrailerMapper extends BaseMapper { + + @Select("select count(*) from bus_sales_order_trailer where salesOrderSid = #{saleOrderSid}") + int fetchByOrderSid(String saleOrderSid); + + @Delete("delete from bus_sales_order_trailer where salesOrderSid = #{salesOrderSid}") + void delByOrderSid(String salesOrderSid); + + @Select("select * from bus_sales_order_trailer where salesOrderSid = #{orderSid}") + List fetchAllByOrderSid(String orderSid); +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.xml new file mode 100644 index 0000000000..0705daf056 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerRest.java new file mode 100644 index 0000000000..96c01d3af8 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerRest.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.bussalesordertrailer; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDto; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFeign; + +import java.util.List; + +/** + * Project: anrui-buscenter(销售订单挂车信息)
+ * File: BusSalesOrderTrailerFeignFallback.java
+ * Class: com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerRest
+ * Description: 销售订单-挂车信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-24 09:54:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "销售订单-挂车信息") +@RestController("com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerRest") +@RequestMapping("v1/bussalesordertrailer") +public class BusSalesOrderTrailerRest implements BusSalesOrderTrailerFeign { + + @Autowired + private BusSalesOrderTrailerService busSalesOrderTrailerService; + + @Override + public ResultBean save(List dto) { + return null; + } + + @Override + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + busSalesOrderTrailerService.deleteBySid(sid); + return rb.success(); + } + + @Override + public ResultBean> fetchDetailsByOrderSid(String orderSid) { + ResultBean rb = ResultBean.fireFail(); + List busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(orderSid); + return rb.success().setData(busSalesOrderTrailerDetailsVos); + } +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java new file mode 100644 index 0000000000..037eaa99f2 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java @@ -0,0 +1,134 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.bussalesordertrailer; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile; +import com.yxt.common.base.config.component.FileUploadComponent; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-buscenter(销售订单挂车信息)
+ * File: BusSalesOrderTrailerService.java
+ * Class: com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerService
+ * Description: 销售订单-挂车信息 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-24 09:54:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class BusSalesOrderTrailerService extends MybatisBaseService { + + @Autowired + private FileUploadComponent fileUploadComponent; + + public void saveOrUpdateDto(BusSalesOrderTrailerDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(BusSalesOrderTrailerDto dto){ + BusSalesOrderTrailer entity = new BusSalesOrderTrailer(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(BusSalesOrderTrailerDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + BusSalesOrderTrailer entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public BusSalesOrderTrailerDetailsVo fetchDetailsVoBySid(String sid){ + BusSalesOrderTrailer entity = fetchBySid(sid); + BusSalesOrderTrailerDetailsVo vo = new BusSalesOrderTrailerDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public int fetchByOrderSid(String saleOrderSid) { + return baseMapper.fetchByOrderSid(saleOrderSid); + } + + public void delByOrderSid(String salesOrderSid) { + baseMapper.delByOrderSid(salesOrderSid); + } + + public List fetchAllByOrderSid(String orderSid) { + List busSalesOrderTrailerDetailsVos = baseMapper.fetchAllByOrderSid(orderSid); + for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) { + BusSalesOrderTrailer busSalesOrderTrailer = fetchBySid(busSalesOrderTrailerDetailsVo.getSid()); + String certFile = busSalesOrderTrailer.getCertFile(); + String[] certFiles = certFile.split(","); + List certFiless = new ArrayList<>(); + for (String file : certFiles) { + String url = fileUploadComponent.getUrlPrefix() + file; + BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); + busSalesOrderTrailerFile.setUrl(url); + certFiless.add(busSalesOrderTrailerFile); + } + String contractFile = busSalesOrderTrailer.getContractFile(); + String[] contractFiles = contractFile.split(","); + List contractFiless = new ArrayList<>(); + for (String file : contractFiles) { + String url = fileUploadComponent.getUrlPrefix() + file; + BusSalesOrderTrailerFile busSalesOrderTrailerFile = new BusSalesOrderTrailerFile(); + busSalesOrderTrailerFile.setUrl(url); + contractFiless.add(busSalesOrderTrailerFile); + } + busSalesOrderTrailerDetailsVo.setCertFile(certFiless); + busSalesOrderTrailerDetailsVo.setContractFile(contractFiless); + } + return busSalesOrderTrailerDetailsVos; + } +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java index 2853cc51d3..c6be8d2fdf 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java @@ -42,6 +42,9 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDetailsVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.TrailerVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*; import com.yxt.anrui.terminal.api.autoservice.solutionsChange.flow.AppSolutionsChangeDelegateQuery; import com.yxt.common.core.query.PagerQuery; @@ -172,6 +175,23 @@ public interface AppBusSalesOrderFeign { @ResponseBody ResultBean deleteDiscount(@RequestParam(value = "saleOrderSid") String orderSid, @RequestParam(value = "sid") String sid); + /*-----------------------------------------挂车信息------------------------------------------*/ + + @ApiOperation("查看挂车信息") + @GetMapping("/getAppTrailerListVoByOrderSid/{orderSid}") + @ResponseBody + ResultBean getAppTrailerListVoByOrderSid(@PathVariable(value = "orderSid") String orderSid); + + @ApiOperation("保存挂车信息") + @PostMapping("/saveOrUpdateAppOrderTrailer") + @ResponseBody + ResultBean saveOrUpdateAppOrderTrailer(@RequestBody List dto); + + @ApiOperation("删除挂车信息") + @DeleteMapping("/delAppOrderTrailerBySid") + @ResponseBody + ResultBean delAppOrderTrailerBySid(@RequestParam(value = "sid") String sid); + /*-----------------------------------------价格信息------------------------------------------*/ @ApiOperation("初始化销售订单价格信息") 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 f3bdbf1284..ac97922404 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 @@ -42,6 +42,9 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDetailsVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.TrailerVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -151,6 +154,21 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { return null; } + @Override + public ResultBean getAppTrailerListVoByOrderSid(String orderSid) { + return null; + } + + @Override + public ResultBean saveOrUpdateAppOrderTrailer(List dto) { + return null; + } + + @Override + public ResultBean delAppOrderTrailerBySid(String sid) { + return null; + } + @Override public ResultBean getPriceInfo(String sid) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderStateVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderStateVo.java index 11bf441c0b..898a094ccf 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderStateVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderStateVo.java @@ -36,7 +36,7 @@ public class OrderStateVo implements Vo { @ApiModelProperty("上装名称") private String topName; - @ApiModelProperty("挂车状态") + @ApiModelProperty("挂车列表是否有数据（1有 0无）") private int trailerInfoState; @ApiModelProperty("价格信息") @@ -83,6 +83,8 @@ public class OrderStateVo implements Vo { @ApiModelProperty("是否有上装") private boolean topState; + @ApiModelProperty("是否有挂车按钮") + private boolean trailerState; @ApiModelProperty("上装的采购类型是否允许修改") @JsonProperty("isMain") private boolean isMain; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDetailsVo.java new file mode 100644 index 0000000000..c3dc4d2ca8 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDetailsVo.java @@ -0,0 +1,80 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-buscenter(销售订单挂车信息)
+ * File: BusSalesOrderTrailerVo.java
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerVo
+ * Description: 销售订单-挂车信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-24 09:54:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-挂车信息 视图数据详情", description = "销售订单-挂车信息 视图数据详情") +public class AppSalesOrderTrailerDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("销售订单sid") + private String salesOrderSid; // 销售订单sid + @ApiModelProperty("挂车类型key") + private String trailerTypeKey; // 挂车类型key + @ApiModelProperty("挂车类型value") + private String trailerTypeValue; // 挂车类型value + @ApiModelProperty("外廓尺寸长") + private String appearanceSizeLong; // 外廓尺寸长 + @ApiModelProperty("单台成交价") + private BigDecimal singleFinalPrice; // 单台成交价 + @ApiModelProperty("数量") + private Integer trailerCount; // 数量 + @ApiModelProperty("合同附件") + private List contractFile = new ArrayList<>(); // 合同附件 + @ApiModelProperty("同车型合格证附件") + private List certFile = new ArrayList<>(); // 同车型合格证附件 + @ApiModelProperty("序号") + private Integer sort; // 序号 + @ApiModelProperty("0不过票，1过票") + private Integer isCompPassTicket; // 0不过票，1过票 + +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDto.java new file mode 100644 index 0000000000..4f77bfa379 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDto.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-buscenter(销售订单挂车信息)
+ * File: BusSalesOrderTrailerDto.java
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDto
+ * Description: 销售订单-挂车信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-24 09:54:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-挂车信息 数据传输对象", description = "销售订单-挂车信息 数据传输对象") +public class AppSalesOrderTrailerDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("销售订单sid") + private String salesOrderSid; // 销售订单sid + @ApiModelProperty("挂车类型key") + private String trailerTypeKey; // 挂车类型key + @ApiModelProperty("挂车类型value") + private String trailerTypeValue; // 挂车类型value + @ApiModelProperty("外廓尺寸长") + private BigDecimal appearanceSizeLong; // 外廓尺寸长 + @ApiModelProperty("单台成交价") + private BigDecimal singleFinalPrice; // 单台成交价 + @ApiModelProperty("数量") + private Integer trailerCount; // 数量 + @ApiModelProperty("合同附件") + private List contractFile = new ArrayList<>(); // 合同附件 + @ApiModelProperty("同车型合格证附件") + private List certFile = new ArrayList<>(); // 同车型合格证附件 + @ApiModelProperty("序号") + private Integer sort; // 序号 + @ApiModelProperty("0不过票，1过票") + private Integer isCompPassTicket; // 0不过票，1过票 + +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/TrailerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/TrailerVo.java new file mode 100644 index 0000000000..a3f96d422d --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/TrailerVo.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer; + +import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountListVo; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/2 13:55 + * @Description 销售订单-主车优惠 + */ +@Data +public class TrailerVo implements Vo { + private static final long serialVersionUID = -1835469698115349175L; + + private String total; + private List records; +} 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 710baa3a7a..70a5c5ec77 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 @@ -45,6 +45,9 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDetailsVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.TrailerVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -226,6 +229,21 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { return appBusSalesOrderService.deleteDiscount(orderSid, sid); } + @Override + public ResultBean getAppTrailerListVoByOrderSid(String orderSid) { + return appBusSalesOrderService.getAppTrailerListVoByOrderSid(orderSid); + } + + @Override + public ResultBean saveOrUpdateAppOrderTrailer(List dto) { + return appBusSalesOrderService.saveOrUpdateAppOrderTrailer(dto); + } + + @Override + public ResultBean delAppOrderTrailerBySid(String sid) { + return appBusSalesOrderService.delAppOrderTrailerBySid(sid); + } + /** * 初始化价格信息 * 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 69d1a949e5..84dfc4e6df 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 @@ -70,6 +70,10 @@ import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppBusSalesOrderModelD import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceFeign; import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceDto; import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDto; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFeign; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleBorrowVo; import com.yxt.anrui.buscenter.api.bussolutionschange.flow.flow.SolutionsChangeDelegateQuery; @@ -110,6 +114,9 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDetailsVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.TrailerVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*; import com.yxt.anrui.terminal.api.base.common.CarModelVo; import com.yxt.anrui.terminal.api.base.common.SystemVo; @@ -186,6 +193,8 @@ public class AppBusSalesOrderService { private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; @Autowired private FinCompanyInvoicingFeign finCompanyInvoicingFeign; + @Autowired + private BusSalesOrderTrailerFeign busSalesOrderTrailerFeign; /************************************* 销售订单接口 *********************************************/ @@ -937,4 +946,45 @@ public class AppBusSalesOrderService { ResultBean delegate = busSalesOrderFeign.assignTask(delegateQuery1); return rb.success(); } + + public ResultBean getAppTrailerListVoByOrderSid(String orderSid) { + ResultBean rb = ResultBean.fireFail(); + TrailerVo trailerVo = new TrailerVo(); + List data = busSalesOrderTrailerFeign.fetchDetailsByOrderSid(orderSid).getData(); + List appSalesOrderTrailerDetailsVos = new ArrayList<>(); + for (BusSalesOrderTrailerDetailsVo datum : data) { + AppSalesOrderTrailerDetailsVo appSalesOrderTrailerDetailsVo = new AppSalesOrderTrailerDetailsVo(); + BeanUtil.copyProperties(datum,appSalesOrderTrailerDetailsVo,"contractFile","certFile"); + List contractFile = datum.getContractFile(); + List certFile = datum.getCertFile(); + ArrayList contractFileString = new ArrayList<>(); + ArrayList certFileString = new ArrayList<>(); + for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : contractFile) { + contractFileString.add(busSalesOrderTrailerFile.getUrl()); + } + for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : certFile) { + certFileString.add(busSalesOrderTrailerFile.getUrl()); + } + appSalesOrderTrailerDetailsVo.setContractFile(contractFileString); + appSalesOrderTrailerDetailsVo.setCertFile(certFileString); + appSalesOrderTrailerDetailsVo.setAppearanceSizeLong("长" + appSalesOrderTrailerDetailsVo.getAppearanceSizeLong() + "m"); + appSalesOrderTrailerDetailsVos.add(appSalesOrderTrailerDetailsVo); + } + tr + return rb.success().setData(trailerVo); + } + + public ResultBean saveOrUpdateAppOrderTrailer(List dto) { + List busSalesOrderTrailerDtos = new ArrayList<>(); + for (AppSalesOrderTrailerDto appSalesOrderTrailerDto : dto) { + BusSalesOrderTrailerDto busSalesOrderTrailerDto = new BusSalesOrderTrailerDto(); + BeanUtil.copyProperties(appSalesOrderTrailerDto,busSalesOrderTrailerDto); + busSalesOrderTrailerDtos.add(busSalesOrderTrailerDto); + } + return busSalesOrderTrailerFeign.save(busSalesOrderTrailerDtos); + } + + public ResultBean delAppOrderTrailerBySid(String sid) { + return busSalesOrderTrailerFeign.delete(sid); + } } \ No newline at end of file diff --git a/doc/databases/yxt-as.sql b/doc/databases/yxt-as.sql index 6748aba8a0..a575f6d985 100644 --- a/doc/databases/yxt-as.sql +++ b/doc/databases/yxt-as.sql @@ -204,7 +204,7 @@ CREATE TABLE `as_busclaim_invoice_bill_detail` `billSid` varchar(64) DEFAULT NULL COMMENT '单据sid', `claimBillNo` varchar(64) DEFAULT NULL COMMENT '索赔单号', `repairBillNo` varchar(64) DEFAULT NULL COMMENT '维修工单号', - `vehmark` varchar(64) DEFAULT NULL COMMENT '车牌号', + `vehMark` varchar(64) DEFAULT NULL COMMENT '车牌号', `vinNo` varchar(64) DEFAULT NULL COMMENT '车架号', `claimHourAmount` decimal(10, 2) DEFAULT NULL COMMENT '索赔工时费', `claimGoodsAmount` decimal(10, 2) DEFAULT NULL COMMENT '索赔材料费', diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetail.java index 3eab903743..c3abb8aaf1 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetail.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetail.java @@ -22,7 +22,7 @@ public class AsBusclaimCheckApplyDetail extends BaseEntity { @ApiModelProperty("维修工单号") private String repairBillNo; @ApiModelProperty("车牌号") - private String vehmark; + private String vehMark; @ApiModelProperty("车架号") private String vinNo; @ApiModelProperty("开票申请sid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailsVo.java index b2f155ea6a..ccd22f4c8b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailsVo.java @@ -1,11 +1,13 @@ package com.yxt.anrui.as.api.asbusclaiminvoicebill; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailDto; import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -20,7 +22,20 @@ public class AsBusclaimInvoiceBillDetailsVo { private String createBySid; private String createByName; - private String createTime; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date createTime; + + private String billNo; + @ApiModelProperty("实例id") + private String procInstId; + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("任务iD") + private String taskId; + @ApiModelProperty("环节iD") + private String taskDefKey; + @ApiModelProperty("流程状态") + private String nodeState; @ApiModelProperty("申请部门sid") private String createDeptSid; @@ -41,7 +56,7 @@ public class AsBusclaimInvoiceBillDetailsVo { private String useOrgSid; private String useOrgName; - private List fileList = new ArrayList<>(); + private List fileList = new ArrayList<>(); private String remarks; private List detailList = new ArrayList<>(); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java index c08ab7d44b..98caa24cef 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java @@ -19,7 +19,17 @@ public class AsBusclaimInvoiceBillDto { private String createBySid; private String createByName; - private String createTime; + private String billNo; + @ApiModelProperty("实例id") + private String procInstId; + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("任务iD") + private String taskId; + @ApiModelProperty("环节iD") + private String taskDefKey; + @ApiModelProperty("流程状态") + private String nodeState; @ApiModelProperty("申请部门sid") private String createDeptSid; @@ -40,7 +50,7 @@ public class AsBusclaimInvoiceBillDto { private String useOrgSid; private String useOrgName; - private List fileList = new ArrayList<>(); + private List fileList = new ArrayList<>(); private String remarks; private List detailList = new ArrayList<>(); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillFile.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillFile.java new file mode 100644 index 0000000000..ba2af4b6cf --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillFile.java @@ -0,0 +1,35 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.asbusclaiminvoicebill; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +@Data +public class AsBusclaimInvoiceBillFile implements Vo { + + private String url; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java index 302e63faa8..da8462bccc 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java @@ -32,7 +32,7 @@ public class AsBusclaimInvoiceBillQuery implements Query { @ApiModelProperty("开票名称") private String invoiceName; @ApiModelProperty("开票类型key") - private String invoiceKey; + private String invoiceValue; private String createBySid; private String orgPath; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java index 9b11c36c77..4fc4decda5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java @@ -35,5 +35,8 @@ public class AsBusclaimInvoiceBillVo { private String invoiceValue; @ApiModelProperty("开票金额") private String invoiceMoney; - + @ApiModelProperty("实例id") + private String procInstId; + @ApiModelProperty("流程定义id") + private String procDefId; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelInfoVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelInfoVo.java index bb8be6fb4e..3cb53a6760 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelInfoVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/ExcelInfoVo.java @@ -12,18 +12,24 @@ import lombok.Data; @Data public class ExcelInfoVo { + @ApiModelProperty("维修工单号") + private String billNo; + @ApiModelProperty("车牌号") + private String vinNo; + @ApiModelProperty("车架号") + private String vehMark; @ApiModelProperty("索赔单号") private String claimBillNo; @ApiModelProperty("索赔工时费") - private String claimHourAmount; + private String claimHourAmount = "0"; @ApiModelProperty("索赔材料费") - private String claimGoodsAmount; + private String claimGoodsAmount = "0"; @ApiModelProperty("外出费") - private String claimOutAmount; + private String claimOutAmount = "0"; @ApiModelProperty("厂家补助") - private String claimSubsidyAmount; + private String claimSubsidyAmount = "0"; @ApiModelProperty("其他费用") - private String claimOtherAmount; + private String claimOtherAmount = "0"; @ApiModelProperty("费用是否一致") private Boolean isUnanimous; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java index e957ec94b3..83b1c10cc6 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java @@ -21,7 +21,7 @@ public class AsBusclaimInvoiceBillDetail extends BaseEntity { @ApiModelProperty("维修工单号") private String repairBillNo; @ApiModelProperty("车牌号") - private String vehmark; + private String vehMark; @ApiModelProperty("车架号") private String vinNo; @ApiModelProperty("索赔工时费") @@ -34,4 +34,6 @@ public class AsBusclaimInvoiceBillDetail extends BaseEntity { private BigDecimal claimSubsidyAmount; @ApiModelProperty("其他费用") private BigDecimal claimOtherAmount; + @ApiModelProperty("费用是否一致") + private Boolean isUnanimous; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailDto.java index ffd7f08b8d..52760cc92f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailDto.java @@ -18,7 +18,7 @@ public class AsBusclaimInvoiceBillDetailDto { @ApiModelProperty("维修工单号") private String repairBillNo; @ApiModelProperty("车牌号") - private String vehmark; + private String vehMark; @ApiModelProperty("车架号") private String vinNo; @ApiModelProperty("索赔工时费") @@ -31,6 +31,8 @@ public class AsBusclaimInvoiceBillDetailDto { private String claimSubsidyAmount; @ApiModelProperty("其他费用") private String claimOtherAmount; + @ApiModelProperty("费用是否一致") + private Boolean isUnanimous; private String remarks; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailVo.java index 78fb4fc0a6..a34e376b52 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailVo.java @@ -18,7 +18,7 @@ public class AsBusclaimInvoiceBillDetailVo { @ApiModelProperty("维修工单号") private String repairBillNo; @ApiModelProperty("车牌号") - private String vehmark; + private String vehMark; @ApiModelProperty("车架号") private String vinNo; @ApiModelProperty("索赔工时费") @@ -31,6 +31,8 @@ public class AsBusclaimInvoiceBillDetailVo { private String claimSubsidyAmount; @ApiModelProperty("其他费用") private String claimOtherAmount; + @ApiModelProperty("费用是否一致") + private Boolean isUnanimous; private String remarks; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailMapper.xml index b4d028405a..f56e8d32db 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailMapper.xml @@ -11,7 +11,7 @@ resultType="com.yxt.anrui.as.api.asbusclaimcheckapplydetail.AsBusclaimCheckApplyDetailVo"> select a.claimBillNo, a.repairBillNo, - a.vehmark, + a.vehMark, a.vinNo, a.claimHourAmount, a.claimGoodsAmount, diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java index 82e2c74833..e705f1db9d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java @@ -26,4 +26,6 @@ public interface AsBusclaimInvoiceBillMapper extends BaseMapper beanToMap); AsBusclaimInvoiceBillDetailsVo init(String deptSid); + + String selectNum(String billNo); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml index e5c7c042e6..434be44cd2 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml @@ -20,10 +20,10 @@ @@ -53,7 +53,16 @@ FROM as_busclaim_invoice_bill WHERE createDeptSid = #{deptSid} + AND nodeState = '已办结' ORDER BY createTime DESC LIMIT 1 + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java index 75f13ac357..f2284432bd 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java @@ -87,8 +87,8 @@ public class AsBusclaimInvoiceBillRest { @ApiOperation(value = "导入") @PostMapping("/getExcelInfo") - ResultBean> getExcelInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request, @RequestParam(value = "useOrgSid") String useOrgSid) throws IOException { - return asBusclaimInvoiceBillService.getExcelInfo(file, request, useOrgSid); + ResultBean> getExcelInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request) throws IOException { + return asBusclaimInvoiceBillService.getExcelInfo(file, request); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java index 4fe5dc7d48..57ce0c9ac0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java @@ -13,10 +13,13 @@ import com.yxt.anrui.as.api.asbusclaiminvoicebill.flowable.*; import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetail; import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailDto; import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailVo; +import com.yxt.anrui.as.api.asbusrepairbillvech.AsBusrepairBillVech; import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService; import com.yxt.anrui.as.biz.asbusclaimcheck.AsBusclaimCheckService; import com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailMapper; import com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailService; +import com.yxt.anrui.as.biz.asbusrepairbillvech.AsBusrepairBillVechService; +import com.yxt.anrui.as.feign.base.billno.Rule; import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables; import com.yxt.anrui.as.feign.flowable.flow.FlowableFeign; import com.yxt.anrui.as.feign.flowable.flow.ProcDefEnum; @@ -76,6 +79,8 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); @@ -135,22 +140,42 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService saveOrUpdateBill(AsBusclaimInvoiceBillDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData(); + dto.setUseOrgSid(dto.getUseOrgSid()); + dto.setUseOrgName(organizationVo.getName()); + dto.setCreateOrgSid(dto.getUseOrgSid()); if (StringUtils.isBlank(sid)) { AsBusclaimInvoiceBill asBusclaimInvoiceBill = new AsBusclaimInvoiceBill(); + //生成单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + billNo = "SPKP" + organizationVo.getOrgCode() + date; + String i = baseMapper.selectNum(billNo); + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } + dto.setBillNo(billNo); BeanUtil.copyProperties(dto, asBusclaimInvoiceBill, "sid"); asBusclaimInvoiceBill.setCreateBySid(dto.getCreateBySid()); sid = asBusclaimInvoiceBill.getSid(); - List fileList = dto.getFileList(); + List fileList = dto.getFileList(); fileList.removeAll(Collections.singleton(null)); if (!fileList.isEmpty()) { - String files = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); - asBusclaimInvoiceBill.setFile(files); + String url = ""; + for (AsBusclaimInvoiceBillFile asBusclaimInvoiceBillFile : fileList) { + String filePath = asBusclaimInvoiceBillFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); + url = url + filePath + ","; + } + asBusclaimInvoiceBill.setFile(url); } List detailList = dto.getDetailList(); detailList.removeAll(Collections.singleton(null)); if (!detailList.isEmpty()) { asBusclaimInvoiceBillDetailService.saveOrUpdateDetails(sid, detailList); } + asBusclaimInvoiceBill.setNodeState("待提交"); baseMapper.insert(asBusclaimInvoiceBill); } else { @@ -159,11 +184,15 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService fileList = dto.getFileList(); + List fileList = dto.getFileList(); fileList.removeAll(Collections.singleton(null)); if (!fileList.isEmpty()) { - String files = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); - asBusclaimInvoiceBill.setFile(files); + String url = ""; + for (AsBusclaimInvoiceBillFile asBusclaimInvoiceBillFile : fileList) { + String filePath = asBusclaimInvoiceBillFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); + url = url + filePath + ","; + } + asBusclaimInvoiceBill.setFile(url); } List detailList = dto.getDetailList(); detailList.removeAll(Collections.singleton(null)); @@ -200,7 +229,13 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService fileList = Arrays.asList(asBusclaimInvoiceBill.getFile().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); - asBusclaimInvoiceBillDetailsVo.setFileList(fileList); + List asBusclaimInvoiceBillFiles = new ArrayList<>(); + for (String s : fileList) { + AsBusclaimInvoiceBillFile asBusclaimInvoiceBillFile = new AsBusclaimInvoiceBillFile(); + asBusclaimInvoiceBillFile.setUrl(s); + asBusclaimInvoiceBillFiles.add(asBusclaimInvoiceBillFile); + } + asBusclaimInvoiceBillDetailsVo.setFileList(asBusclaimInvoiceBillFiles); } List detailList = asBusclaimInvoiceBillDetailService.selectDetails(sid); detailList.removeAll(Collections.singleton(null)); @@ -354,7 +389,7 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService> getExcelInfo(MultipartFile file, HttpServletRequest request, String useOrgSid) throws IOException { + public ResultBean> getExcelInfo(MultipartFile file, HttpServletRequest request) throws IOException { ResultBean rb = ResultBean.fireFail(); String temp = request.getSession().getServletContext().getRealPath(File.separator) + "temp";// 临时目录 File tempFile = new File(temp); @@ -561,7 +596,7 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService importVoList = new ArrayList<>(); Set checkWord = new HashSet<>(); @@ -666,6 +701,10 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService select a.claimBillNo, a.repairBillNo, - a.vehmark, + a.vehMark, a.vinNo, a.claimHourAmount, a.claimGoodsAmount,