From c22ba7173be3d3cec2e8b2646e5f3d8e9d3b0af8 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 3 Jul 2023 11:20:16 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE?=
=?UTF-8?q?=E6=94=BF=E7=AD=96--=E9=80=89=E6=8B=A9=E8=BD=A6=E8=BE=86?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0=E8=BD=A6?=
=?UTF-8?q?=E6=9E=B6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xiaoshouzhengceFlow/relation/vehicleSelect.vue | 10 +++++-----
.../xiaoshouzhengce/relation/vehicleselect.vue | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/relation/vehicleSelect.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/relation/vehicleSelect.vue
index 7509fe02be..5420c6c139 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/relation/vehicleSelect.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/relation/vehicleSelect.vue
@@ -61,9 +61,9 @@
-
-
-
+
+
+
@@ -162,7 +162,7 @@ export default {
vehicleType: '',
vehicleVersion: '',
userSid: '',
- orderingNo: '',
+ vinNo: '',
orgSid: '',
vehSids: []
},
@@ -267,7 +267,7 @@ export default {
this.listQuery.params.vehicleType = ''
this.listQuery.params.vehicleVersion = ''
this.listQuery.params.userSid = ''
- this.listQuery.params.orderingNo = ''
+ this.listQuery.params.vinNo = ''
this.getList()
},
handleSelectionChange(row) {
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/relation/vehicleselect.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/relation/vehicleselect.vue
index d3dc36f03d..ef86d89fee 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/relation/vehicleselect.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/relation/vehicleselect.vue
@@ -61,9 +61,9 @@
-
-
-
+
+
+
至
@@ -177,7 +177,7 @@ export default {
vehicleType: '',
vehicleVersion: '',
userSid: '',
- orderingNo: '',
+ vinNo: '',
orgSid: '',
priceStartDate: '',
priceEndDate: '',
@@ -288,7 +288,7 @@ export default {
this.listQuery.params.vehicleType = ''
this.listQuery.params.vehicleVersion = ''
this.listQuery.params.userSid = ''
- this.listQuery.params.orderingNo = ''
+ this.listQuery.params.vinNo = ''
this.listQuery.params.priceStartDate = ''
this.listQuery.params.priceEndDate = ''
this.listQuery.params.orgPriceStartDate = ''
From 6be14359f6fc9452cc62969f0144c8755008ecd7 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 3 Jul 2023 13:55:24 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2--=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dingdanchaxun/xiaoshoudingdanchaxun.vue | 27 +++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue
index 7b3027469a..09da110879 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue
@@ -61,9 +61,10 @@
-
+
- 下载打印
+ 下载订单
+ 下载合同
@@ -412,6 +413,28 @@ export default {
}
})
},
+ handleDown(row) {
+ var xhr = new XMLHttpRequest()
+ xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + row.contractFilePath + '&outFileName=' + '合同', true)
+ xhr.setRequestHeader('token', getStorage())
+ xhr.responseType = 'blob'
+ xhr.onload = function(e) {
+ // 如果请求执行成功
+ var blob = this.response
+ var filename = '合同.pdf'
+ var a = document.createElement('a')
+ // blob.type="application/octet-stream";
+ // 创键临时url对象
+ var url = URL.createObjectURL(blob)
+ a.href = url
+ a.download = filename
+ a.click()
+ // 释放之前创建的URL对象
+ window.URL.revokeObjectURL(url)
+ }
+ // 发送请求
+ xhr.send()
+ },
handleLook(row) {
this.viewState = 2
let aa = null
From 7c94735cd67f66d04a4c20aab6d18e266c4dd619 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 3 Jul 2023 15:02:12 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8F=91=E7=A5=A8?=
=?UTF-8?q?=E5=86=85=E9=83=A8=E6=8E=A5=E6=94=B6--=E6=8E=A5=E6=94=B6?=
=?UTF-8?q?=E9=99=84=E4=BB=B6=E6=94=B9=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?=
=?UTF-8?q?=E9=A1=B9=E3=80=81=E5=88=97=E8=A1=A8=E5=8E=BB=E6=8E=89=E6=9F=A5?=
=?UTF-8?q?=E7=9C=8B=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/fapiaoneibujieshou/Internalinvoicereceive.vue | 9 +--------
.../fapiaoneibujieshou/InternalinvoicereceiveAdd.vue | 6 +-----
.../fapiaoneibujieshou/Internalinvoicetobereceived.vue | 5 -----
3 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicereceive.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicereceive.vue
index 2a61184fc5..7df6e7572d 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicereceive.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicereceive.vue
@@ -62,11 +62,6 @@
-
-
- 查看
-
-
{{ scope.row.createTime }}
@@ -259,6 +254,7 @@ export default {
this.payType_list = res.data
}
})
+ this.getList()
},
// 序号
indexMethod(index) {
@@ -315,9 +311,6 @@ export default {
}
this.getList()
},
- toInfo(row) {
- this.viewState = 3
- },
handleLook(row) {
this.dialogVisible = true
this.image_list = row.receiveFilesList
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/InternalinvoicereceiveAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/InternalinvoicereceiveAdd.vue
index 4f4cb96e9e..440967bc43 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/InternalinvoicereceiveAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/InternalinvoicereceiveAdd.vue
@@ -75,7 +75,7 @@
- *接收附件
+ 接收附件
@@ -140,10 +140,6 @@ export default {
})
},
handleSave() {
- if (this.formobj.receiveFilesList.length === 0) {
- this.$message({ showClose: true, type: 'error', message: '请上传接收附件' })
- return
- }
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicetobereceived.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicetobereceived.vue
index 162934b683..e9f1778a20 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicetobereceived.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicetobereceived.vue
@@ -61,7 +61,6 @@
确认
- 查看
@@ -346,10 +345,6 @@ export default {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
},
- toInfo(row) {
- this.viewState = 4
- this.$refs['divInfo'].showInfo(row)
- },
resetState() {
this.viewState = 1
},
From 4dbd7d9d581add448e5e76d63918f9a913e7f6b5 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 3 Jul 2023 15:11:13 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/cheliang/cheliangcaigou/cheliangcaigou.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
index e34cd3f368..a23c1723b9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
@@ -50,7 +50,7 @@
- 编辑
+ 编辑
作废
查看
From fa3ad3733aaf394c82fa8f39bea3b789c3a7cc37 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 3 Jul 2023 15:46:57 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=9C=AA=E5=87=BA=E5=BA=93=E8=BD=A6?=
=?UTF-8?q?=E8=BE=86=E5=B7=B2=E8=AE=A4=E6=AC=BE=E9=A1=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/basevehicleout/BaseVehicleOutDto.java | 6 +-
...FinSelectReceivablesDetailedWCKCLRKVo.java | 44 ++++++++
.../FinSelectedReceivablesDetailedFeign.java | 4 +
...ectedReceivablesDetailedFeignFallback.java | 5 +
...ReceivablesPaymentDetailsWCKCLRKQuery.java | 42 +++++++
.../FinSelectedReceivablesDetailedMapper.java | 7 +-
.../FinSelectedReceivablesDetailedMapper.xml | 33 +++++-
.../FinSelectedReceivablesDetailedRest.java | 8 ++
...FinSelectedReceivablesDetailedService.java | 104 ++++++++++++++++--
9 files changed, 236 insertions(+), 17 deletions(-)
create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java
create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsWCKCLRKQuery.java
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
index 3f4708b463..0cfbb30f0c 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
@@ -75,7 +75,7 @@ public class BaseVehicleOutDto implements Dto {
@ApiModelProperty("中介人2编码")
private String middleCodeTwo;
@ApiModelProperty("创建组织sid")
- private String createOrgSid; // 创建组织sid
+ private String createOrgSid;
@ApiModelProperty("上装/挂车物料分组code")
private String trailerOrInstallMGroupCode;
@@ -95,10 +95,10 @@ public class BaseVehicleOutDto implements Dto {
private String totalDealPrice;
@ApiModelProperty("单据编号")
- private String billNo; // 单据编号
+ private String billNo;
@ApiModelProperty("是否要修改客户")
- private String isUpdateOrInsertCrm; // 是否要修改客户
+ private String isUpdateOrInsertCrm;
@ApiModelProperty("财务中客户编码")
private String cwCustomerNo;
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java
new file mode 100644
index 0000000000..55e723e4c5
--- /dev/null
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java
@@ -0,0 +1,44 @@
+package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 已认款项列表
+ * @author: dimengzhe
+ * @date: 2023/6/29
+ **/
+@Data
+public class FinSelectReceivablesDetailedWCKCLRKVo implements Vo {
+
+ @ApiModelProperty("当前行sid")
+ private String sid;
+ @ApiModelProperty("分公司sid")
+ private String useOrgSid;
+ @ApiModelProperty("分公司名称")
+ private String useOrgName;
+ @ApiModelProperty("销售专员部门名称")
+ private String staffDeptName;
+ @ApiModelProperty("销售专员名称")
+ private String staffName;
+ @ApiModelProperty("合同编号")
+ private String contractNo;
+ @ApiModelProperty("全款贷款")
+ private String payType;
+ @ApiModelProperty("客户名称")
+ private String customerName;
+ @ApiModelProperty("联系电话")
+ private String customerPhone;
+ @ApiModelProperty("车架号")
+ private String vinNo;
+ @ApiModelProperty("应收项目名称")
+ private String receivablesName;
+ @ApiModelProperty("认款日期")
+ private String auditDate;
+ @ApiModelProperty("认款金额")
+ private String subscriptionMoney;
+ @ApiModelProperty("剩余金额")
+ private String reveivableMoney;
+}
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java
index a7229c6909..528c98fd91 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java
@@ -83,4 +83,8 @@ public interface FinSelectedReceivablesDetailedFeign {
@ApiOperation("选择已认款项")
@PostMapping("/selectPageList")
ResultBean> selectPageList(@RequestBody PagerQuery pagerQuery);
+
+ @ApiOperation("未出库车辆已认款项列表")
+ @PostMapping("/noOutVehRecPageList")
+ ResultBean> noOutVehRecPageList(@RequestBody PagerQuery pagerQuery);
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java
index 7805be5827..5c86240fba 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java
@@ -83,4 +83,9 @@ public class FinSelectedReceivablesDetailedFeignFallback implements FinSelectedR
return null;
}
+ @Override
+ public ResultBean> noOutVehRecPageList(PagerQuery pagerQuery) {
+ return null;
+ }
+
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsWCKCLRKQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsWCKCLRKQuery.java
new file mode 100644
index 0000000000..9f110879a5
--- /dev/null
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsWCKCLRKQuery.java
@@ -0,0 +1,42 @@
+package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 已认款查询
+ * @author: dimengzhe
+ * @date: 2023/6/29
+ **/
+@Data
+public class FinSelectedReceivablesPaymentDetailsWCKCLRKQuery implements Query {
+
+ @ApiModelProperty("销售专员部门名称")
+ private String staffDeptName;
+ @ApiModelProperty("销售专员名称")
+ private String staffName;
+ @ApiModelProperty("合同编号")
+ private String contractNo;
+ @ApiModelProperty("客户名称")
+ private String customerName;
+ @ApiModelProperty("联系电话")
+ private String mobile;
+ @ApiModelProperty("车架号")
+ private String vinNo;
+ @ApiModelProperty("可用最小金额")
+ private String balanceSmallMoney;
+ @ApiModelProperty("可用最大金额")
+ private String balanceBigMoney;
+
+ @ApiModelProperty("用户sid")
+ private String userSid;
+ @ApiModelProperty("机构sid")
+ private String orgPath;
+ private String menuUrl;
+ private String menuSid;
+
+ @ApiModelProperty("移动端查询条件")
+ private String name;
+
+}
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
index 575771da64..61edc6f0ae 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
@@ -33,10 +33,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery;
import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
-import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo;
-import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
-import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
-import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.SelectCustomerVo;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
import org.apache.ibatis.annotations.*;
@@ -153,4 +150,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper selectUnSelectList(@Param("purchaseSystemSid") String purchaseSystemSid, @Param("userSid") String userSid, @Param("useOrgSid") String useOrgSid);
List selectPageList(@Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name);
+
+ IPage noOutVehRecPageList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw);
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
index 75cb51a568..951625563f 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
@@ -282,8 +282,12 @@
+
+
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java
index 374b5ef129..cca723042b 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java
@@ -26,6 +26,7 @@
package com.yxt.anrui.fin.biz.finselectedreceivablesdetailed;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@@ -105,4 +106,11 @@ public class FinSelectedReceivablesDetailedRest implements FinSelectedReceivable
return new ResultBean>().success().setData(pagerVo);
}
+ @Override
+ public ResultBean> noOutVehRecPageList(PagerQuery pagerQuery) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = finSelectedReceivablesDetailedService.noOutVehRecPageList(pagerQuery);
+ return rb.success().setData(pv);
+ }
+
}
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
index 30fb8057ef..1d560734a5 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
@@ -29,14 +29,20 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery;
import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@@ -71,6 +77,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService listPage(PagerQuery pq) {
FinSelectedReceivablesDetailedQuery query = pq.getParams();
@@ -362,13 +372,13 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService noOutVehRecPageList(PagerQuery pagerQuery) {
+ FinSelectedReceivablesPaymentDetailsWCKCLRKQuery query = pagerQuery.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ //========================================数据授权开始
+ if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
+ //=======================
+ PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+ privilegeQuery.setOrgPath(query.getOrgPath());
+ privilegeQuery.setMenuUrl(query.getMenuUrl());
+ privilegeQuery.setMenuSid(query.getMenuSid());
+ privilegeQuery.setUserSid(query.getUserSid());
+ ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+ if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+ //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+ String orgSidPath = query.getOrgPath();
+ orgSidPath = orgSidPath + "/";
+ int i1 = orgSidPath.indexOf("/");
+ int i2 = orgSidPath.indexOf("/", i1 + 1);
+ int i3 = orgSidPath.indexOf("/", i2 + 1);
+ int i4 = orgSidPath.indexOf("/", i3 + 1);
+ String orgLevelKey = defaultIdReltBean.getData();
+ if ("1".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i1);
+ qw.like("fcc.orgSidPath", orgSidPath);
+ } else if ("2".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i2);
+ qw.like("fcc.orgSidPath", orgSidPath);
+ } else if ("3".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i3);
+ qw.like("fcc.orgSidPath", orgSidPath);
+ } else if ("4".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i4);
+ qw.like("fcc.orgSidPath", orgSidPath);
+ } else if ("5".equals(orgLevelKey)) {
+ qw.eq("fcc.createBySid", query.getUserSid());
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ }
+ qw.eq("ferd.auditState", 3);
+ qw.ne("bv.vehicleState", VehicleState.StockEnum.OUT_STOCK.getCode());
+ if (StringUtils.isNotBlank(query.getStaffDeptName())){
+ qw.like("fcc.staffDeptName",query.getStaffDeptName());
+ }
+ if (StringUtils.isNotBlank(query.getStaffName())){
+ qw.like("fcc.staffName",query.getStaffName());
+ }
+ if (StringUtils.isNotBlank(query.getContractNo())){
+ qw.like("ferd.contractNo",query.getContractNo());
+ }
+ if (StringUtils.isNotBlank(query.getCustomerName())){
+ qw.like("ferd.customerName",query.getCustomerName());
+ }
+ if (StringUtils.isNotBlank(query.getMobile())){
+ qw.like("ferd.customerPhone",query.getMobile());
+ }
+ if (StringUtils.isNotBlank(query.getVinNo())){
+ qw.like("ferd.VIN",query.getVinNo());
+ }
+ String balanceSmallMoney = query.getBalanceSmallMoney();
+ String balanceBigMoney = query.getBalanceBigMoney();
+ //TODO 缺少可用余额查询条件
+ IPage page = PagerUtil.queryToPage(pagerQuery);
+ IPage pagging = baseMapper.noOutVehRecPageList(page, qw);
+ for (FinSelectReceivablesDetailedWCKCLRKVo record : pagging.getRecords()) {
+ String useOrgSid = record.getUseOrgSid();
+ String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName();
+ record.setUseOrgName(useOrgName);
+ }
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
}
\ No newline at end of file