From 6e582bed6075b72feb5e48c8a107e6fbec2336bc Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 7 Apr 2023 11:49:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java index 107d49ba6d..ae362414cf 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java @@ -47,8 +47,10 @@ public class FinVehicleInvoice extends BaseEntity { @ApiModelProperty("开票状态") private String billingState; + @ApiModelProperty("开票状态Key") private String billingStateKey; + @ApiModelProperty("是否删除：0未删除，1已删除") private Integer isDelete; @@ -58,6 +60,8 @@ public class FinVehicleInvoice extends BaseEntity { @ApiModelProperty("创建人sid") private String createBySid; + private String useOrgSid; + @ApiModelProperty("修改人sid") private String updateBySid; @@ -67,7 +71,6 @@ public class FinVehicleInvoice extends BaseEntity { @ApiModelProperty("车架号") private String VIN; - @ApiModelProperty("车辆类型Key") private String vehicleTypeKey; From 147cb3628581dfc2c2275349abde81492365350d Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 7 Apr 2023 13:46:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../finvehicleinvoice/FinVehicleInvoice.java | 6 +++++ .../FinVehicleInvoiceDto.java | 4 ++++ .../FinVehicleInvoiceExportVo.java | 3 +++ .../FinVehicleInvoiceQuery.java | 22 ++++--------------- .../FinVehicleInvoiceVo.java | 4 ++++ .../FinVehicleInvoiceMapper.xml | 6 +++++ 6 files changed, 27 insertions(+), 18 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java index ae362414cf..54cafdfda6 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java @@ -120,4 +120,10 @@ public class FinVehicleInvoice extends BaseEntity { @ApiModelProperty("图片地址") private String filePath; + @ApiModelProperty("业务状态Key 001正常开票 002包牌开票 003欠款开票") + private String businessStateKey; + + @ApiModelProperty("业务状态") + private String businessState; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java index 0955b16006..57154f6471 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java @@ -92,4 +92,8 @@ public class FinVehicleInvoiceDto implements Dto { private String vinNo; @ApiModelProperty("开票名称") private String invoicingName; + @ApiModelProperty("业务状态Key 001正常开票 002包牌开票 003欠款开票") + private String businessStateKey; + @ApiModelProperty("业务状态") + private String businessState; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java index 9abb694b83..747a7c526b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.fin.api.finvehicleinvoice; import com.yxt.common.core.utils.ExportEntityMap; import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -17,6 +18,8 @@ public class FinVehicleInvoiceExportVo implements Vo { private String billingState; @ExportEntityMap(CnName = "交接状态", EnName = "transferState") private String transferState; + @ExportEntityMap(CnName = "业务状态", EnName = "businessState") + private String businessState; @ExportEntityMap(CnName = "开票单位", EnName = "invoiceTitle") private String invoiceTitle; @ExportEntityMap(CnName = "开票类型", EnName = "invoiceType") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceQuery.java index c134dc3659..d762ebd298 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceQuery.java @@ -31,51 +31,37 @@ public class FinVehicleInvoiceQuery implements Query { @ApiModelProperty(value = "sids", required = false) private List sids; - @ApiModelProperty("开票单位") private String invoiceTitle; - @ApiModelProperty("开票状态") private String billingState; - @ApiModelProperty("开票状态Key") private String billingStateKey; - - @ApiModelProperty("开票类型Key") private String invoiceTypeKey; - @ApiModelProperty("发票类别") private String invoiceType; - @ApiModelProperty("合同编号") private String contractNo; - @ApiModelProperty("客户名称") private String customerName; - @ApiModelProperty("车架号") private String vinNo; - private String state; - - @ApiModelProperty("移交状态") private String transferState; - @ApiModelProperty("移交状态key") private String transferStateKey; - @ApiModelProperty("开票名称") private String invoicingName; - @ApiModelProperty("开票开始日期") private String createStartTime ; - @ApiModelProperty("开票结束日期") private String createEndTime ; - @ApiModelProperty("发票代码") private String invoiceCode; - + @ApiModelProperty("业务状态Key 001正常开票 002包牌开票 003欠款开票") + private String businessStateKey; + @ApiModelProperty("业务状态") + private String businessState; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceVo.java index 10006bfd0e..289611bbc3 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceVo.java @@ -67,4 +67,8 @@ public class FinVehicleInvoiceVo implements Vo { private String filePath; @ApiModelProperty("发票图片集合") private List filePaths; + @ApiModelProperty("业务状态Key 001正常开票 002包牌开票 003欠款开票") + private String businessStateKey; + @ApiModelProperty("业务状态") + private String businessState; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml index e24b97d5f7..7d224ecb79 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml @@ -20,6 +20,8 @@ + + @@ -31,6 +33,8 @@ `state`, billingStateKey, billingState, + businessStateKey, + businessState, transferStateKey, transferState, invoiceTitle, @@ -72,6 +76,7 @@ + @@ -79,6 +84,7 @@ SELECT DISTINCT billingState, transferState, + businessState, invoiceTitle, invoiceType, contractNo, From 5b0467470bccfc270ad5a26e7a9f14fc504b6e8f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 7 Apr 2023 14:10:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/common/enums/BillTypeEnum.java | 1 + .../FinBillApplication.java | 52 ++- .../FinBillApplicationDetailsVo.java | 64 +++- .../FinBillApplicationDto.java | 69 +++- .../FinBillApplicationFeign.java | 30 -- .../FinBillApplicationQuery.java | 27 +- .../FinBillApplicationVo.java | 45 +-- .../api/finbilltrailer/FinBillTrailer.java | 74 ++++ .../FinBillTrailerDetailsVo.java | 73 ++++ .../api/finbilltrailer/FinBillTrailerDto.java | 73 ++++ .../finbilltrailer/FinBillTrailerFeign.java | 78 ++++ .../FinBillTrailerFeignFallback.java | 72 ++++ .../finbilltrailer/FinBillTrailerQuery.java | 71 ++++ .../api/finbilltrailer/FinBillTrailerVo.java | 73 ++++ .../api/finbillvehicle/FinBillVehicle.java | 11 + .../api/finbillvehicle/FinBillVehicleDto.java | 14 +- .../api/finbillvehicle/FinBillVehicleVo.java | 14 +- .../FinBillApplicationMapper.java | 2 + .../FinBillApplicationMapper.xml | 18 +- .../FinBillApplicationService.java | 349 ++++++++---------- .../biz/finbillfile/FinBillFileMapper.java | 9 + .../biz/finbillfile/FinBillFileService.java | 12 + .../finbilltrailer/FinBillTrailerMapper.java | 72 ++++ .../finbilltrailer/FinBillTrailerMapper.xml | 13 + .../finbilltrailer/FinBillTrailerRest.java | 100 +++++ .../finbilltrailer/FinBillTrailerService.java | 118 ++++++ .../FinPaymentrecordService.java | 5 +- 27 files changed, 1249 insertions(+), 290 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailer.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDetailsVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDto.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerFeign.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerFeignFallback.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerQuery.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerMapper.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerMapper.xml create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerRest.java create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerService.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java index 65de2dccbb..3c941c0fc0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java @@ -23,6 +23,7 @@ public enum BillTypeEnum { XSDDHT("XSDDHT","销售订单合同"), XSDD("XSDD","销售订单"), SKD("SKD","款项确认"), + KPSQ("KPSQ","公司开票申请"), GCRK("GCRK","挂车入库"), SZRK("SZRK","上装入库"), XSDDTCSQ("XSDDTCSQ","销售订单退车申请"), diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java index 0237665f66..e61a064b7e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java @@ -70,10 +70,6 @@ public class FinBillApplication extends BaseEntity { private BigDecimal oneBillMoney; // 单台开票金额 @ApiModelProperty("开票金额合计") private BigDecimal totalBillMoney; // 开票金额合计 - @ApiModelProperty("开票状态") - private String billState; // 开票状态 - @ApiModelProperty("开票状态") - private String billStateKey;// 开票状态key @ApiModelProperty("车辆总台数") private Integer num; // 车辆总台数 @ApiModelProperty("申请日期") @@ -96,4 +92,52 @@ public class FinBillApplication extends BaseEntity { @ApiModelProperty(value = "当前用户部门全路径") private String orgSidPath; + @ApiModelProperty(value = "发起部门sid") + private String deptSid; + @ApiModelProperty(value = "发起部门名称") + private String deptName; + @ApiModelProperty(value = "销售专员sid") + private String staffSid; + @ApiModelProperty(value = "销售专员名称") + private String staffName; + @ApiModelProperty(value = "销售部门sid") + private String saleDeptSid; + @ApiModelProperty(value = "销售部门名称") + private String saleDeptName; + @ApiModelProperty(value = "销售类型key") + private String saleTypeKey; + @ApiModelProperty(value = "销售类型value") + private String saleTypeValue; + @ApiModelProperty(value = "开票单位sid") + private String openTickUnitSid; + @ApiModelProperty(value = "开票单位名称") + private String openTickUnitName; + @ApiModelProperty(value = "是否领取发票原件") + private String isLQOrigInvoice; + @ApiModelProperty(value = "开票类型key") + private String openTickTypeKey; + @ApiModelProperty(value = "开票类型value") + private String openTickTypeValue; + @ApiModelProperty(value = "开票名称sid") + private String openTickSid; + @ApiModelProperty(value = "开票名称") + private String openTickName; + @ApiModelProperty(value = "欠款金额") + private String arrearsMoney; + @ApiModelProperty(value = "承诺回款日期") + private String returnedMoneyDate; + @ApiModelProperty(value = "欠款开票原因key") + private String arrearsOpenYYKey; + @ApiModelProperty(value = "欠款开票原因value") + private String arrearsOpenYYValue; + @ApiModelProperty("开票状态Value") + private String billStateValue; // 开票状态Value + @ApiModelProperty("开票状态key") + private String billStateKey;// 开票状态key + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型名称") + private String modelName; // 车型名称 + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java index 26ee6e027e..6c2f9870b8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java @@ -28,6 +28,8 @@ package com.yxt.anrui.fin.api.finbillapplication; import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto; import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailer; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo; import com.yxt.common.core.vo.Vo; @@ -75,8 +77,6 @@ public class FinBillApplicationDetailsVo implements Vo { private String oneBillState; // 单台开票状态 @ApiModelProperty("开票金额合计") private String totalBillMoney; // 开票金额合计 - @ApiModelProperty("开票状态") - private String billState; // 开票状态 @ApiModelProperty("申请日期") private String applyDate; // 申请日期 @ApiModelProperty("开票公共表sid") @@ -85,8 +85,64 @@ public class FinBillApplicationDetailsVo implements Vo { private String remarks; // 备注 @ApiModelProperty(value = "是否延迟开票") private Integer isDelayBill; + + @ApiModelProperty(value = "发起部门sid") + private String deptSid; + @ApiModelProperty(value = "发起部门名称") + private String deptName; + @ApiModelProperty(value = "销售专员sid") + private String staffSid; + @ApiModelProperty(value = "销售专员名称") + private String staffName; + @ApiModelProperty(value = "销售部门sid") + private String saleDeptSid; + @ApiModelProperty(value = "销售部门名称") + private String saleDeptName; + @ApiModelProperty(value = "销售类型key") + private String saleTypeKey; + @ApiModelProperty(value = "销售类型value") + private String saleTypeValue; + @ApiModelProperty(value = "开票单位sid") + private String openTickUnitSid; + @ApiModelProperty(value = "开票单位名称") + private String openTickUnitName; + @ApiModelProperty(value = "是否领取发票原件") + private String isLQOrigInvoice; + @ApiModelProperty(value = "开票类型key") + private String openTickTypeKey; + @ApiModelProperty(value = "开票类型value") + private String openTickTypeValue; + @ApiModelProperty(value = "开票名称sid") + private String openTickSid; + @ApiModelProperty(value = "开票名称") + private String openTickName; + @ApiModelProperty(value = "欠款金额") + private String arrearsMoney; + @ApiModelProperty(value = "承诺回款日期") + private String returnedMoneyDate; + @ApiModelProperty(value = "欠款开票原因key") + private String arrearsOpenYYKey; + @ApiModelProperty(value = "欠款开票原因value") + private String arrearsOpenYYValue; + @ApiModelProperty("开票状态Value") + private String billStateValue; // 开票状态Value + @ApiModelProperty("开票状态key") + private String billStateKey;// 开票状态key + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型名称") + private String modelName; // 车型名称 + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("开票车辆信息") private List finBillVehicles; // 开票车辆信息 - @ApiModelProperty("附件信息") - private List finBillFileVos; // 附件信息 + @ApiModelProperty("开票挂车信息") + private List finBillTrailers; // 开票挂车信息 + @ApiModelProperty("客户开票申请书") + private List khkpsqsApplicationAppendxs; // 客户开票申请书 + @ApiModelProperty("开票信息确认书") + private List kpxxqrsApplicationAppendxs; // 开票信息确认书 + @ApiModelProperty("车辆登记合同") + private List cldjhtApplicationAppendxs; // 车辆登记合同 } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java index b35931c891..e9bfe04bf8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java @@ -27,6 +27,8 @@ package com.yxt.anrui.fin.api.finbillapplication; import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailer; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto; import com.yxt.common.core.dto.Dto; @@ -34,6 +36,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -55,10 +58,10 @@ public class FinBillApplicationDto implements Dto { private String sid; // sid + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid @ApiModelProperty("userSid") private String userSid; // userSid - @ApiModelProperty("业务员sid") - private String staffSid; // 业务员sid @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 @ApiModelProperty("合同sid") @@ -75,10 +78,6 @@ public class FinBillApplicationDto implements Dto { private String totalBillMoney; // 开票金额合计 @ApiModelProperty("申请日期") private String applyDate; // 申请日期 - @ApiModelProperty("开票状态") - private String billState; // 开票状态 - @ApiModelProperty("开票公共表sid") - private String billAppPublicSid; // 开票公共表sid @ApiModelProperty("流程定义的id") private String procDefId; @ApiModelProperty("环节定义的sid") @@ -95,12 +94,64 @@ public class FinBillApplicationDto implements Dto { private String remarks; // 备注 @ApiModelProperty("当前用户部门全路径") private String orgSidPath; + + @ApiModelProperty(value = "发起部门sid") + private String deptSid; + @ApiModelProperty(value = "发起部门名称") + private String deptName; + @ApiModelProperty(value = "销售专员sid") + private String staffSid; + @ApiModelProperty(value = "销售专员名称") + private String staffName; + @ApiModelProperty(value = "销售部门sid") + private String saleDeptSid; + @ApiModelProperty(value = "销售部门名称") + private String saleDeptName; + @ApiModelProperty(value = "销售类型key") + private String saleTypeKey; + @ApiModelProperty(value = "销售类型value") + private String saleTypeValue; + @ApiModelProperty(value = "开票单位sid") + private String openTickUnitSid; + @ApiModelProperty(value = "开票单位名称") + private String openTickUnitName; + @ApiModelProperty(value = "是否领取发票原件") + private String isLQOrigInvoice; + @ApiModelProperty(value = "开票类型key") + private String openTickTypeKey; + @ApiModelProperty(value = "开票类型value") + private String openTickTypeValue; + @ApiModelProperty(value = "开票名称sid") + private String openTickSid; + @ApiModelProperty(value = "开票名称") + private String openTickName; + @ApiModelProperty(value = "欠款金额") + private String arrearsMoney; + @ApiModelProperty(value = "承诺回款日期") + private String returnedMoneyDate; + @ApiModelProperty(value = "欠款开票原因key") + private String arrearsOpenYYKey; + @ApiModelProperty(value = "欠款开票原因value") + private String arrearsOpenYYValue; + @ApiModelProperty("开票状态Value") + private String billStateValue; // 开票状态Value + @ApiModelProperty("开票状态key") + private String billStateKey;// 开票状态key + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型名称") + private String modelName; // 车型名称 + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("开票车辆信息") private List finBillVehicles; // 开票车辆信息 + @ApiModelProperty("开票挂车信息") + private List finBillTrailers; // 开票挂车信息 @ApiModelProperty("客户开票申请书附件信息") - private List khkpsqsApplicationAppendxs; // 客户开票申请书附件信息 + private List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 @ApiModelProperty("开票信息确认书附件信息") - private List kpxxqrsApplicationAppendxs; // 开票信息确认书附件信息 + private List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 @ApiModelProperty("车辆登记合同附件信息") - private List cldjhtApplicationAppendxs; // 车辆登记合同附件信息 + private List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java index 9a7d61fba0..5c370bab74 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java @@ -80,40 +80,10 @@ public interface FinBillApplicationFeign { /*************************流程管理接口********************************/ - /* @ApiOperation("列表提交开票申请审批流程") - @PostMapping("/submitFinBillApplicationPageList") - public ResultBean submitFinBillApplicationPageList(@RequestBody @Valid SubmitFinBillApplicationPageListDto dto); -*/ @ApiOperation("提交开票申请审批流程") @PostMapping("/submitFinBillApplication") public ResultBean submitFinBillApplication(@RequestBody @Valid SubmitFinBillApplicationDto dto); - /* @ApiOperation(value = "办理（同意）") - @PostMapping("/complete") - public ResultBean complete(@ApiParam(value = "变量集合,json对象") @RequestBody Map variables); - - @ApiOperation(value = "撤回流程") - @PostMapping(value = "/revokeProcess/{userSid}/{businessSid}") - public ResultBean revokeProcess( - @ApiParam(value = "用户sid") @PathVariable(value = "userSid")String userSid, - @ApiParam(value = "业务sid") @PathVariable(value = "businessSid")String businessSid, - @ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo) ; - - @ApiOperation(value = "驳回任务") - @PostMapping(value = "/reject/{businessSid}") - public ResultBean taskReject(@ApiParam(value = "业务sid") @PathVariable(value = "businessSid")String businessSid, - @ApiParam(value = "工作流任务相关--请求参数")@RequestBody FlowTaskVo flowTaskVo); - - @ApiOperation(value = "终止任务") - @PostMapping(value = "/breakProcess/{businessSid}") - public ResultBean breakProcess(@ApiParam(value = "业务sid") @PathVariable(value = "businessSid")String businessSid, - @RequestBody FlowTaskVo flowTaskVo); - - @ApiOperation(value = "流程历史流转记录" ) - @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}") - public ResultBean flowRecord( @ApiParam(value = "流程实例id")@PathVariable(value = "procInsId")String procInsId, - @ApiParam(value = "目前没用")@PathVariable(value = "deployId")String deployId);*/ - @ApiOperation("提交开票申请审批流程") @PostMapping("/submitBillApplication") public ResultBean submitBillApplication(@RequestBody @Valid SubmitBillApplicationDto dto); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java index eba25e06fc..6da24d5dbe 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java @@ -49,25 +49,24 @@ import lombok.Data; @ApiModel(value = "开票申请表 查询条件", description = "开票申请表 查询条件") public class FinBillApplicationQuery implements Query { - @ApiModelProperty("业务员sid") - private String staffSid; // 业务员sid - @ApiModelProperty("创建人接口") - private String createByName; // 创建人接口 - @ApiModelProperty("分公司sid") + @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - @ApiModelProperty("合同编号") + @ApiModelProperty(value = "销售类型key") + private String saleTypeKey; + @ApiModelProperty("合同编号") private String contractNo; // 合同编号 - @ApiModelProperty("客户名称") + @ApiModelProperty(value = "开票单位名称") + private String openTickUnitName; + @ApiModelProperty("客户名称") private String customerName; // 客户名称 - @ApiModelProperty("开票类型key") - private String billTypeKey; // 开票类型key - @ApiModelProperty("挂靠公司名称") - private String billName; // 挂靠公司名称 + @ApiModelProperty("车型名称") + private String modelName; // 车型名称 + @ApiModelProperty("开票状态key") + private String billStateKey;// 开票状态key + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 @ApiModelProperty("申请开始日期") private String applyStartDate; // 申请开始日期 @ApiModelProperty("申请结束日期") private String applyEndDate; // 申请结束日期 - @ApiModelProperty("开票状态") - private String billState; // 开票状态 - } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java index dffa5cae34..dcf8c47245 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java @@ -50,41 +50,24 @@ import lombok.Data; public class FinBillApplicationVo implements Vo { private String sid; // sid - - @ApiModelProperty("创建人接口") - private String createByName; // 创建人接口 - @ApiModelProperty("分公司sid") - private String useOrgSid; // 分公司sid - @ApiModelProperty("合同sid") - private String contractSid; // 合同sid - @ApiModelProperty("合同编号") + @ApiModelProperty(value = "节点状态") + private String nodeState; + @ApiModelProperty(value = "销售类型value") + private String saleTypeValue; + @ApiModelProperty("合同编号") private String contractNo; // 合同编号 - @ApiModelProperty("客户sid") - private String customerSid; // 客户sid - @ApiModelProperty("客户名称") + @ApiModelProperty(value = "开票单位名称") + private String openTickUnitName; + @ApiModelProperty("客户名称") private String customerName; // 客户名称 - @ApiModelProperty("单台开票金额") - private String oneBillMoney; // 单台开票金额 - @ApiModelProperty("开票金额合计") - private String totalBillMoney; // 开票金额合计 - @ApiModelProperty("开票状态") - private String billState; // 开票状态 - @ApiModelProperty("开票公共表sid") - private String billAppPublicSid; // 开票公共表sid - @ApiModelProperty("流程定义的id") - private String procDefId; - @ApiModelProperty("环节定义的sid") - private String nodeSid; - @ApiModelProperty("流程实例的sid") - private String procInstSid; @ApiModelProperty("车辆总台数") private Integer num; + @ApiModelProperty("开票状态Value") + private String billStateValue; // 开票状态Value + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 @ApiModelProperty("申请日期") private String applyDate; - @ApiModelProperty(value = "节点状态") - private String nodeState; - @ApiModelProperty(value = "是否高低开") - private String isHighAndLowOpen; - @ApiModelProperty(value = "是否延迟开票") - private String isDelayBill; + @ApiModelProperty("车型名称") + private String modelName; // 车型名称 } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailer.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailer.java new file mode 100644 index 0000000000..7a3da90e13 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailer.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finbilltrailer; + +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-fin(开票挂车信息)
+ * File: FinBillTrailer.java
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailer
+ * Description: 开票挂车信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-04-06 16:41:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "开票挂车信息表", description = "开票挂车信息表") +@TableName("fin_bill_trailer") +public class FinBillTrailer extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 + @ApiModelProperty("主车车架号") + private String vinNo; // 主车车架号 + @ApiModelProperty("挂车车架号") + private String gcVinNo; // 挂车车架号 + @ApiModelProperty("开票类型key") + private String billTypeKey; // 开票类型key + @ApiModelProperty("开票类型value") + private String billTypeValue; // 开票类型value + @ApiModelProperty("开票名称sid") + private String openTickSid; // 开票名称sid + @ApiModelProperty("开票名称") + private String openTickName; // 开票名称 + @ApiModelProperty("开票申请单sid") + private String billAppSid; // 开票申请单sid + @ApiModelProperty("单台开票金额") + private BigDecimal oneBillMoney; // 单台开票金额 + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDetailsVo.java new file mode 100644 index 0000000000..67af0386c4 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDetailsVo.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finbilltrailer; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-fin(开票挂车信息)
+ * File: FinBillTrailerVo.java
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo
+ * Description: 开票挂车信息表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-04-06 16:41:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "开票挂车信息表 视图数据详情", description = "开票挂车信息表 视图数据详情") +public class FinBillTrailerDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 + @ApiModelProperty("主车车架号") + private String vinNo; // 主车车架号 + @ApiModelProperty("挂车车架号") + private String gcVinNo; // 挂车车架号 + @ApiModelProperty("开票类型key") + private String billTypeKey; // 开票类型key + @ApiModelProperty("开票类型value") + private String billTypeValue; // 开票类型value + @ApiModelProperty("开票名称sid") + private String openTickSid; // 开票名称sid + @ApiModelProperty("开票名称") + private String openTickName; // 开票名称 + @ApiModelProperty("开票申请单sid") + private String billAppSid; // 开票申请单sid + @ApiModelProperty("单台开票金额") + private String oneBillMoney; // 单台开票金额 + +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDto.java new file mode 100644 index 0000000000..567b9ccd72 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDto.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finbilltrailer; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-fin(开票挂车信息)
+ * File: FinBillTrailerDto.java
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto
+ * Description: 开票挂车信息表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-04-06 16:41:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "开票挂车信息表 数据传输对象", description = "开票挂车信息表 数据传输对象") +public class FinBillTrailerDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 + @ApiModelProperty("主车车架号") + private String vinNo; // 主车车架号 + @ApiModelProperty("挂车车架号") + private String gcVinNo; // 挂车车架号 + @ApiModelProperty("开票类型key") + private String billTypeKey; // 开票类型key + @ApiModelProperty("开票类型value") + private String billTypeValue; // 开票类型value + @ApiModelProperty("开票名称sid") + private String openTickSid; // 开票名称sid + @ApiModelProperty("开票名称") + private String openTickName; // 开票名称 + @ApiModelProperty("开票申请单sid") + private String billAppSid; // 开票申请单sid + @ApiModelProperty("单台开票金额") + private String oneBillMoney; // 单台开票金额 + +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerFeign.java new file mode 100644 index 0000000000..bb5cd1af21 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finbilltrailer; + +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-fin(开票挂车信息)
+ * File: FinBillTrailerFeign.java
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerFeign
+ * Description: 开票挂车信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-04-06 16:41:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "开票挂车信息表") +@FeignClient( + contextId = "anrui-fin-FinBillTrailer", + name = "anrui-fin", + path = "v1/finbilltrailer", + fallback = FinBillTrailerFeignFallback.class) +public interface FinBillTrailerFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody FinBillTrailerDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerFeignFallback.java new file mode 100644 index 0000000000..de8e600124 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finbilltrailer; + +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-fin(开票挂车信息)
+ * File: FinBillTrailerFeignFallback.java
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerFeignFallback
+ * Description: 开票挂车信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-04-06 16:41:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class FinBillTrailerFeignFallback implements FinBillTrailerFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-fin/finbilltrailer/listPage无法访问"); + } + + @Override + public ResultBean save(FinBillTrailerDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-fin/finbilltrailer/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-fin/finbilltrailer/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-fin/finbilltrailer/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerQuery.java new file mode 100644 index 0000000000..21a6eefffb --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerQuery.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finbilltrailer; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-fin(开票挂车信息)
+ * File: FinBillTrailerQuery.java
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerQuery
+ * Description: 开票挂车信息表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-04-06 16:41:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "开票挂车信息表 查询条件", description = "开票挂车信息表 查询条件") +public class FinBillTrailerQuery implements Query { + + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 + @ApiModelProperty("主车车架号") + private String vinNo; // 主车车架号 + @ApiModelProperty("挂车车架号") + private String gcVinNo; // 挂车车架号 + @ApiModelProperty("开票类型key") + private String billTypeKey; // 开票类型key + @ApiModelProperty("开票类型value") + private String billTypeValue; // 开票类型value + @ApiModelProperty("开票名称sid") + private String openTickSid; // 开票名称sid + @ApiModelProperty("开票名称") + private String openTickName; // 开票名称 + @ApiModelProperty("开票申请单sid") + private String billAppSid; // 开票申请单sid + @ApiModelProperty("单台开票金额") + private String oneBillMoney; // 单台开票金额 + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java new file mode 100644 index 0000000000..284a716925 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finbilltrailer; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-fin(开票挂车信息)
+ * File: FinBillTrailerVo.java
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo
+ * Description: 开票挂车信息表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-04-06 16:41:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "开票挂车信息表 视图数据对象", description = "开票挂车信息表 视图数据对象") +public class FinBillTrailerVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 + @ApiModelProperty("主车车架号") + private String vinNo; // 主车车架号 + @ApiModelProperty("挂车车架号") + private String gcVinNo; // 挂车车架号 + @ApiModelProperty("开票类型key") + private String billTypeKey; // 开票类型key + @ApiModelProperty("开票类型value") + private String billTypeValue; // 开票类型value + @ApiModelProperty("开票名称sid") + private String openTickSid; // 开票名称sid + @ApiModelProperty("开票名称") + private String openTickName; // 开票名称 + @ApiModelProperty("开票申请单sid") + private String billAppSid; // 开票申请单sid + @ApiModelProperty("单台开票金额") + private String oneBillMoney; // 单台开票金额 + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java index 1fb27857dc..ae01ec6930 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java @@ -67,4 +67,15 @@ public class FinBillVehicle extends BaseEntity { @ApiModelProperty("开票申请单sid") private String billAppSid; // 开票申请单sid + @ApiModelProperty("开票名称sid") + private String openTickSid; // 开票名称sid + @ApiModelProperty("开票名称") + private String openTickName; // 开票名称 + @ApiModelProperty("合格证状态key") + private String certificateStateKey; // 合格证状态key + @ApiModelProperty("合格证状态value") + private String certificateStateValue; // 合格证状态value + @ApiModelProperty("开票信息") + private String openTickRemarks; // 开票信息 + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java index 31ca1c5bc5..e3222b4858 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java @@ -57,8 +57,7 @@ public class FinBillVehicleDto implements Dto { @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid @ApiModelProperty("车架号") - @JsonProperty("VIN") - private String VIN; // 车架号 + private String vinNo; // 车架号 @ApiModelProperty("开票类型key") private String billTypeKey; // 开票类型key @ApiModelProperty("开票类型value") @@ -71,4 +70,15 @@ public class FinBillVehicleDto implements Dto { private String billAppSid; // 开票申请单sid @ApiModelProperty("备注") private String remarks; // 备注 + + @ApiModelProperty("开票名称sid") + private String openTickSid; // 开票名称sid + @ApiModelProperty("开票名称") + private String openTickName; // 开票名称 + @ApiModelProperty("合格证状态key") + private String certificateStateKey; // 合格证状态key + @ApiModelProperty("合格证状态value") + private String certificateStateValue; // 合格证状态value + @ApiModelProperty("开票信息") + private String openTickRemarks; // 开票信息 } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java index d7cf8c4903..67bc4ab442 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java @@ -57,8 +57,7 @@ public class FinBillVehicleVo implements Vo { @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid @ApiModelProperty("车架号") - @JsonProperty("VIN") - private String VIN; // 车架号 + private String vinNo; // 车架号 @ApiModelProperty("开票类型key") private String billTypeKey; // 开票类型key @ApiModelProperty("开票类型value") @@ -71,4 +70,15 @@ public class FinBillVehicleVo implements Vo { private String billAppSid; // 开票申请单sid @ApiModelProperty("备注") private String remarks; // 备注 + + @ApiModelProperty("开票名称sid") + private String openTickSid; // 开票名称sid + @ApiModelProperty("开票名称") + private String openTickName; // 开票名称 + @ApiModelProperty("合格证状态key") + private String certificateStateKey; // 合格证状态key + @ApiModelProperty("合格证状态value") + private String certificateStateValue; // 合格证状态value + @ApiModelProperty("开票信息") + private String openTickRemarks; // 开票信息 } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java index 7643c77b3d..714aef0e99 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java @@ -69,4 +69,6 @@ public interface FinBillApplicationMapper extends BaseMapper IPage getInvoicedApplyList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); AppBillApplicationIInfoVo getInvoicedApply(@Param("sid") String sid); + + String selectNum(String bill); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml index 2b5ed80d84..ef3099e5e6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml @@ -8,14 +8,16 @@ * FROM fin_bill_application fba - LEFT JOIN fin_bill_vehicle fbv - ON fba.`sid` = fbv.`billAppSid` - ${ew.sqlSegment} + + ${ew.sqlSegment} + + select RIGHT(billNo, 4) + from fin_bill_application + where billNo LIKE concat(#{billNo}, '%') + order by billNo desc + limit 1 + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index dba879f28c..0df431dc61 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -30,12 +30,19 @@ import com.alibaba.fastjson.JSON; import com.alibaba.nacos.api.config.filter.IFilterConfig; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; +import com.yxt.anrui.base.api.basetrailer.TrailerVo; +import com.yxt.anrui.base.api.basevehicle.BaseVehicle; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto; import com.yxt.anrui.base.api.commonappendix.*; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractVo; +import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.DictCommonEnum; import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; +import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AdCarListDto; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapply; import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDetailsVo; @@ -53,12 +60,17 @@ import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublic; import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublicDto; import com.yxt.anrui.fin.api.finbillfile.FinBillFile; import com.yxt.anrui.fin.api.finbillfile.FinBillFileAppendxVo; +import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto; import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailer; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo; import com.yxt.anrui.fin.biz.finbillapplicationpublic.FinBillApplicationPublicService; import com.yxt.anrui.fin.biz.finbillfile.FinBillFileService; +import com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerService; import com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleService; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; @@ -114,6 +126,8 @@ public class FinBillApplicationService extends MybatisBaseService createQueryWrapper(FinBillApplicationQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); qw.eq("fba.useOrgSid", query.getUseOrgSid()); - qw.eq("fba.createBySid", query.getStaffSid()); + if (StringUtils.isNotBlank(query.getSaleTypeKey())) { + qw.eq("fba.saleTypeKey", query.getSaleTypeKey()); + } if (StringUtils.isNotBlank(query.getContractNo())) { qw.like("fba.contractNo", query.getContractNo()); } + if (StringUtils.isNotBlank(query.getOpenTickUnitName())) { + qw.like("fba.openTickUnitName", query.getOpenTickUnitName()); + } if (StringUtils.isNotBlank(query.getCustomerName())) { qw.like("fba.customerName", query.getCustomerName()); } - if (StringUtils.isNotBlank(query.getBillTypeKey())) { - qw.eq("fbv.billTypeKey", query.getBillTypeKey()); + if (StringUtils.isNotBlank(query.getModelName())) { + qw.like("fba.modelName", query.getModelName()); } - if (StringUtils.isNotBlank(query.getBillName())) { - qw.eq("fbv.billName", query.getBillName()); + if (StringUtils.isNotBlank(query.getBillStateKey())) { + qw.eq("fba.billStateKey", query.getBillStateKey()); + } + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.eq("fba.createByName", query.getCreateByName()); } String applyStartDate = query.getApplyStartDate(); String applyEndDate = query.getApplyEndDate(); - qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" + qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (fba.applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(applyEndDate), "date_format (fba.applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" ); - if (StringUtils.isNotBlank(query.getCreateByName())) { - qw.like("fba.createByName", query.getCreateByName()); - } - if (StringUtils.isNotBlank(query.getBillState())) { - qw.like("fba.billState", query.getBillState()); - } return qw; } public PagerVo listPageVo(PagerQuery pq) { FinBillApplicationQuery query = pq.getParams(); - String staffSid = query.getStaffSid(); - ResultBean> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid); - List data = sysStaffOrgListByStaffSid.getData(); - String orgSidPath = ""; - for (SysStaffOrgVo datum : data) { - orgSidPath = datum.getOrgSidPath(); - String[] split = orgSidPath.split("/"); - for (String s : split) { - ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(s); - SysOrganizationVo data1 = sysOrganizationVoResultBean.getData(); - Integer isDept = data1.getIsDept(); - String psid = data1.getPsid(); - if (isDept != null) { - if (isDept == 0 && !psid.equals(0)) { - orgSidPath = s; - break; - } - } - } - } - query.setUseOrgSid(orgSidPath); QueryWrapper qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -220,194 +213,113 @@ public class FinBillApplicationService extends MybatisBaseService finBillTrailers = dto.getFinBillTrailers(); List finBillVehicles = dto.getFinBillVehicles(); - List khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs(); - List kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs(); - List cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs(); - CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); + List khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs(); + List kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs(); + List cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs(); if (StringUtils.isBlank(dtoSid)) {//新增 FinBillApplication finBillApplication = new FinBillApplication(); - String sid = finBillApplication.getSid(); - BeanUtil.copyProperties(dto, finBillApplication); - finBillApplication.setSid(sid); - FinBillApplicationPublic finBillApplicationPublic = new FinBillApplicationPublic(); - String sid2 = finBillApplicationPublic.getSid(); - BeanUtil.copyProperties(finBillApplication, finBillApplicationPublic); - finBillApplicationPublic.setSid(sid2); - finBillApplicationPublicService.save(finBillApplicationPublic); - finBillApplication.setBillAppPublicSid(sid2); + BeanUtil.copyProperties(dto, finBillApplication, "sid"); finBillApplication.setNodeState("待提交"); + String billNo = getApplyCode(dto.getUseOrgSid()); + finBillApplication.setBillNo(billNo); save(finBillApplication); + //主车开票信息 for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) { FinBillVehicle finBillVehicle = new FinBillVehicle(); - String sid1 = finBillVehicle.getSid(); - BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle); - finBillVehicle.setSid(sid1); - finBillVehicle.setBillAppSid(sid); + BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle, "sid"); + finBillVehicle.setBillAppSid(finBillApplication.getSid()); finBillVehicleService.save(finBillVehicle); } - for (FinBillApplicationAppendxDto finBillApplicationAppendx : khkpsqsApplicationAppendxs) { - BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); - String filePath = finBillApplicationAppendx.getFilePath(); + //挂车开票信息 + for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) { + FinBillTrailer finBillTrailer = new FinBillTrailer(); + BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid"); + finBillTrailer.setBillAppSid(finBillApplication.getSid()); + finBillTrailerService.save(finBillTrailer); + } + for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) { + String filePath = finBillFileDto.getFileUrl(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); } - commonAppendixDto.setLinkSid(sid); - commonAppendixDto.setFilePath(filePath); - commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); - commonAppendixFeign.save(commonAppendixDto); - FinBillFile finBillFile = new FinBillFile(); - finBillFile.setBillAppSid(sid); - finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); - finBillFile.setFileUrl(filePath); - ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); - CommonAppendixVo data = commonAppendixVoResultBean.getData(); - String sid1 = data.getSid(); - finBillFile.setFileSid(sid1); - finBillFileService.save(finBillFile); + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setFileType("客户开票申请书"); + finBillFileService.saveOrUpdateDto(finBillFileDto); } - for (FinBillApplicationAppendxDto finBillApplicationAppendx : kpxxqrsApplicationAppendxs) { - BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); - String filePath = finBillApplicationAppendx.getFilePath(); + for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) { + String filePath = finBillFileDto.getFileUrl(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); } - commonAppendixDto.setLinkSid(sid); - commonAppendixDto.setFilePath(filePath); - commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); - commonAppendixFeign.save(commonAppendixDto); - FinBillFile finBillFile = new FinBillFile(); - finBillFile.setBillAppSid(sid); - finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); - finBillFile.setFileUrl(filePath); - ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); - CommonAppendixVo data = commonAppendixVoResultBean.getData(); - String sid1 = data.getSid(); - finBillFile.setFileSid(sid1); - finBillFileService.save(finBillFile); + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setFileType("开票信息确认书"); + finBillFileService.saveOrUpdateDto(finBillFileDto); } - for (FinBillApplicationAppendxDto finBillApplicationAppendx : cldjhtApplicationAppendxs) { - BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); - String filePath = finBillApplicationAppendx.getFilePath(); + for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) { + String filePath = finBillFileDto.getFileUrl(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); } - commonAppendixDto.setLinkSid(sid); - commonAppendixDto.setFilePath(filePath); - commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); - commonAppendixFeign.save(commonAppendixDto); - FinBillFile finBillFile = new FinBillFile(); - finBillFile.setBillAppSid(sid); - finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); - finBillFile.setFileUrl(filePath); - ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); - CommonAppendixVo data = commonAppendixVoResultBean.getData(); - String sid1 = data.getSid(); - finBillFile.setFileSid(sid1); - finBillFileService.save(finBillFile); + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setFileType("车辆登记合同"); + finBillFileService.saveOrUpdateDto(finBillFileDto); } - return rb.success().setMsg("保存成功").setData(sid); + return rb.success().setMsg("保存成功").setData(finBillApplication.getSid()); } FinBillApplication finBillApplication = fetchBySid(dtoSid); if (finBillApplication == null) { rb.setMsg("该数据不存在"); } - commonAppendixFeign.deleteFiles(dtoSid); finBillFileService.deleteByFinAppSid(dtoSid); - for (FinBillApplicationAppendxDto finBillApplicationAppendx : khkpsqsApplicationAppendxs) { - BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); - String filePath = finBillApplicationAppendx.getFilePath(); + for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) { + String filePath = finBillFileDto.getFileUrl(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); } - commonAppendixDto.setLinkSid(dtoSid); - commonAppendixDto.setFilePath(filePath); - commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); - commonAppendixFeign.save(commonAppendixDto); - FinBillFile finBillFile = new FinBillFile(); - finBillFile.setBillAppSid(dtoSid); - finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); - finBillFile.setFileUrl(filePath); - finBillFile.setCreateByName(commonAppendixDto.getName()); - ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); - CommonAppendixVo data = commonAppendixVoResultBean.getData(); - if (data == null) { - return rb.setMsg("请上传相关附件"); - } - String sid1 = data.getSid(); - finBillFile.setFileSid(sid1); - finBillFileService.save(finBillFile); + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setFileType("客户开票申请书"); + finBillFileService.saveOrUpdateDto(finBillFileDto); } - for (FinBillApplicationAppendxDto finBillApplicationAppendx : kpxxqrsApplicationAppendxs) { - BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); - String filePath = finBillApplicationAppendx.getFilePath(); + for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) { + String filePath = finBillFileDto.getFileUrl(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); } - commonAppendixDto.setLinkSid(dtoSid); - commonAppendixDto.setFilePath(filePath); - commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); - commonAppendixFeign.save(commonAppendixDto); - FinBillFile finBillFile = new FinBillFile(); - finBillFile.setBillAppSid(dtoSid); - finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); - finBillFile.setFileUrl(filePath); - finBillFile.setCreateByName(commonAppendixDto.getName()); - ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); - CommonAppendixVo data = commonAppendixVoResultBean.getData(); - if (data == null) { - return rb.setMsg("请上传相关附件"); - } - String sid1 = data.getSid(); - finBillFile.setFileSid(sid1); - finBillFileService.save(finBillFile); + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setFileType("开票信息确认书"); + finBillFileService.saveOrUpdateDto(finBillFileDto); } - for (FinBillApplicationAppendxDto finBillApplicationAppendx : cldjhtApplicationAppendxs) { - BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); - String filePath = finBillApplicationAppendx.getFilePath(); + for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) { + String filePath = finBillFileDto.getFileUrl(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); } - commonAppendixDto.setLinkSid(dtoSid); - commonAppendixDto.setFilePath(filePath); - commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); - commonAppendixFeign.save(commonAppendixDto); - FinBillFile finBillFile = new FinBillFile(); - finBillFile.setBillAppSid(dtoSid); - finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); - finBillFile.setFileUrl(filePath); - finBillFile.setCreateByName(commonAppendixDto.getName()); - ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); - CommonAppendixVo data = commonAppendixVoResultBean.getData(); - if (data == null) { - return rb.setMsg("请上传相关附件"); - } - String sid1 = data.getSid(); - finBillFile.setFileSid(sid1); - finBillFileService.save(finBillFile); - } - FinBillApplicationPublicDto finBillApplicationPublicDto = new FinBillApplicationPublicDto(); - String billAppPublicSid = dto.getBillAppPublicSid(); - FinBillApplicationPublic finBillApplicationPublic = finBillApplicationPublicService.fetchBySid(billAppPublicSid); - BeanUtil.copyProperties(dto, finBillApplicationPublic); - finBillApplicationPublic.setSid(billAppPublicSid); - updateBySid(dto, dtoSid); - BeanUtil.copyProperties(finBillApplicationPublic, finBillApplicationPublicDto); - finBillApplicationPublicService.updateBySid(finBillApplicationPublicDto, billAppPublicSid); + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setFileType("车辆登记合同"); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } finBillVehicleService.delByBillAppSid(dtoSid); for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) { FinBillVehicle finBillVehicle = new FinBillVehicle(); - BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle); - finBillVehicle.setSid(finBillVehicleDto.getSid()); + BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle, "sid"); finBillVehicle.setBillAppSid(dtoSid); finBillVehicleService.save(finBillVehicle); } + finBillTrailerService.delByBillAppSid(dtoSid); + for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) { + FinBillTrailer finBillTrailer = new FinBillTrailer(); + BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid"); + finBillTrailer.setBillAppSid(dtoSid); + finBillTrailerService.save(finBillTrailer); + } return rb.success().setMsg("修改成功").setData(dtoSid); } @@ -446,8 +358,51 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); vo.setFinBillVehicles(finBillVehicleVos); - List finBillFileVos = finBillFileService.groupByList(sid); - vo.setFinBillFileVos(finBillFileVos); + List finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid); + if (finBillTrailerVos.size() > 0){ + vo.setFinBillTrailers(finBillTrailerVos); + }else { + for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { + BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finBillVehicleVo.getVinNo(), entity.getUseOrgSid()).getData(); + List trailerVos = baseTrailerFeign.trailerList(baseVehicle.getSid()).getData(); + for (TrailerVo trailerVo : trailerVos) { + FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); + finBillTrailerVo.setBillAppSid(sid); + finBillTrailerVo.setVinNo(finBillVehicleVo.getVinNo()); + finBillTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo()); + finBillTrailerVo.setBillTypeKey(finBillVehicleVo.getBillTypeKey()); + finBillTrailerVo.setBillTypeValue(finBillVehicleVo.getBillTypeValue()); + finBillTrailerVo.setOpenTickSid(finBillVehicleVo.getOpenTickSid()); + finBillTrailerVo.setOpenTickName(finBillVehicleVo.getOpenTickName()); + finBillTrailerVos.add(finBillTrailerVo); + } + } + vo.setFinBillTrailers(finBillTrailerVos); + } + List khkpsqsApplicationAppendxs = finBillFileService.fetchkhkpsqsBySid(sid); + for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { + String fileUrl = khkpsqsApplicationAppendx.getFileUrl(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + fileUrl = urlPrefix + fileUrl; + khkpsqsApplicationAppendx.setFileUrl(fileUrl); + } + List kpxxqrsApplicationAppendxs = finBillFileService.fetchkpxxqrsBySid(sid); + for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) { + String fileUrl = kpxxqrsApplicationAppendx.getFileUrl(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + fileUrl = urlPrefix + fileUrl; + kpxxqrsApplicationAppendx.setFileUrl(fileUrl); + } + List cldjhtApplicationAppendxs = finBillFileService.fetchcldjhtBySid(sid); + for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) { + String fileUrl = cldjhtApplicationAppendx.getFileUrl(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + fileUrl = urlPrefix + fileUrl; + cldjhtApplicationAppendx.setFileUrl(fileUrl); + } + vo.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); + vo.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); + vo.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); return vo; } @@ -1032,7 +987,7 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { AppVinListVo appVinListVo = new AppVinListVo(); - appVinListVo.setVIN(finBillVehicleVo.getVIN()); + appVinListVo.setVIN(finBillVehicleVo.getVinNo()); appVinListVo.setInvoiceName(finBillVehicleVo.getBillName()); appVinListVo.setInvoiceNameKey(finBillVehicleVo.getBillNameSid()); appVinListVo.setBillTypeKey(finBillVehicleVo.getBillTypeKey()); @@ -1328,4 +1283,20 @@ public class FinBillApplicationService extends MybatisBaseService resultBean1 = sysOrganizationFeign.fetchBySid(useOrgSid); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType(BillTypeEnum.KPSQ.getBillType()); + String bill = Rule.getBill(b); + String i = baseMapper.selectNum(bill); + String billNo = ""; + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(bill, 0); + } + return billNo; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java index 6d31543021..abe5f891fa 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java @@ -73,4 +73,13 @@ public interface FinBillFileMapper extends BaseMapper { List fetchFileBySid(@Param("billAppSid") String billAppSid, @Param("fileType") String fileType); List groupByList(String sid); + + @Select("select * from fin_bill_file where billAppSid = #{sid} and fileType = '客户开票申请书'") + List fetchkhkpsqsBySid(String sid); + + @Select("select * from fin_bill_file where billAppSid = #{sid} and fileType = '开票信息确认书'") + List fetchkpxxqrsBySid(String sid); + + @Select("select * from fin_bill_file where billAppSid = #{sid} and fileType = '车辆登记合同'") + List fetchcldjhtBySid(String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java index 547edcbaf7..cb174dd22f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java @@ -145,4 +145,16 @@ public class FinBillFileService extends MybatisBaseService groupByList(String sid) { return baseMapper.groupByList(sid); } + + public List fetchkhkpsqsBySid(String sid) { + return baseMapper.fetchkhkpsqsBySid(sid); + } + + public List fetchkpxxqrsBySid(String sid) { + return baseMapper.fetchkpxxqrsBySid(sid); + } + + public List fetchcldjhtBySid(String sid) { + return baseMapper.fetchcldjhtBySid(sid); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerMapper.java new file mode 100644 index 0000000000..401f84676f --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerMapper.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.finbilltrailer; + +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 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.fin.api.finbilltrailer.FinBillTrailer; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo; + +import java.util.List; + +/** + * Project: anrui-fin(开票挂车信息)
+ * File: FinBillTrailerMapper.java
+ * Class: com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerMapper
+ * Description: 开票挂车信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-04-06 16:41:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface FinBillTrailerMapper extends BaseMapper { + + //@Update("update fin_bill_trailer set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from fin_bill_trailer") + List selectListVo(); + + @Select("select * from fin_bill_trailer where billAppSid = #{sid}") + List fetchByMainSid(String sid); + + @Delete("delete from fin_bill_trailer where billAppSid = #{dtoSid}") + void delByBillAppSid(String dtoSid); +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerMapper.xml new file mode 100644 index 0000000000..3eafda649d --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerRest.java new file mode 100644 index 0000000000..58cd5ec92e --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.finbilltrailer; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailer; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerQuery; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDetailsVo; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerFeign; + +/** + * Project: anrui-fin(开票挂车信息)
+ * File: FinBillTrailerFeignFallback.java
+ * Class: com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerRest
+ * Description: 开票挂车信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-04-06 16:41:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "开票挂车信息表") +@RestController("com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerRest") +@RequestMapping("v1/finbilltrailer") +public class FinBillTrailerRest implements FinBillTrailerFeign { + + @Autowired + private FinBillTrailerService finBillTrailerService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = finBillTrailerService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody FinBillTrailerDto dto){ + ResultBean rb = ResultBean.fireFail(); + finBillTrailerService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + finBillTrailerService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + FinBillTrailerDetailsVo vo = finBillTrailerService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerService.java new file mode 100644 index 0000000000..ee4d883545 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerService.java @@ -0,0 +1,118 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.finbilltrailer; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailer; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerQuery; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDetailsVo; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-fin(开票挂车信息)
+ * File: FinBillTrailerService.java
+ * Class: com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerService
+ * Description: 开票挂车信息表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-04-06 16:41:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class FinBillTrailerService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(FinBillTrailerQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + FinBillTrailerQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(FinBillTrailerDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(FinBillTrailerDto dto){ + FinBillTrailer entity = new FinBillTrailer(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(FinBillTrailerDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + FinBillTrailer entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public FinBillTrailerDetailsVo fetchDetailsVoBySid(String sid){ + FinBillTrailer entity = fetchBySid(sid); + FinBillTrailerDetailsVo vo = new FinBillTrailerDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public List fetchByMainSid(String sid) { + return baseMapper.fetchByMainSid(sid); + } + + public void delByBillAppSid(String dtoSid) { + baseMapper.delByBillAppSid(dtoSid); + } +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 4a68703f87..9814131f79 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -510,7 +510,10 @@ public class FinPaymentrecordService extends MybatisBaseService