From 540397db4d9337ce5fd837b707c440f90fae8f1d Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 10 Oct 2023 14:12:09 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../finginvoiceapply/backups/finginvoiceapplyAdd.vue | 4 ++--
.../views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue
index b1045b306a..5ada26c79d 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue
@@ -6,7 +6,7 @@
{{ viewTitle }}
-
选择车辆
+
选择车辆
保存
提交
@@ -92,7 +92,7 @@
-
+
删除
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue
index dcc9f08b9c..d84f032230 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue
@@ -6,7 +6,7 @@
{{ viewTitle }}
-
选择车辆
+
选择车辆
保存
提交
@@ -91,7 +91,7 @@
-
+
删除
From daebd00e03435d80db0c139128d2f35a653b2d6e Mon Sep 17 00:00:00 2001
From: dimengzhe
Date: Tue, 10 Oct 2023 14:15:00 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BusDeliveredApplyService.java | 34 +++++++++++++++++++
1 file changed, 34 insertions(+)
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 2cfdbb6de5..d2f947e8c7 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
@@ -141,6 +141,8 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.UserQuery;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
@@ -258,6 +260,8 @@ public class BusDeliveredApplyService extends MybatisBaseService loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid);
+ if(!loanFileexamineResultBean.getSuccess()){
+ appCarListVo.setBankStateValue("未审核");
+ appCarListVo.setZlStateValue("否");
+ }else{
+ LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData();
+ if("1".equals(loanFileexamine.getZlState())){
+ appCarListVo.setZlStateValue("是");
+ appCarListVo.setZlState(loanFileexamine.getZlState());
+ }else{
+ appCarListVo.setZlStateValue("否");
+ appCarListVo.setZlState(loanFileexamine.getZlState());
+ }
+ if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){
+ appCarListVo.setBankStateValue("未审核");
+ }else{
+ appCarListVo.setBankStateValue(loanFileexamine.getBankStateValue());
+ appCarListVo.setBankStateKey(loanFileexamine.getBankStateKey());
+ }
+ }
+ }
+
carList.add(appCarListVo);
}
}
From c1e926670be19d808591b2f5b90530081058eeaa Mon Sep 17 00:00:00 2001
From: dimengzhe
Date: Tue, 10 Oct 2023 14:27:59 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../biz/busdelivered/BusDeliveredService.java | 29 +++++++++++++++++++
1 file changed, 29 insertions(+)
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 6e99a5de89..071e86642f 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
@@ -565,6 +565,8 @@ public class BusDeliveredService extends MybatisBaseService loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid);
+ if(!loanFileexamineResultBean.getSuccess()){
+ appCarListVo.setBankStateValue("未审核");
+ appCarListVo.setZlStateValue("否");
+ }else{
+ LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData();
+ if("1".equals(loanFileexamine.getZlState())){
+ appCarListVo.setZlStateValue("是");
+ appCarListVo.setZlState(loanFileexamine.getZlState());
+ }else{
+ appCarListVo.setZlStateValue("否");
+ appCarListVo.setZlState(loanFileexamine.getZlState());
+ }
+ if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){
+ appCarListVo.setBankStateValue("未审核");
+ }else{
+ appCarListVo.setBankStateValue(loanFileexamine.getBankStateValue());
+ appCarListVo.setBankStateKey(loanFileexamine.getBankStateKey());
+ }
+ }
+ }
carList.add(appCarListVo);
}
}
From c1cdf99cc02a6d68cc43eb6472e0a2e21173c019 Mon Sep 17 00:00:00 2001
From: dimengzhe
Date: Tue, 10 Oct 2023 14:42:30 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java | 1 +
.../buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml | 1 +
.../biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java
index 3254df3601..6e36ba3bc9 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java
@@ -56,6 +56,7 @@ public class BusDeliveredApplyVo implements Vo {
private String billNo;
@ApiModelProperty("销售类型")
private String paymentMethod;
+ private String paymentMethodKey;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("客户名称")
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 36380dbbab..b50cece31e 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
@@ -16,6 +16,7 @@
bd.modelName,
bd.billNo,
bd.paymentMethod,
+ bd.paymentMethodKey,
bd.createBySid,
(select count(*) from bus_delivered_apply_details bad where bad.applySid = bd.sid) as num
FROM bus_delivered_apply bd
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
index 4ff4c31925..40d450e2d1 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
@@ -114,7 +114,7 @@
- {{ scope.row.paymentMethod }}
+ {{ scope.row.paymentMethod }}
{{ scope.row.paymentMethod }}
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue
index 36e4e50c08..fbab0fc39e 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue
@@ -176,6 +176,16 @@
{{ remarks(scope.row) }}
+
+
+ {{ scope.row.realBuyer.zlStateValue }}
+
+
+
+
+ {{ scope.row.realBuyer.bankStateValue }}
+
+
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue
index 3163b2027d..5d604ca012 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue
@@ -146,6 +146,16 @@
{{ remarks(scope.row) }}
+
+
+ {{ scope.row.realBuyer.zlStateValue }}
+
+
+
+
+ {{ scope.row.realBuyer.bankStateValue }}
+
+
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue
index 212f7a5433..4586f81ad4 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue
@@ -151,6 +151,16 @@
{{ remarks(scope.row) }}
+
+
+ {{ scope.row.realBuyer.zlStateValue }}
+
+
+
+
+ {{ scope.row.realBuyer.bankStateValue }}
+
+
查看
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue
index fc481d755f..c60b41750f 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue
@@ -175,6 +175,16 @@
{{ remarks(scope.row) }}
+
+
+ {{ scope.row.realBuyer.zlStateValue }}
+
+
+
+
+ {{ scope.row.realBuyer.bankStateValue }}
+
+
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue
index e04ed28a37..52f5135fa0 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue
@@ -149,6 +149,16 @@
{{ remarks(scope.row) }}
+
+
+ {{ scope.row.realBuyer.zlStateValue }}
+
+
+
+
+ {{ scope.row.realBuyer.bankStateValue }}
+
+
查看
From 64a6ed6d1adced1c2abd3e81b46845174fe0fe55 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 10 Oct 2023 15:41:59 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../PcSelBillVinNoQuery.java | 4 +-
.../FinBillApplicationService.java | 18 ++++-
.../finbillvehicle/FinBillVehicleMapper.java | 2 +
.../finbillvehicle/FinBillVehicleMapper.xml | 11 +++
.../finbillvehicle/FinBillVehicleService.java | 4 +
.../autoservice/invoiced/InvoicedFeign.java | 2 +-
.../invoiced/SelBillVinNoPageVo.java | 6 ++
.../autoservice/invoiced/InvoicedService.java | 77 ++++++++++++++-----
8 files changed, 102 insertions(+), 22 deletions(-)
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoQuery.java
index 1d7f4d2a24..ad2e2e6e99 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoQuery.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoQuery.java
@@ -54,8 +54,10 @@ public class PcSelBillVinNoQuery implements Query {
private String orgPath;
@ApiModelProperty("合同号")
private String contractId;
- @ApiModelProperty("已选车架号")
+ @ApiModelProperty("已选车辆sid")
private List vins;
+ @ApiModelProperty("已选车架号")
+ private List vinNos;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("车架号")
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 2ec796c374..127ec19507 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
@@ -405,11 +405,15 @@ public class FinBillApplicationService extends MybatisBaseService 0) {
qw.notIn("bv.linkSid", query.getVins());
}
+ if (query.getVinNos() != null && query.getVinNos().size() > 0) {
+ qw.notIn("bv.linkNo", query.getVinNos());
+ }
//移动端条件
if (StringUtils.isNotBlank(query.getName())) {
qw.and(wrapper -> wrapper.like("bo.contractNo", query.getName()).or().like("bo.customerName", query.getName()));
@@ -1275,6 +1279,14 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicles = dto.getFinBillVehicles();
+ for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
+ int i = finBillVehicleService.checkIsKp(contractNo, finBillVehicle.getVehSid());
+ if (i > 0){
+ return rb.setMsg(finBillVehicle.getVinNo() + "已发起过开票申请");
+ }
+ }
//用户的组织全路径
String orgSidPath = "";
if (StringUtils.isNotBlank(dto.getOrgSidPath())) {
@@ -2420,8 +2432,10 @@ public class FinBillApplicationService extends MybatisBaseService {
List fetchByMainSid(String sid);
List fetchByUseOrgSid(@Param(Constants.WRAPPER) Wrapper qw);
+
+ int checkIsKp(@Param("contractNo") String contractNo,@Param("vehSid") String vehSid);
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.xml
index 1507d51e1d..8b74f8aaf9 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.xml
@@ -45,4 +45,15 @@
AND fba.`nodeState` != "待提交"
AND fba.`nodeState` != "终止"
+
+
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java
index ee3855009f..634d9b547d 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java
@@ -161,4 +161,8 @@ public class FinBillVehicleService extends MybatisBaseService> getInvoicedApplyList(@RequestBody PagerQuery pagerQuery);
@ApiOperation("手机端-删除开票申请")
- @GetMapping("/deleteInvoice")
+ @DeleteMapping("/deleteInvoice")
@ResponseBody
public ResultBean deleteInvoice(@RequestParam("sid") String sid);
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java
index aad8023e41..d9c773eece 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java
@@ -24,6 +24,12 @@ public class SelBillVinNoPageVo implements Vo {
private String invoicingUnit;
@ApiModelProperty("客户名称")
private String name;
+ @ApiModelProperty("单台开票金额")
+ private String invoiceMoney;
+ @ApiModelProperty("车型sid")
+ private String modelSid;
+ @ApiModelProperty("车型名称")
+ private String modelName;
@ApiModelProperty("主车信息")
private List cars;
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
index 2d91415196..0c26cc40e3 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
@@ -50,6 +50,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Date;
import java.util.List;
/**
@@ -128,32 +129,71 @@ public class InvoicedService {
public ResultBean> getSelectVinsList(PagerQuery pagerQuery) {
ResultBean> rb = ResultBean.fireFail();
SelBillVinNoQuery params = pagerQuery.getParams();
- FinBillApplicationQuery finBillApplicationQuery = new FinBillApplicationQuery();
- finBillApplicationQuery.setCreateBySid(params.getUserSid());
- finBillApplicationQuery.setName(params.getName());
- finBillApplicationQuery.setOrgPath(params.getOrgPath());
- //finBillApplicationQuery.setType(params.getType());
- //finBillApplicationQuery.setMenuSid(params.getMenuSid());
- PagerQuery pcq = new PagerQuery<>();
- pcq.setParams(finBillApplicationQuery);
- ResultBean> resultBean = finBillApplicationFeign.listPage(pcq);
- List records = resultBean.getData().getRecords();
- List billApplicationPageVos = new ArrayList<>();
+ PcSelBillVinNoQuery pcSelBillVinNoQuery = new PcSelBillVinNoQuery();
+ pcSelBillVinNoQuery.setUserSid(params.getUserSid());
+ pcSelBillVinNoQuery.setName(params.getName());
+ pcSelBillVinNoQuery.setOrgPath(params.getOrgPath());
+ pcSelBillVinNoQuery.setContractId(params.getContractId());
+ pcSelBillVinNoQuery.setVinNos(params.getVins());
+ PagerQuery pcq = new PagerQuery<>();
+ pcq.setParams(pcSelBillVinNoQuery);
+ PagerVo data = finBillApplicationFeign.getSelectVinsList(pcq).getData();
+ List selBillVinNoPageVos = new ArrayList<>();
+ List selBillZcVos = new ArrayList<>();
PagerVo v = new PagerVo<>();
- v.setRecords(billApplicationPageVos);
+ for (PcSelBillVinNoPageVo record : data.getRecords()) {
+ //第一层
+ SelBillVinNoPageVo selBillVinNoPageVo = new SelBillVinNoPageVo();
+ if (selBillVinNoPageVos.stream().
+ filter(item -> item.getContractId().
+ equals(record.getContractId())).findAny().
+ isPresent()) {
+ } else {
+ selBillZcVos = new ArrayList<>();
+ BeanUtil.copyProperties(record, selBillVinNoPageVo);
+ selBillVinNoPageVo.setInvoiceMoney(record.getKpMoney());
+ selBillVinNoPageVos.add(selBillVinNoPageVo);
+ }
+ //第二层
+ if (selBillVinNoPageVos.stream().
+ filter(item -> item.getContractId().
+ equals(record.getContractId())).findAny().
+ isPresent()) {
+ SelBillZcVo selBillZcVo = new SelBillZcVo();
+ BeanUtil.copyProperties(record, selBillZcVo);
+ //第三层
+ List finBillTrailers = record.getFinBillTrailers();
+ List selBillGcVos = new ArrayList<>();
+ if (finBillTrailers != null && finBillTrailers.size() > 0) {
+ for (PcSelBillGcVo finBillTrailer : finBillTrailers) {
+ SelBillGcVo selBillGcVo = new SelBillGcVo();
+ BeanUtil.copyProperties(finBillTrailer, selBillGcVo);
+ selBillGcVos.add(selBillGcVo);
+ }
+ }
+ selBillZcVo.setFinBillTrailers(selBillGcVos);
+ selBillZcVos.add(selBillZcVo);
+ selBillVinNoPageVo.setCars(selBillZcVos);
+ }
+ }
+ v.setRecords(selBillVinNoPageVos);
return rb.success().setData(v);
}
public ResultBean getInvoicedApply(BillApplicationPageInfoQuery query) {
ResultBean rb = ResultBean.fireFail();
BillApplicationIInfoVo vo = new BillApplicationIInfoVo();
- if (StringUtils.isBlank(query.getSid())){
+ if (StringUtils.isBlank(query.getSid())) {
String userSid = query.getUserSid();
String orgPath = query.getOrgPath();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
- vo.setPublishInfo(sysOrganizationVo.getName() + sysUserVo.getName());
+ vo.setPublishInfo(sysOrganizationVo.getName() + "-" + sysUserVo.getName());
vo.setShowBtn(true);
+ vo.setInvoiceStateKey("001");
+ vo.setInvoiceState("正常开票");
+ vo.setDate(DateUtil.formatDate(new Date()));
+ return rb.success().setData(vo);
}
ResultBean resultBean = finBillApplicationFeign.fetchDetailsBySid(query.getSid());
if (!resultBean.getSuccess()) {
@@ -428,9 +468,9 @@ public class InvoicedService {
FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
BeanUtil.copyProperties(dto, finBillApplicationDto, "carBuyContractImages");
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
- if (dto.getShowBtn()){
+ if (dto.getShowBtn()) {
finBillApplicationDto.setShowBtnStr("1");
- }else {
+ } else {
finBillApplicationDto.setShowBtnStr("0");
}
finBillApplicationDto.setUseOrgSid(useOrgSid);
@@ -540,6 +580,7 @@ public class InvoicedService {
finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC);
+ finBillApplicationDto.setArrearsMoney("0");
ResultBean resultBean = finBillApplicationFeign.save(finBillApplicationDto);
return resultBean;
}
@@ -740,9 +781,9 @@ public class InvoicedService {
public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) {
ResultBean rb = ResultBean.fireFail();
- if (dto.getShowBtn()){
+ if (dto.getShowBtn()) {
List vinList = dto.getVinList();
- if (vinList == null || vinList.size() == 0){
+ if (vinList == null || vinList.size() == 0) {
return rb.setMsg("车辆不能为空");
}
}
From cd9cb5cc2e0908785e61e86a4f47a68a8eaefbfe Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 10 Oct 2023 15:54:07 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../buscenter/biz/busvalcustfiling/BusValcustFilingService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
index f699278ed9..ce85c9561b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
@@ -345,6 +345,7 @@ public class BusValcustFilingService extends MybatisBaseService