From 984fbf5c5516668040948c78dd52496476acfd3f Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 19 Dec 2023 15:20:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/statisticalparameter/statisticalparameter.js | 9 +++++++++ .../views/statisticalparameter/statisticalparameter.vue | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/anrui-system-ui/src/api/statisticalparameter/statisticalparameter.js b/anrui-system-ui/src/api/statisticalparameter/statisticalparameter.js index fc1585f5fb..a1ee2b2cab 100644 --- a/anrui-system-ui/src/api/statisticalparameter/statisticalparameter.js +++ b/anrui-system-ui/src/api/statisticalparameter/statisticalparameter.js @@ -43,3 +43,12 @@ export function getButtonPermissions(data) { headers: { 'Content-Type': 'application/json' } }) } + +// 根据当前登录人orgSidPath(全路径sid)查询分公司 +export function getOrgSidByPath(data) { + return request({ + url: '/portal/v1/sysstafforg/getOrgSidByPath', + method: 'get', + params: data + }) +} diff --git a/anrui-system-ui/src/views/statisticalparameter/statisticalparameter.vue b/anrui-system-ui/src/views/statisticalparameter/statisticalparameter.vue index c5fd7dc25b..e8e7d61b44 100644 --- a/anrui-system-ui/src/views/statisticalparameter/statisticalparameter.vue +++ b/anrui-system-ui/src/views/statisticalparameter/statisticalparameter.vue @@ -61,7 +61,7 @@ import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' -import { listPage, getButtonPermissions } from '@/api/statisticalparameter/statisticalparameter' +import { listPage, getButtonPermissions, getOrgSidByPath } from '@/api/statisticalparameter/statisticalparameter' import statisticalparameterAdd from './statisticalparameterAdd' export default { @@ -99,6 +99,7 @@ export default { total: 0, params: { useOrgName: '', + useOrgSid: '', orgPath: '' } } @@ -151,6 +152,11 @@ export default { // 查询列表信息 getList() { this.listLoading = true + getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { + if (res.success) { + this.listQuery.params.useOrgSid = res.data + } + }) this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') listPage(this.listQuery).then(response => { this.listLoading = false @@ -176,6 +182,7 @@ export default { total: 0, params: { useOrgName: '', + useOrgSid: '', orgPath: '' } } From df12253f29e3c80a71956108089ae07a6f596798 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 19 Dec 2023 15:26:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=82=AC=E6=94=B6=E6=8E=AA=E6=96=BD?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanBeCollectionVehDbrDetailsVo.java | 4 - .../LoanHomevisitInvestigateOtherpeo.java | 3 +- .../LoanBeCollectionApplyService.java | 3 +- .../LoanBeCollectionVehRest.java | 4 +- .../LoanBeCollectionVehService.java | 140 ++++++++++-------- ...oanHomevisitInvestigateOtherpeoMapper.java | 3 + ...anHomevisitInvestigateOtherpeoService.java | 4 + 7 files changed, 92 insertions(+), 69 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java index 358170bc4d..e36a273b83 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java @@ -48,8 +48,6 @@ import lombok.Data; @ApiModel(value = "家访考察-其他人员 视图数据详情", description = "家访考察-其他人员 视图数据详情") public class LoanBeCollectionVehDbrDetailsVo implements Vo { - private String sid; // sid - @ApiModelProperty("人员身份key") private String peoTypeKey; @ApiModelProperty("人员身份") @@ -70,7 +68,5 @@ public class LoanBeCollectionVehDbrDetailsVo implements Vo { private String peoCareerKey; // 职业key @ApiModelProperty("职业value") private String peoCareerValue; // 职业value - @ApiModelProperty("家访考察表sid") - private String mainSid; // 家访考察表sid } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeo.java index 80ca438ec8..d59af1007c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeo.java @@ -72,5 +72,6 @@ public class LoanHomevisitInvestigateOtherpeo extends BaseEntity { private String peoCareerValue; // 职业value @ApiModelProperty("家访考察表sid") private String mainSid; // 家访考察表sid - +/* @ApiModelProperty("销售订单车辆sid") + private String mainSid;*/ } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java index 7ef0104f89..cef608620f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java @@ -389,10 +389,9 @@ public class LoanBeCollectionApplyService extends MybatisBaseService initDbr(String saleVehSid) { - return null; + ResultBean rb = ResultBean.fireFail(); + LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = loanBeCollectionVehService.initDbr(saleVehSid); + return rb.success().setData(loanBeCollectionVehDbrDetailsVo); } @Override diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java index 803c6219cc..5d2bb60f96 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java @@ -28,19 +28,20 @@ package com.yxt.anrui.riskcenter.biz.loanbecollectionveh; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; +import com.yxt.anrui.riskcenter.api.loanbecollectionveh.*; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDetailsVo; +import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService; +import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoService; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVeh; -import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehQuery; -import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo; -import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo; -import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto; -import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFeign; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -60,66 +61,83 @@ import java.util.List; */ @Service public class LoanBeCollectionVehService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(LoanBeCollectionVehQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - LoanBeCollectionVehQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public String saveOrUpdateDto(LoanBeCollectionVehDto dto){ + + @Autowired + private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; + @Autowired + private LoanHomevisitInvestigateService loanHomevisitInvestigateService; + @Autowired + private LoanHomevisitInvestigateOtherpeoService loanHomevisitInvestigateOtherpeoService; + + private QueryWrapper createQueryWrapper(LoanBeCollectionVehQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + LoanBeCollectionVehQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public String saveOrUpdateDto(LoanBeCollectionVehDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { - String sid = this.insertByDto(dto); - return sid; + String sid = this.insertByDto(dto); + return sid; } - String sid = this.updateByDto(dto); - return sid; - } - - public String insertByDto(LoanBeCollectionVehDto dto){ - LoanBeCollectionVeh entity = new LoanBeCollectionVeh(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - entity.setCustomerName(dto.getCustName()); - entity.setCustomerPhone(dto.getCustPhone()); - baseMapper.insert(entity); - return entity.getSid(); - } - - public String updateByDto(LoanBeCollectionVehDto dto){ - String dtoSid = dto.getSid(); + String sid = this.updateByDto(dto); + return sid; + } + + public String insertByDto(LoanBeCollectionVehDto dto) { + LoanBeCollectionVeh entity = new LoanBeCollectionVeh(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setCustomerName(dto.getCustName()); + entity.setCustomerPhone(dto.getCustPhone()); + baseMapper.insert(entity); + return entity.getSid(); + } + + public String updateByDto(LoanBeCollectionVehDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return ""; - } - LoanBeCollectionVeh entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - entity.setCustomerName(dto.getCustName()); - entity.setCustomerPhone(dto.getCustPhone()); - baseMapper.updateById(entity); - return entity.getSid(); - } - - public LoanBeCollectionVehDetailsVo fetchDetailsVoBySid(String sid){ - LoanBeCollectionVeh entity = fetchBySid(sid); - LoanBeCollectionVehDetailsVo vo = new LoanBeCollectionVehDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + LoanBeCollectionVeh entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setCustomerName(dto.getCustName()); + entity.setCustomerPhone(dto.getCustPhone()); + baseMapper.updateById(entity); + return entity.getSid(); + } + + public LoanBeCollectionVehDetailsVo fetchDetailsVoBySid(String sid) { + LoanBeCollectionVeh entity = fetchBySid(sid); + LoanBeCollectionVehDetailsVo vo = new LoanBeCollectionVehDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } - public void delByMainSid(String dtoSid) { - baseMapper.delByMainSid(dtoSid); - } + public List selByMainSid(String sid) { + return baseMapper.selByMainSid(sid); + } - public List selByMainSid(String sid) { - return baseMapper.selByMainSid(sid); - } + public LoanBeCollectionVehDbrDetailsVo initDbr(String saleVehSid) { + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(saleVehSid).getData(); + String sid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle.getBorrowerSid()); + LoanHomevisitInvestigateOtherpeoDetailsVo loanHomevisitInvestigateOtherpeoDetailsVo = loanHomevisitInvestigateOtherpeoService.selByMainSidAndSaleVehSid(sid, saleVehSid); + LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = new LoanBeCollectionVehDbrDetailsVo(); + BeanUtil.copyProperties(loanHomevisitInvestigateOtherpeoDetailsVo, loanBeCollectionVehDbrDetailsVo); + return loanBeCollectionVehDbrDetailsVo; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java index 6f21efdd17..90623181de 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java @@ -70,4 +70,7 @@ public interface LoanHomevisitInvestigateOtherpeoMapper extends BaseMapper