Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 1 year ago
parent
commit
9ea848fcb1
  1. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java
  2. 3
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeo.java
  3. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java
  4. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehRest.java
  5. 140
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java
  6. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java
  7. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java
  8. 9
      anrui-system-ui/src/api/statisticalparameter/statisticalparameter.js
  9. 9
      anrui-system-ui/src/views/statisticalparameter/statisticalparameter.vue

4
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
}

3
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;*/
}

3
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<LoanBeColle
loanBeCollectionVehFile3.setSid(saleVehSid);
loanBeCollectionVehFiles.add(loanBeCollectionVehFile3);
//金融方案sid
LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(loanBeCollectionRecordVehInit.getSalesOrderSid());
LoanBeCollectionVehFile loanBeCollectionVehFile4 = new LoanBeCollectionVehFile();
loanBeCollectionVehFile4.setName("金融方案");
loanBeCollectionVehFile4.setSid(loanSolutions.getSid());
loanBeCollectionVehFile4.setSid(loanBeCollectionRecordVehInit.getSalesOrderSid());
loanBeCollectionVehFiles.add(loanBeCollectionVehFile4);
//家访考察报告sid
String sid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle.getBorrowerSid());

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehRest.java

@ -96,7 +96,9 @@ public class LoanBeCollectionVehRest implements LoanBeCollectionVehFeign {
@Override
public ResultBean<LoanBeCollectionVehDbrDetailsVo> initDbr(String saleVehSid) {
return null;
ResultBean rb = ResultBean.fireFail();
LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = loanBeCollectionVehService.initDbr(saleVehSid);
return rb.success().setData(loanBeCollectionVehDbrDetailsVo);
}
@Override

140
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<LoanBeCollectionVehMapper, LoanBeCollectionVeh> {
private QueryWrapper<LoanBeCollectionVeh> createQueryWrapper(LoanBeCollectionVehQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<LoanBeCollectionVeh> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<LoanBeCollectionVehVo> listPageVo(PagerQuery<LoanBeCollectionVehQuery> pq) {
LoanBeCollectionVehQuery query = pq.getParams();
QueryWrapper<LoanBeCollectionVeh> qw = createQueryWrapper(query);
IPage<LoanBeCollectionVeh> page = PagerUtil.queryToPage(pq);
IPage<LoanBeCollectionVehVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<LoanBeCollectionVehVo> 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<LoanBeCollectionVeh> createQueryWrapper(LoanBeCollectionVehQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<LoanBeCollectionVeh> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<LoanBeCollectionVehVo> listPageVo(PagerQuery<LoanBeCollectionVehQuery> pq) {
LoanBeCollectionVehQuery query = pq.getParams();
QueryWrapper<LoanBeCollectionVeh> qw = createQueryWrapper(query);
IPage<LoanBeCollectionVeh> page = PagerUtil.queryToPage(pq);
IPage<LoanBeCollectionVehVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<LoanBeCollectionVehVo> 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<LoanBeCollectionVehDetailsVo> selByMainSid(String sid) {
return baseMapper.selByMainSid(sid);
}
public List<LoanBeCollectionVehDetailsVo> 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;
}
}

3
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<LoanH
@Update("update loan_homevisit_investigate_otherpeo set mainSid = #{mainSid} where sid = #{sid}")
void updateMainSid(@Param("sid") String sid,@Param("mainSid") String mainSid);
@Select("select * from loan_homevisit_investigate_otherpeo where mainSid = #{mainSid} and saleVehSid = #{saleVehSid}")
LoanHomevisitInvestigateOtherpeoDetailsVo selByMainSidAndSaleVehSid(@Param("mainSid") String mainSid,@Param("saleVehSid") String saleVehSid);
}

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java

@ -114,4 +114,8 @@ public class LoanHomevisitInvestigateOtherpeoService extends MybatisBaseService<
public void updateMainSid(String sid, String mainSid) {
baseMapper.updateMainSid(sid, mainSid);
}
public LoanHomevisitInvestigateOtherpeoDetailsVo selByMainSidAndSaleVehSid(String mainSid, String saleVehSid) {
return baseMapper.selByMainSidAndSaleVehSid(mainSid,saleVehSid);
}
}

9
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
})
}

9
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: ''
}
}

Loading…
Cancel
Save