diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java index 3f05cd54b8..bad61df04f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java @@ -15,11 +15,8 @@ import java.util.List; public class BaseVehicleExportQuery implements Query { private static final long serialVersionUID = -1272461446561155125L; - /** - * 选中的sid的list - */ - @ApiModelProperty(value = "sids", required = false) - private List sids; + @ApiModelProperty(value = "采购系统") + private String purchaseSystemName; @ApiModelProperty(value = "厂家采购订单类型value") private String manPurOrderTypeValue; @ApiModelProperty(value = "厂家库龄") @@ -62,7 +59,11 @@ public class BaseVehicleExportQuery implements Query { @ApiModelProperty(value = "买断结束日期") private String solidEndDate; - + @ApiModelProperty(value = "分公司名称") + private String orgName; + private String userSid; + private String menuUrl; + private String menuSid; /***************车型查询**********************/ @ApiModelProperty(value = "品牌") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index d6c2a542a2..302509515c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -545,19 +545,61 @@ public class BaseVehicleService extends MybatisBaseService listExcel(BaseVehicleExportQuery pagerQuery) { QueryWrapper qw = new QueryWrapper<>(); - List sids = pagerQuery.getSids(); - - if (sids != null) { - for (String sid : sids) { - if (sids.size() != 0) { - qw.in("bv.sid", sid); + if (pagerQuery != null) { + //========================================数据授权开始 + if (StringUtils.isNotBlank(pagerQuery.getMenuUrl()) || StringUtils.isNotBlank(pagerQuery.getMenuSid())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(pagerQuery.getOrgSidPath()); + privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); + privilegeQuery.setMenuSid(pagerQuery.getMenuSid()); + privilegeQuery.setUserSid(pagerQuery.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = pagerQuery.getOrgSidPath(); + 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("bv.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bv.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bv.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bv.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("bv.createBySid", pagerQuery.getUserSid()); + } else { + List p = new ArrayList<>(); + return p; + } + } else { + List p = new ArrayList<>(); + return p; } } - } - if (pagerQuery != null) { + qw.eq("bv.isDelete", "0"); - if (StringUtils.isNotBlank(pagerQuery.getCreateOrgSid())) { - qw.eq("bv.createOrgSid", pagerQuery.getCreateOrgSid()); +// if (StringUtils.isNotBlank(pagerQuery.getCreateOrgSid())) { +// qw.eq("bv.createOrgSid", pagerQuery.getCreateOrgSid()); +// } + if (StringUtils.isNotBlank(pagerQuery.getOrgName())){ + qw.like("bv.createOrgName",pagerQuery.getOrgName()); + } + if (StringUtils.isNotBlank(pagerQuery.getPurchaseSystemName())){ + qw.like("bv.purchaseSystemName",pagerQuery.getPurchaseSystemName()); + } + if (StringUtils.isNotBlank(pagerQuery.getOrgSid())) { + qw.eq("bv.createOrgSid", pagerQuery.getOrgSid()); } if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {//车架号 qw.like("bv.vinNo", pagerQuery.getVinNo()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 1017983ffa..babee8e210 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -512,11 +512,9 @@ select distinct bo.sid from bus_sales_order bo left join bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid - left join anrui_riskcenter.loan_solutions lo on lo.salesOrderSid = bo.sid ${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结' - - and (lo.typeKey = '01' or lo.typeKey = '02') + and bo.financePlan = '2' and length(bv.linkSid)>0 diff --git a/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue b/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue index d74fc59ceb..675254ccbb 100644 --- a/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue +++ b/anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue @@ -232,7 +232,7 @@
抵顶首年保险费
- +
@@ -246,7 +246,7 @@
抵顶购置税
- +
@@ -383,11 +383,11 @@ export default { return val }, showAdd(value) { - this.finance = value + this.finance = JSON.parse(JSON.stringify(value)) this.init() }, showEdit(value) { - this.finance = value + this.finance = JSON.parse(JSON.stringify(value)) this.init() selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('defaultOrgPath'), isPack: this.finance.isPack }).then((resp) => { if (resp.success) { @@ -665,11 +665,11 @@ export default { } } if (this.finance.dealWayKey === '02' && this.finance.isPack === '1') { - if (parseInt(this.arguments(this.finance.premium)) < parseInt(this.arguments(this.finance.offsetPremium)) && this.finance.premiumCb) { + if (parseInt(this.arguments(this.finance.premium)) < parseInt(this.arguments(this.finance.offsetPremium))) { this.$message({ showClose: true, type: 'error', message: '抵顶首年保险费数额不能大于融资项目中的保险数额' }) return } - if (parseInt(this.arguments(this.finance.purchaseTax)) < parseInt(this.arguments(this.finance.offsetPurchasetax)) && this.finance.purchaseTaxCb) { + if (parseInt(this.arguments(this.finance.purchaseTax)) < parseInt(this.arguments(this.finance.offsetPurchasetax))) { this.$message({ showClose: true, type: 'error', message: '抵顶购置税数额不能大于融资项目中的购置税数额' }) return } diff --git a/anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue b/anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue index 118ba4b386..08aa9c216c 100644 --- a/anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue +++ b/anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue @@ -365,7 +365,7 @@ export default { }, methods: { showInfo(value) { - this.formobj = value + this.formobj = JSON.parse(JSON.stringify(value)) }, financialComputing() { this.viewState = 2 @@ -373,7 +373,7 @@ export default { }, backData(value) { this.viewState = 1 - this.formobj = value + this.formobj = JSON.parse(JSON.stringify(value)) }, backParameters() { this.$emit('backParameters', this.formobj) diff --git a/anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue b/anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue index 47c33531ad..ed7f66dc0e 100644 --- a/anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue +++ b/anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue @@ -286,9 +286,7 @@ export default { methods: { showInfo(value) { this.viewTitle = '金融方案' - this.formobj = value - console.log(value, 8888) - console.log(this.formobj, 9999) + this.formobj = JSON.parse(JSON.stringify(value)) }, handleReturn() { this.$emit('doback') diff --git a/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue b/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue index 6d4ae3d701..3be99b46b4 100644 --- a/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue +++ b/anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue @@ -482,7 +482,7 @@ export default { }, // 金融方案返回的参数 backData(value) { - this.formobj.loanTemplateSolutions = value + this.formobj.loanTemplateSolutions = JSON.parse(JSON.stringify(value)) }, saveOrUpdate() { this.$refs['form_obj'].validate((valid) => { diff --git a/anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsDaiBan.vue index 5bda450ecf..eda1689f32 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsDaiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsDaiBan.vue @@ -198,7 +198,7 @@