From d5c4fd71771918103e8d58e38a1477a38758104f Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 18 Apr 2023 14:34:28 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95--=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../relation/financialschemeEdit.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialschemeEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialschemeEdit.vue index d49eb5efd8..72dd90e63f 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialschemeEdit.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialschemeEdit.vue @@ -33,11 +33,11 @@
*主车发票价元 - 融资票据元 - 挂车元 - 保险元 - 购置税元 - 车损上浮元 + 融资票据元 + 挂车元 + 保险元 + 购置税元 + 车损上浮元
From 2ab454210defb72776988a56f3d57d34ecd013bb Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 18 Apr 2023 15:41:06 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruzhang/ruzhangguanli/ruzhangAdd.vue | 21 ++++++++++++++++--- .../ruzhang/ruzhangguanli/ruzhangInfo.vue | 21 ++++++++++++++++--- .../ruzhangguanli/ruzhangDaiBanInfo.vue | 17 ++++++++++++++- .../ruzhangguanli/ruzhangEdit.vue | 17 ++++++++++++++- .../ruzhangguanli/ruzhangYiBanInfo.vue | 17 ++++++++++++++- 5 files changed, 84 insertions(+), 9 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue index 47a836f53b..b8a4955b8f 100644 --- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue @@ -47,6 +47,19 @@ {{ formobj.modelName }} + + +
全款/贷款销售指导价
+ {{ formobj.guidedPrice }} + + +
最新更新时间
+ + {{ formobj.newUpdateDate }} + {{ formobj.newUpdateDate }} + + +
常用配置
@@ -292,7 +305,9 @@ export default { vehicleList: [], vehicleOrderSid: '', orgPath: '', - orgPriceDate: '' + orgPriceDate: '', + guidedPrice: '', + newUpdateDate: '' }, rules: {}, submitdisabled: false @@ -961,7 +976,7 @@ export default { align-items: center; } .spanOneWidth { - width: 120px !important; + width: 140px !important; } .spanTwoWidth { line-height: 42px; @@ -985,6 +1000,6 @@ export default { width: 40% !important; } .addinputwOne { - margin-left: 115px !important; + margin-left: 130px !important; } diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue index 6d62f00089..5847d86831 100644 --- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue @@ -45,6 +45,19 @@ {{ formobj.modelName }} + + +
全款/贷款销售指导价
+ {{ formobj.guidedPrice }} + + +
最新更新时间
+ + {{ formobj.newUpdateDate }} + {{ formobj.newUpdateDate }} + + +
常用配置
@@ -286,7 +299,9 @@ export default { scmFiles: [], vehicleList: [], vehicleOrderSid: '', - orgPriceDate: '' + orgPriceDate: '', + guidedPrice: '', + newUpdateDate: '' }, rules: {}, submitdisabled: false @@ -377,7 +392,7 @@ export default { align-items: center; } .spanOneWidth { - width: 120px !important; + width: 140px !important; } .spanTwoWidth { line-height: 42px; @@ -398,6 +413,6 @@ export default { width: 100%; } .addinputwOne { - margin-left: 115px !important; + margin-left: 130px !important; } diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue index 945bb0fb5c..f616ac873f 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue @@ -47,6 +47,19 @@ {{ formobj.modelName }} + + +
全款/贷款销售指导价
+ {{ formobj.guidedPrice }} + + +
最新更新时间
+ + {{ formobj.newUpdateDate }} + {{ formobj.newUpdateDate }} + + +
常用配置
@@ -321,7 +334,9 @@ export default { scmFiles: [], vehicleList: [], vehicleOrderSid: '', - orgPriceDate: '' + orgPriceDate: '', + guidedPrice: '', + newUpdateDate: '' }, // 环节所需参数 linkByParameter: { diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue index a151bb4ce7..4d7bab3eb1 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue @@ -46,6 +46,19 @@ {{ formobj.modelName }} + + +
全款/贷款销售指导价
+ {{ formobj.guidedPrice }} + + +
最新更新时间
+ + {{ formobj.newUpdateDate }} + {{ formobj.newUpdateDate }} + + +
常用配置
@@ -289,7 +302,9 @@ export default { vehicleList: [], vehicleOrderSid: '', orgPath: '', - orgPriceDate: '' + orgPriceDate: '', + guidedPrice: '', + newUpdateDate: '' }, rules: {}, submitdisabled: false diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue index 54a22104d5..e932ae1bfa 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue @@ -45,6 +45,19 @@ {{ formobj.modelName }} + + +
全款/贷款销售指导价
+ {{ formobj.guidedPrice }} + + +
最新更新时间
+ + {{ formobj.newUpdateDate }} + {{ formobj.newUpdateDate }} + + +
常用配置
@@ -286,7 +299,9 @@ export default { scmFiles: [], vehicleList: [], vehicleOrderSid: '', - orgPriceDate: '' + orgPriceDate: '', + guidedPrice: '', + newUpdateDate: '' }, // 环节所需参数 linkByParameter: { From 254d8f0605a26b5c2c8eecf6af3a2868968675ba Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 19 Apr 2023 10:50:52 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue index c260ded8db..49384135f7 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue @@ -573,6 +573,8 @@ export default { this.$message({ showClose: true, type: 'error', message: '采购系统不能为空' }) return } + this.formobj.purchaseSystemName = this.purchaseName + this.formobj.purchaseSystemSid = this.purchaseSid this.cancel() this.currentLink = true this.dialogList.comment = '同意' @@ -631,8 +633,8 @@ export default { /** 同意任务 */ handleAgree() { this.linkByParameter.comment = this.dialogList.comment - this.linkByParameter.purchaseSystemName = this.purchaseName - this.linkByParameter.purchaseSystemSid = this.purchaseSid + this.linkByParameter.purchaseSystemName = this.formobj.purchaseSystemName + this.linkByParameter.purchaseSystemSid = this.formobj.purchaseSystemSid completeBy(this.linkByParameter).then((response) => { if (response.success) { this.$notify({ From 5be678f02493064c42195312bc61fede259a98dd Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 19 Apr 2023 13:30:54 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/api/finvehicleinvoice/FinVehicleInvoice.java | 10 ++++++++++ .../FinVehicleInvoiceDetailsVo.java | 2 ++ .../api/finvehicleinvoice/FinVehicleInvoiceDto.java | 10 ++++++++++ .../api/finvehicleinvoice/FinVehicleInvoiceVo.java | 10 ++++++++++ .../finvehicleinvoice/FinVehicleInvoiceMapper.xml | 12 +++++++++++- 5 files changed, 43 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 54cafdfda6..dc839a843f 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 @@ -126,4 +126,14 @@ public class FinVehicleInvoice extends BaseEntity { @ApiModelProperty("业务状态") private String businessState; + @ApiModelProperty("地址") + private String address; + @ApiModelProperty("联系电话") + private String telPhone; + @ApiModelProperty("开户行") + private String openingBank; + @ApiModelProperty("银行账号") + private String bankNum; + @ApiModelProperty("接收人") + private String recipient; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java index 6eca2094bf..9dcc04ae4a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java @@ -49,6 +49,8 @@ public class FinVehicleInvoiceDetailsVo implements Vo { private String invoiceCode; @ApiModelProperty("图片地址") private String filePath; + @ApiModelProperty("地址") + private String address; @ApiModelProperty("图片地址集合") private List filePaths; } 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 57154f6471..89109ced98 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 @@ -96,4 +96,14 @@ public class FinVehicleInvoiceDto implements Dto { private String businessStateKey; @ApiModelProperty("业务状态") private String businessState; + @ApiModelProperty("地址") + private String address; + @ApiModelProperty("联系电话") + private String telPhone; + @ApiModelProperty("开户行") + private String openingBank; + @ApiModelProperty("银行账号") + private String bankNum; + @ApiModelProperty("接收人") + private String recipient; } \ No newline at end of file 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 289611bbc3..9508c9f1f0 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 @@ -71,4 +71,14 @@ public class FinVehicleInvoiceVo implements Vo { private String businessStateKey; @ApiModelProperty("业务状态") private String businessState; + @ApiModelProperty("地址") + private String address; + @ApiModelProperty("联系电话") + private String telPhone; + @ApiModelProperty("开户行") + private String openingBank; + @ApiModelProperty("银行账号") + private String bankNum; + @ApiModelProperty("接收人") + private String recipient; } 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 7d224ecb79..173b693d76 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 @@ -22,6 +22,11 @@ + + + + + @@ -48,7 +53,12 @@ createTime, invoiceCode, invoiceNo, - filePath + filePath, + address, + telPhone, + openingBank, + bankNum, + recipient FROM fin_vehicle_invoice ${ew.sqlSegment} From a686dacec306d536b8df6e2549178ecd16bb5c24 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 19 Apr 2023 13:44:22 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/finvehicleinvoice/FinVehicleInvoice.java | 4 ++++ .../finvehicleinvoice/FinVehicleInvoiceDto.java | 9 ++++++--- .../api/finvehicleinvoice/FinVehicleInvoiceVo.java | 14 +++++++++----- .../finvehicleinvoice/FinVehicleInvoiceMapper.xml | 4 +++- 4 files changed, 22 insertions(+), 9 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 dc839a843f..08191d7a08 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 @@ -136,4 +136,8 @@ public class FinVehicleInvoice extends BaseEntity { private String bankNum; @ApiModelProperty("接收人") private String recipient; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("移交日期") + private Date transferTime; + } 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 89109ced98..7367418d04 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 @@ -34,10 +34,10 @@ public class FinVehicleInvoiceDto implements Dto { private Integer lockVersion; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("创建时间") - private String createTime; + private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("修改时间") - private String modifyTime; + private Date modifyTime; @ApiModelProperty("是否可用：1可用，0不可用") private Integer isEnable; private Integer state; @@ -62,7 +62,7 @@ public class FinVehicleInvoiceDto implements Dto { private BigDecimal vehiclAmount; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("最大发票开票日期") - private String invoiceDate; + private Date invoiceDate; @ApiModelProperty("发票号") private String invoiceNo; @ApiModelProperty("发票代码") @@ -106,4 +106,7 @@ public class FinVehicleInvoiceDto implements Dto { private String bankNum; @ApiModelProperty("接收人") private String recipient; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("移交日期") + private Date transferTime; } \ No newline at end of file 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 9508c9f1f0..1d1fb5f375 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 @@ -52,18 +52,18 @@ public class FinVehicleInvoiceVo implements Vo { private String customerName; @ApiModelProperty("车架号") private String vinNo; - @ApiModelProperty("开票名称") + @ApiModelProperty("开票名称") private String invoicingName; - @ApiModelProperty("开票金额") + @ApiModelProperty("开票金额") private String invoiceAmount; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("开票日期") private Date createTime; - @ApiModelProperty("发票代码") + @ApiModelProperty("发票代码") private String invoiceCode; @ApiModelProperty("发票号") private String invoiceNo; - @ApiModelProperty("发票图片") + @ApiModelProperty("发票图片") private String filePath; @ApiModelProperty("发票图片集合") private List filePaths; @@ -81,4 +81,8 @@ public class FinVehicleInvoiceVo implements Vo { private String bankNum; @ApiModelProperty("接收人") private String recipient; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("移交日期") + private Date transferTime; + } 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 173b693d76..f40279d4dc 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 @@ -27,6 +27,7 @@ + @@ -58,7 +59,8 @@ telPhone, openingBank, bankNum, - recipient + recipient, + transferTime FROM fin_vehicle_invoice ${ew.sqlSegment} From c725ffa244420fa2e80a98ebe18a1f8ce6e40c4e Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 19 Apr 2023 14:48:15 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busdelivered/AppDeliveredDetailsVo.java | 5 ++ .../BusDeliveredApplyFeign.java | 6 ++ .../BusDeliveredApplyFeignFallback.java | 5 ++ .../BusDeliveredExamineQuery.java | 2 + .../api/busdeliveredapply/DeliveredFinVo.java | 33 ++++++++++ .../api/busdeliveredapply/FinSelectVo.java | 24 ++++++++ .../api/busdeliveredapply/VinInvoiceVo.java | 45 ++++++++++++++ .../app/order/AppOrderDetailsVo.java | 2 + .../biz/busdelivered/BusDeliveredService.java | 7 +++ .../BusDeliveredApplyMapper.xml | 2 +- .../BusDeliveredApplyRest.java | 5 ++ .../BusDeliveredApplyService.java | 61 +++++++++++++++++-- .../bussalesorder/BusSalesOrderService.java | 1 + ...inUncollectedReceivablesDetailedFeign.java | 7 ++- ...ectedReceivablesDetailedFeignFallback.java | 5 ++ .../ReceiveInvoiceVo.java | 20 ++++++ .../ReceiveSeleteVo.java | 24 ++++++++ .../fin/api/finvehicleinvoice/InvoiceVo.java | 42 +++++++++++++ ...nUncollectedReceivablesDetailedMapper.java | 3 +- ...inUncollectedReceivablesDetailedMapper.xml | 5 ++ ...FinUncollectedReceivablesDetailedRest.java | 7 ++- ...UncollectedReceivablesDetailedService.java | 32 +++++++++- .../FinVehicleInvoiceMapper.java | 1 + .../FinVehicleInvoiceMapper.xml | 3 + .../FinVehicleInvoiceService.java | 4 ++ 25 files changed, 337 insertions(+), 14 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/DeliveredFinVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/FinSelectVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/VinInvoiceVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/ReceiveInvoiceVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/ReceiveSeleteVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/InvoiceVo.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java index 29e1900ec9..fb21be4280 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java @@ -96,5 +96,10 @@ public class AppDeliveredDetailsVo implements Vo { @ApiModelProperty("PC服务费合计2") private String pcDistributorPriceTwoAll; + @ApiModelProperty("销售订单sid") + private String busSalesOrderSid; + + private String taskDefKey; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java index cb2a43fc83..91840a42c5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java @@ -210,4 +210,10 @@ public interface BusDeliveredApplyFeign { @ResponseBody public ResultBean submitAppDeliveredApply(@Valid @RequestBody AppSubmitDeliveredApplyDto dto); + + @ApiOperation("查看车辆的款票情况") + @GetMapping("/deliveredFinSelect") + @ResponseBody + ResultBean deliveredFinSelect(@RequestParam("contractNo") String contractNo, @RequestParam("vinSid") String vinSid); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java index 4a2bffce77..261dde0ba4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java @@ -111,6 +111,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign { return null; } + @Override + public ResultBean deliveredFinSelect(String contractNo, String vinSid) { + return null; + } + @Override public ResultBean complete(BusDeliveredApplyCompleteDto query) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java index 50e5ed442d..c32df6735e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java @@ -24,4 +24,6 @@ public class BusDeliveredExamineQuery implements Query { private String applyName; @ApiModelProperty(value = "员工sid") private String staffSid; + @ApiModelProperty("orgPath") + private String orgPath; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/DeliveredFinVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/DeliveredFinVo.java new file mode 100644 index 0000000000..06e886494f --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/DeliveredFinVo.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.buscenter.api.busdeliveredapply; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/4/19 9:22 + * @Description + */ +@Data +public class DeliveredFinVo { + + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("销售类型") + private String paymentMethod; + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("车型") + private String modelName; + @ApiModelProperty("款项情况") + private List finSelectVoList = new ArrayList<>(); + @ApiModelProperty("发票情况") + private VinInvoiceVo vinInvoiceVo; + + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/FinSelectVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/FinSelectVo.java new file mode 100644 index 0000000000..4511c3dd41 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/FinSelectVo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.buscenter.api.busdeliveredapply; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/4/19 10:30 + * @Description + */ +@Data +public class FinSelectVo { + + @ApiModelProperty("款项名称") + private String receivablesName; + + @ApiModelProperty("应收金额") + private String reveivableMoney; + @ApiModelProperty("已收金额") + private String subscriptionMoneyAll; + + @ApiModelProperty("未收金额") + private String notSubscriptionMoney; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/VinInvoiceVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/VinInvoiceVo.java new file mode 100644 index 0000000000..eec697914a --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/VinInvoiceVo.java @@ -0,0 +1,45 @@ +package com.yxt.anrui.buscenter.api.busdeliveredapply; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author dimengzhe + * @Date 2023/4/19 10:35 + * @Description + */ +@Data +public class VinInvoiceVo { + + //开票名称 + private String invoicingName; + //税号 + private String invoiceNo; + //开票单位 + private String invoiceTitle; + //开票类型 + private String invoiceType; + //开票状态 + private String billingState; + //开票金额 + private String invoiceAmount; + //开票日期 + private String invoiceDate; + //移交状态 + private String transferState; + @ApiModelProperty("地址") + private String address; + @ApiModelProperty("联系电话") + private String telPhone; + @ApiModelProperty("开户行") + private String openingBank; + @ApiModelProperty("银行账号") + private String bankNum; + @ApiModelProperty("接收人") + private String recipient; + @ApiModelProperty("移交日期") + private String transferTime; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java index fd654dba03..ea2a27eb06 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java @@ -137,5 +137,7 @@ public class AppOrderDetailsVo implements Vo { private List financeForms = new ArrayList<>(); + private String busSalesOrderSid; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index ae6f7f2c37..3748a4b0ff 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java @@ -400,6 +400,13 @@ public class BusDeliveredService extends MybatisBaseService resultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(busDeliveredApply.getContractNo()); + if (!resultBean.getSuccess()) { + log.error("获取销售订单详情出错啦！！！"); + return rb; + } + appDeliveredDetailsVo.setTaskDefKey(busDeliveredApply.getTaskDefKey()); + appDeliveredDetailsVo.setBusSalesOrderSid(resultBean.getData().getBusSalesOrderSid()); List busDeliveredApplyDetailsList = busDeliveredApplyDetailsService.selectByApplySid(query.getOutboundSid()); busDeliveredApplyDetailsList.removeAll(Collections.singleton(null)); //pc发起人 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml index 161b83a0f0..3dbcdba573 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml @@ -95,7 +95,7 @@ + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java index e717c1a974..546ea34428 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java @@ -129,7 +129,12 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece @Override public ResultBean createPdf(String detailedSid, String createBySid) throws Exception { - return finUncollectedReceivablesDetailedService.createPdf(detailedSid,createBySid); + return finUncollectedReceivablesDetailedService.createPdf(detailedSid, createBySid); + } + + @Override + public ResultBean receivedSelect(String busVinSid, String vinSid) { + return finUncollectedReceivablesDetailedService.receivedSelect(busVinSid, vinSid); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index c302d6f729..2f0f7e2703 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -36,13 +36,15 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; -import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; +import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice; +import com.yxt.anrui.fin.api.finvehicleinvoice.InvoiceVo; import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService; import com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingService; import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; +import com.yxt.anrui.fin.biz.finvehicleinvoice.FinVehicleInvoiceService; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign; @@ -63,10 +65,8 @@ import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.io.File; import java.io.InputStream; import java.math.BigDecimal; @@ -118,6 +118,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService private LoanSolutionsFeign loanSolutionsFeign; @Autowired private FinCompanyInvoicingService finCompanyInvoicingService; + @Autowired + private FinVehicleInvoiceService finVehicleInvoiceService; private QueryWrapper createQueryWrapper(FinUncollectedReceivablesDetailedQuery query) { /** @@ -343,6 +345,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService qw.orderByDesc("createTime"); return qw; } + public PagerVo detailedListPageVo(PagerQuery pq) { FinUncollectedReceivablesDetailedQuery params = pq.getParams(); String orgPath = params.getOrgPath(); @@ -742,4 +745,27 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService } } + public ResultBean receivedSelect(String busVinSid, String vinSid) { + ResultBean rb = ResultBean.fireFail(); + ReceiveInvoiceVo receiveInvoiceVo = new ReceiveInvoiceVo(); + //根据销售订单车辆sid查询应收未收表中该车的情况 + List receiveSeleteVoList = baseMapper.receivedSelect(busVinSid); + receiveSeleteVoList.removeAll(Collections.singleton(null)); + if (!receiveSeleteVoList.isEmpty()) { + for (int i = 0; i < receiveSeleteVoList.size(); i++) { + ReceiveSeleteVo receiveSeleteVo = receiveSeleteVoList.get(i); + BigDecimal notSubscriptionMoney = new BigDecimal(receiveSeleteVo.getReveivableMoney()).subtract(new BigDecimal(receiveSeleteVo.getSubscriptionMoneyAll())); + receiveSeleteVo.setNotSubscriptionMoney(notSubscriptionMoney.toString()); + } + } + receiveInvoiceVo.setReceiveSeleteVoList(receiveSeleteVoList); + //根据车辆sid查询该车辆的发票信息 + FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(vinSid); + if(finVehicleInvoice != null){ + InvoiceVo invoiceVo = new InvoiceVo(); + BeanUtils.copyProperties(finVehicleInvoice,invoiceVo); + receiveInvoiceVo.setInvoiceVo(invoiceVo); + } + return rb.success().setData(receiveInvoiceVo); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java index 0a8d784ab3..8f96b09bf4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java @@ -44,4 +44,5 @@ public interface FinVehicleInvoiceMapper extends BaseMapper { FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid); + FinVehicleInvoice selectByVinSid(String vinSid); } \ No newline at end of file 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 f40279d4dc..b1ebc7f169 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 @@ -156,4 +156,7 @@ WHERE v.isDelete = '0' AND v.sid = #{sid} + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index 54991d7cc1..fc6e3a5e25 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -235,4 +235,8 @@ public class FinVehicleInvoiceService extends MybatisBaseService Date: Wed, 19 Apr 2023 14:50:02 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b1ebc7f169..bbb297e9a1 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 @@ -157,6 +157,6 @@ \ No newline at end of file From c61cb0f13629e412c5a1187ffba86c7f8a07b0ee Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 19 Apr 2023 15:30:18 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinVehicleInvoiceDetailsVo.java | 11 +++++++++++ .../finvehicleinvoice/FinVehicleInvoiceMapper.xml | 13 ++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java index 9dcc04ae4a..71487e94af 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java @@ -51,6 +51,17 @@ public class FinVehicleInvoiceDetailsVo implements Vo { private String filePath; @ApiModelProperty("地址") private String address; + @ApiModelProperty("联系电话") + private String telPhone; + @ApiModelProperty("开户行") + private String openingBank; + @ApiModelProperty("银行账号") + private String bankNum; + @ApiModelProperty("接收人") + private String recipient; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("移交日期") + private Date transferTime; @ApiModelProperty("图片地址集合") private List filePaths; } 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 f40279d4dc..14acfa987f 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 @@ -129,6 +129,12 @@ + + + + + + \ No newline at end of file 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 161c25436b..c57d7d08ed 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 @@ -168,6 +168,6 @@ \ No newline at end of file From 43c43a1aee05e2e7355a59cc5a4ea9d53a490180 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 19 Apr 2023 16:12:07 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinUncollectedReceivablesDetailedMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 69c63cdefd..c794cf0e33 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -135,7 +135,7 @@ AND auditState = 3) as subscriptionMoneyAll, ( SELECT - group_concat(remarks) + group_concat(length(remarks)>0,',') FROM fin_selected_receivables_detailed WHERE From 4e0e5bd02b27bee972d6a26af3b1b308d1a46bee Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 19 Apr 2023 17:46:10 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyQuery.java | 2 + .../BusDeliveredExamineQuery.java | 2 + .../BusDeliveredApplyService.java | 10 +++- .../flowable/biz/flowtask/FlowTaskMapper.xml | 19 ++++++-- .../biz/flowtask/FlowTaskService.java | 48 ++++--------------- .../portal/api/flow/FlowTaskAllQuery.java | 4 +- .../portal/biz/flow/FlowableService.java | 12 ++--- 7 files changed, 42 insertions(+), 55 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java index c8f40b58bd..70def67cf3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java @@ -60,5 +60,7 @@ public class BusDeliveredApplyQuery implements Query { private String applyName; @ApiModelProperty(value = "申请人sid") private String applySid; + @ApiModelProperty("销售类型") + private String paymentMethodKey; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java index c32df6735e..00a86c8b62 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java @@ -26,4 +26,6 @@ public class BusDeliveredExamineQuery implements Query { private String staffSid; @ApiModelProperty("orgPath") private String orgPath; + + private String paymentMethodKey; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 145360c311..f6c8956f6d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -183,7 +183,7 @@ public class BusDeliveredApplyService extends MybatisBaseService AND ahpi.START_TIME_ #{endDate} - - and (A0.NAME_ = 'orderNames' and A0.TEXT_ LIKE concat('%',#{names},'%') or arpd.NAME_ LIKE concat('%',#{proDefName},'%')) + + and (A0.NAME_ = 'orderNames' and A0.TEXT_ LIKE concat('%',#{proDefName},'%') or arpd.NAME_ LIKE concat('%',#{proDefName},'%')) + + + and A0.NAME_ = 'INITIATOR' and A0.TEXT_ LIKE concat('%',#{startUserSid},'%') ) flow GROUP BY flow.PROC_INST_ID_ ORDER BY flow.START_TIME_ DESC - + LIMIT #{page},#{size} diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 3ce16a9139..d8af62359e 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -465,7 +465,7 @@ public class FlowTaskService extends MybatisBaseService page = new Page<>(); TaskQuery taskQuery = taskService.createTaskQuery(); - String startUserNameParams = ""; + String startUserSidParams = ""; String names = ""; // 流程参数 @@ -486,8 +486,8 @@ public class FlowTaskService extends MybatisBaseService v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList()); - } - if(StringUtils.isNotBlank(names)){ - String finalNames = names; - flowList = flowList.stream().filter(v -> v.getProcDefName().contains(finalNames)).collect(Collectors.toList()); - } - page.setTotal(flowList.size()); - flowList = flowList.stream().skip((pageNum - 1) * pageSize).limit(pageSize). - collect(Collectors.toList());*/ page.setRecords(flowList); ResultBean> rb = new ResultBean>(); return rb.success().setData(page); @@ -704,8 +695,6 @@ public class FlowTaskService extends MybatisBaseService page = new Page<>(); Map paraMap = new HashMap<>(); List> ll = new ArrayList<>(); - String startUserNameParams = ""; - String names = ""; for (BusinessTaskParam btq : params) { paraMap.put(btq.getField(), btq.getValue()); Map mapss = new HashMap<>(); @@ -720,15 +709,6 @@ public class FlowTaskService extends MybatisBaseService v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList()); - } - if(StringUtils.isNotBlank(names)){ - String finalNames = names; - hisTaskList = hisTaskList.stream().filter(v -> v.getProcDefName().contains(finalNames)).collect(Collectors.toList()); - } - page.setTotal(hisTaskList.size()); - hisTaskList = hisTaskList.stream().skip((pageNum - 1) * pageSize).limit(pageSize). - collect(Collectors.toList());*/ page.setTotal(count); page.setRecords(hisTaskList); ResultBean> rb = new ResultBean>(); @@ -864,11 +832,11 @@ public class FlowTaskService extends MybatisBaseService Date: Wed, 19 Apr 2023 17:46:39 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8C=85=E4=BA=A4?= =?UTF-8?q?=E6=8E=A5=E5=AE=8C=E5=96=84=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDiscountpackageHandoverFeign.java | 4 +++- .../BusDiscountpackageHandoverFeignFallback.java | 4 +++- .../anrui/buscenter/api/busfile/BusFileDto.java | 1 + .../BusDiscountpackageHandoverRest.java | 5 ++--- .../BusDiscountpackageHandoverService.java | 14 +++++++------- .../buscenter/biz/busfile/BusFileService.java | 10 ++++++---- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java index 6e20ab9c02..d1aa312a60 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java @@ -12,12 +12,14 @@ import org.springframework.web.bind.annotation.*; import java.text.ParseException; import java.util.List; + /** * @author Administrator * @description * @date 2023/4/13 14:58 */ + @Api(tags = "优惠包交接表") @FeignClient( contextId = "anrui-buscenter-BusDiscountpackageHandover", @@ -52,6 +54,6 @@ public interface BusDiscountpackageHandoverFeign { @ApiOperation(("上传图片")) @PostMapping("/uploadPicture") - public ResultBean uploadPicture(@RequestBody List fileDtos , String sid); + public ResultBean uploadPicture(@RequestBody BusDiscountpackageHandoverDto dto); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java index 50a9559f1e..7449eb3b64 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java @@ -53,7 +53,9 @@ public class BusDiscountpackageHandoverFeignFallback implements BusDiscountpacka } @Override - public ResultBean uploadPicture(List fileDto, String sid) { + public ResultBean uploadPicture(BusDiscountpackageHandoverDto dto) { return null; } + + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFileDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFileDto.java index 77e5d5841d..002a086dc5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFileDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFileDto.java @@ -12,6 +12,7 @@ import lombok.Data; @Data public class BusFileDto implements Dto { + @ApiModelProperty("关联sid") private String linkSid; @ApiModelProperty("文件类型") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java index aa363074e0..fe4a26048e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java @@ -77,10 +77,9 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove } @Override - public ResultBean uploadPicture(List fileDtos,String sid) { - + public ResultBean uploadPicture(BusDiscountpackageHandoverDto dto) { ResultBean rb = ResultBean.fireFail(); - boolean isUpload = busDiscountpackageHandoverService.uploadPicture(fileDtos,sid); + boolean isUpload = busDiscountpackageHandoverService.uploadPicture(dto); if (isUpload) { return rb.success().setMsg("上传成功"); } else { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java index b3e841380b..9bad06b599 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java @@ -206,7 +206,7 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService busFiles = dto.getBusFiles(); if (null != busFiles) { - uploadPicture(busFiles, sid); + this.uploadPicture(dto); } } else { dto.setState("2"); @@ -237,7 +237,6 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService fileDtos, String sid) { + public boolean uploadPicture(BusDiscountpackageHandoverDto dto) { boolean isSuccess = false; - BusDiscountpackageHandover bh = this.fetchById(sid); - if (null != fileDtos) { - for (BusFileDto busFile : fileDtos) { + BusDiscountpackageHandover bh = this.fetchById(dto.getSid()); + if (null != dto.getBusFiles()) { + List busFiles = dto.getBusFiles(); + for (BusFileDto busFile : busFiles) { BusFile bf = new BusFile(); - busFile.setLinkSid(sid); + busFile.setLinkSid(dto.getSid()); String urlPrefix = fileUploadComponent.getUrlPrefix(); String[] split = busFile.getFilePath().split(urlPrefix); busFile.setFilePath(split[1]); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileService.java index faacbf8649..1b57421f87 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileService.java @@ -1,6 +1,10 @@ package com.yxt.anrui.buscenter.biz.busfile; + import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandover; import com.yxt.anrui.buscenter.api.busfile.BusFile; +import com.yxt.anrui.buscenter.api.busfile.BusFileDto; +import com.yxt.anrui.buscenter.biz.busdiscountpackagehandover.BusDiscountpackageHandoverService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.beans.factory.annotation.Autowired; @@ -18,9 +22,7 @@ import java.util.List; public class BusFileService extends MybatisBaseService { @Autowired private FileUploadComponent fileUploadComponent; + @Autowired + private BusDiscountpackageHandoverService busDiscountpackageHandoverService; - public void saveAll(String sid, List entrustConfirmImages, String attachType) { - - - } }