From 687c7173e2cae0f3ef881c3981d0e3858c56f6ef Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 14 Sep 2023 09:41:24 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guakaogongsiguanli/guakaogongsiguanli.vue | 53 ------------------- 1 file changed, 53 deletions(-) diff --git a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue index dea4ea96d7..ea3f4c5aa3 100644 --- a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue +++ b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue @@ -530,57 +530,4 @@ export default { } From 340cf07243cc5c2b46b5490d8d7a85213e3a3979 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 14 Sep 2023 10:00:13 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleout/BaseVehicleOutService.java | 28 ++++++++++++-- .../loanfileexamine/LoanFileexamineQuery.java | 1 + .../loanfileexamine/LoanFileexamineVo.java | 5 +++ .../loanfileexamine/LoanFileexamineMapper.xml | 1 + .../LoanFileexamineService.java | 11 +++++- .../fileexamine/FileexamineDetailsVo.java | 18 ++++----- .../api/risk/fileexamine/FileexamineDto.java | 8 ++-- .../risk/fileexamine/FileexamineFeign.java | 9 +---- .../fileexamine/FileexamineFeignFallback.java | 5 --- .../api/risk/fileexamine/FileexamineVo.java | 16 ++++---- .../biz/risk/fileexamine/FileexamineRest.java | 7 +--- .../risk/fileexamine/FileexamineService.java | 37 ++++++++++--------- 12 files changed, 85 insertions(+), 61 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index f4b1ed229f..d69f94ffec 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -71,6 +71,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; +import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign; import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.*; @@ -1764,22 +1765,34 @@ public class BaseVehicleOutService extends MybatisBaseService collectionDetailDtoListOne = new ArrayList<>(); + List collectionDetailDtoList = new ArrayList<>(); OtherReceivable.CollectionDetailDto collectionDetailDtoOne = new OtherReceivable.CollectionDetailDto(); + OtherReceivable.CollectionDetailDto collectionDetailDtoTwo = new OtherReceivable.CollectionDetailDto(); SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(baseVehicleOutApply.getOrgSid()).getData(); collectionDetailDtoOne.setDearDept(sysOrganizationVo2.getOrgCode()); + collectionDetailDtoTwo.setDearDept(sysOrganizationVo2.getOrgCode()); BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(baseVehicleOutApply.getContractNo()).getData(); if ("2".equals(busSalesOrder.getFinancePlan()) && "1".equals(busSalesOrder.getPayTypeKey())) { BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), zcDto.getVinSid()).getData(); String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData(); - if (StringUtils.isNotBlank(otherReceivableMoney)) { + SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData(); + String serviceAmount = solutionsDetailsVo.getServiceAmount(); + if (StringUtils.isNotBlank(otherReceivableMoney) && StringUtils.isNotBlank(serviceAmount)) { + collectionDetailDtoOne.setExTaxMoney("-" + otherReceivableMoney); + collectionDetailDtoTwo.setExTaxMoney(serviceAmount); + collectionDetailDtoList.add(collectionDetailDtoOne); + collectionDetailDtoList.add(collectionDetailDtoTwo); + } else if (StringUtils.isNotBlank(otherReceivableMoney) && StringUtils.isBlank(serviceAmount)) { collectionDetailDtoOne.setExTaxMoney("-" + otherReceivableMoney); + collectionDetailDtoList.add(collectionDetailDtoOne); + } else if (StringUtils.isBlank(otherReceivableMoney) && StringUtils.isNotBlank(serviceAmount)) { + collectionDetailDtoTwo.setExTaxMoney(serviceAmount); + collectionDetailDtoList.add(collectionDetailDtoTwo); } else { return null; } } - collectionDetailDtoListOne.add(collectionDetailDtoOne); - otherReceivableOne.setCollectionDetails(collectionDetailDtoListOne); + otherReceivableOne.setCollectionDetails(collectionDetailDtoList); return otherReceivableOne; } @@ -2240,6 +2253,13 @@ public class BaseVehicleOutService extends MybatisBaseService SELECT lf.`sid`, + bo.sid AS saleOrderSid, bo.`useOrgName`, bo.`orgName`, bo.`staffName`, diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java index 72d090bbf1..b56e1e3b34 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java @@ -103,11 +103,12 @@ public class LoanFileexamineService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("bl.busNo", 305); - if (StringUtils.isNotBlank(query.getMenuUrl())) { + if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) { //======================= PrivilegeQuery privilegeQuery = new PrivilegeQuery(); privilegeQuery.setOrgPath(query.getOrgSidPath()); privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); privilegeQuery.setUserSid(query.getUserSid()); ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { @@ -174,6 +175,14 @@ public class LoanFileexamineService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (LoanFileexamineVo record : pagging.getRecords()) { + List busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSid(record.getSaleOrderSid()).getData(); + String vinNos = ""; + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + vinNos = vinNos + busSalesOrderVehicle.getLinkNo() + ","; + } + record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(","))); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDetailsVo.java index f416193875..b288bca002 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDetailsVo.java @@ -53,21 +53,21 @@ public class FileexamineDetailsVo implements Vo { private String sid; // sid @ApiModelProperty("消贷合同编号") - private String loanContractNo; + private String contractId; @ApiModelProperty("台数") - private Integer num; + private Integer number; @ApiModelProperty("贷款人名称") - private String borrowerName; + private String lenderName; @ApiModelProperty("销售专员名称") - private String staffName; + private String salesName; @ApiModelProperty("车架号拼接") - private String vinNo; + private String vin; @ApiModelProperty("银行卡") - private List yhkImages; + private List bankCard; @ApiModelProperty("购置税发票") - private List gzsfpImages; + private List purchaseTaxInvoice; @ApiModelProperty("保险发票") - private List bxfpImages; + private List insuranceInvoice; @ApiModelProperty("保单") - private List bdImages; + private List insuranceBills; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDto.java index d31bfd0343..3731fed050 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineDto.java @@ -54,11 +54,11 @@ public class FileexamineDto implements Dto { private String sid; // sid @ApiModelProperty("银行卡") - private List yhkImages = new ArrayList<>(); + private List bankCard = new ArrayList<>(); @ApiModelProperty("购置税发票") - private List gzsfpImages = new ArrayList<>(); + private List purchaseTaxInvoice = new ArrayList<>(); @ApiModelProperty("保险发票") - private List bxfpImages = new ArrayList<>(); + private List insuranceInvoice = new ArrayList<>(); @ApiModelProperty("保单") - private List bdImages = new ArrayList<>(); + private List insuranceBills = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeign.java index c93c5c1358..8fd68ab4ca 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeign.java @@ -50,12 +50,12 @@ import org.springframework.web.bind.annotation.*; @FeignClient( contextId = "terminal-Fileexamine", name = "anrui-terminal", - path = "v1/loanfileexamine", + path = "riskcenter/v1/loanData", fallback = FileexamineFeignFallback.class) public interface FileexamineFeign { @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") + @PostMapping("/getLoanDataList") @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); @@ -63,11 +63,6 @@ public interface FileexamineFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody FileexamineDto dto); - - @ApiOperation("根据sid删除记录") - @DeleteMapping("/delBySids") - @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeignFallback.java index 5dec4b54f3..b0eb31ae06 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeignFallback.java @@ -57,11 +57,6 @@ public class FileexamineFeignFallback implements FileexamineFeign { return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanfileexamine/save无法访问"); } - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanfileexamine/delBySids无法访问"); - } - @Override public ResultBean fetchDetailsBySid(String sid){ ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineVo.java index 8e22f9597e..7a053a4653 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineVo.java @@ -51,15 +51,17 @@ public class FileexamineVo implements Vo { private String sid; // sid @ApiModelProperty("消贷合同编号") - private String loanContractNo; + private String contractId; + @ApiModelProperty("资料状态") + private String nodeState; @ApiModelProperty("贷款人名称") - private String borrowerName; + private String lenderName; + @ApiModelProperty("车架号") + private String vin; @ApiModelProperty("台数") - private String num; + private String carNum; @ApiModelProperty("销售专员名称") - private String staffName; - @ApiModelProperty("资料状态") - private String zlState; + private String salesName; @ApiModelProperty("是否上传") - private Boolean isUpload = false; + private Boolean showHandleBtn = false; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineRest.java index 43f61f6603..e5abe20e8d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineRest.java @@ -50,7 +50,7 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "放款资料审核") @RestController -@RequestMapping("v1/loanfileexamine") +@RequestMapping("riskcenter/v1/loanData") public class FileexamineRest implements FileexamineFeign { @Autowired @@ -66,11 +66,6 @@ public class FileexamineRest implements FileexamineFeign { return fileexamineService.save(dto); } - @Override - public ResultBean delBySids(String[] sids) { - return null; - } - @Override public ResultBean fetchDetailsBySid(String sid) { return fileexamineService.fetchDetailsBySid(sid); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineService.java index fb042621d5..2d542a4fbe 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineService.java @@ -64,13 +64,14 @@ public class FileexamineService { for (LoanFileexamineVo record : records) { FileexamineVo fileexamineVo = new FileexamineVo(); fileexamineVo.setSid(record.getSid()); - fileexamineVo.setLoanContractNo(record.getLoanContractNo()); - fileexamineVo.setZlState(record.getZlState()); - fileexamineVo.setBorrowerName(record.getBorrowerName()); - fileexamineVo.setNum(record.getNum()); - fileexamineVo.setStaffName(record.getUseOrgName() + "-" + record.getOrgName() + "-" + record.getStaffName()); + fileexamineVo.setContractId(record.getLoanContractNo()); + fileexamineVo.setNodeState(record.getZlState()); + fileexamineVo.setLenderName(record.getBorrowerName()); + fileexamineVo.setCarNum(record.getNum()); + fileexamineVo.setVin(record.getVinNo()); + fileexamineVo.setSalesName(record.getUseOrgName() + "-" + record.getOrgName() + "-" + record.getStaffName()); if ("未齐全".equals(record.getZlState())) { - fileexamineVo.setIsUpload(true); + fileexamineVo.setShowHandleBtn(true); } fileexamineVos.add(fileexamineVo); } @@ -82,14 +83,14 @@ public class FileexamineService { ResultBean rb = ResultBean.fireFail(); FileexamineDetailsVo fileexamineDetailsVo = new FileexamineDetailsVo(); LoanFileexamineDetailsVo data = loanFileexamineFeign.fetchDetailsBySid(sid).getData(); - fileexamineDetailsVo.setLoanContractNo(data.getLoanContractNo()); - fileexamineDetailsVo.setNum(data.getNum()); - fileexamineDetailsVo.setStaffName(data.getStaffName()); - fileexamineDetailsVo.setVinNo(data.getVinNo()); - fileexamineDetailsVo.setYhkImages(data.getYhkImages()); - fileexamineDetailsVo.setGzsfpImages(data.getGzsfpImages()); - fileexamineDetailsVo.setBxfpImages(data.getBxfpImages()); - fileexamineDetailsVo.setBdImages(data.getBdImages()); + fileexamineDetailsVo.setContractId(data.getLoanContractNo()); + fileexamineDetailsVo.setNumber(data.getNum()); + fileexamineDetailsVo.setSalesName(data.getStaffName()); + fileexamineDetailsVo.setVin(data.getVinNo()); + fileexamineDetailsVo.setBankCard(data.getYhkImages()); + fileexamineDetailsVo.setPurchaseTaxInvoice(data.getGzsfpImages()); + fileexamineDetailsVo.setInsuranceInvoice(data.getBxfpImages()); + fileexamineDetailsVo.setInsuranceBills(data.getBdImages()); return rb.success().setData(fileexamineDetailsVo); } @@ -97,10 +98,10 @@ public class FileexamineService { ResultBean rb = ResultBean.fireFail(); LoanFileDto loanFileDto = new LoanFileDto(); loanFileDto.setSid(dto.getSid()); - loanFileDto.setYhkImages(dto.getYhkImages()); - loanFileDto.setGzsfpImages(dto.getGzsfpImages()); - loanFileDto.setBxfpImages(dto.getBxfpImages()); - loanFileDto.setBdImages(dto.getBdImages()); + loanFileDto.setYhkImages(dto.getBankCard()); + loanFileDto.setGzsfpImages(dto.getPurchaseTaxInvoice()); + loanFileDto.setBxfpImages(dto.getInsuranceInvoice()); + loanFileDto.setBdImages(dto.getInsuranceBills()); loanFileexamineFeign.uploadFile(loanFileDto); return rb.success(); } From 387a6a16e3a5b1a646e373e45cf11b767c1f830e Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 14 Sep 2023 10:04:09 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue index ea3f4c5aa3..06db34b177 100644 --- a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue +++ b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue @@ -268,6 +268,8 @@ export default { } }, mounted() { + // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage + window.addEventListener('message', this.handleMessage) this.$refs['btnbar'].setButtonList(this.btnList) }, created() { @@ -283,7 +285,6 @@ export default { code = event.data.params.code } if (code === 1) { - this.init() this.centerDialogVisible = false } else if (code === 2) { this.dialogHeight = event.data.params.data @@ -304,7 +305,7 @@ export default { procInsId: row.procInstId, token: getStorage() } - this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + this.url = 'http://localhost:9530/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) }, // 搜索条件效果 clicksearchShow() { From 18ff09ba8b3de6a962393688419a4f1e1e53f50d Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 14 Sep 2023 10:08:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue index 06db34b177..4d370ed940 100644 --- a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue +++ b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue @@ -305,7 +305,7 @@ export default { procInsId: row.procInstId, token: getStorage() } - this.url = 'http://localhost:9530/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) }, // 搜索条件效果 clicksearchShow() { From 742a58673fa921b9338f59d4baeca0ac1f6cf04a Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 14 Sep 2023 10:25:49 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B5=84=E6=96=B9?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/src/views/capital/capital.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/capital/capital.vue b/anrui-riskcenter-ui/src/views/capital/capital.vue index 3131c75309..ae9e76d8c1 100644 --- a/anrui-riskcenter-ui/src/views/capital/capital.vue +++ b/anrui-riskcenter-ui/src/views/capital/capital.vue @@ -124,7 +124,10 @@ export default { manageName: '', name: '', mobile: '', - createOrgSid: '' + createOrgSid: '', + userSid: '', + orgPath: '', + menuUrl: '' } } } @@ -190,6 +193,9 @@ export default { // 查询列表信息 getList() { this.listLoading = true + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.listQuery.params.orhPath = window.sessionStorage.getItem('defaultOrgPath') + this.listQuery.params.menuUrl = this.$route.path req.listPage(this.listQuery).then(response => { this.listLoading = false if (response.success) { @@ -216,7 +222,10 @@ export default { manageName: '', name: '', mobile: '', - createOrgSid: '' + createOrgSid: '', + userSid: '', + orgPath: '', + menuUrl: '' } } this.init() From ea4e792c3cb593f88400b9b4ca0116e85b904ad0 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 14 Sep 2023 10:35:26 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=B5=84=E6=96=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loanfinbank/LoanFinBankQuery.java | 8 +++ .../biz/loanfinbank/LoanFinBankService.java | 61 ++++++++++++++++++- 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankQuery.java index 7b8e436e2d..dd8bd27454 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankQuery.java @@ -32,4 +32,12 @@ public class LoanFinBankQuery implements Query { @ApiModelProperty("创建组织sid") private String createOrgSid; private String orgSidPath; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("菜单sid") + private String menuSid; + @ApiModelProperty("菜单url") + private String menuUrl; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java index 10cd6b2803..ebbbce0b6d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java @@ -6,9 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; 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.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanfinbank.*; +import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformation; +import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationQuery; +import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationVo; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; @@ -52,6 +57,8 @@ public class LoanFinBankService extends MybatisBaseService listPage(PagerQuery pq) { LoanFinBankQuery query = pq.getParams(); @@ -87,9 +94,59 @@ public class LoanFinBankService extends MybatisBaseService listPageVo(PagerQuery pq) { - LoanFinBankQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); + LoanFinBankQuery pagerQuery = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(pagerQuery.getOrgPath()); + privilegeQuery.setMenuSid(pagerQuery.getMenuSid()); + privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); + privilegeQuery.setUserSid(pagerQuery.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = pagerQuery.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("orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", pagerQuery.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + //======================= + if (StringUtils.isNotBlank(pagerQuery.getManageName())) { + qw.like("bankName", pagerQuery.getManageName()); + } + if (StringUtils.isNotBlank(pagerQuery.getName())) { + qw.like("contactor", pagerQuery.getName()); + } + if (StringUtils.isNotBlank(pagerQuery.getMobile())) { + qw.like("mobile", pagerQuery.getMobile()); + } + qw.eq("isDelete", 0); + qw.orderByDesc("createTime"); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return p;