yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 2 years ago
parent
83d48ee13c a80f2dbdde
commit
c2342b43cf
12 changed files with 224 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java
  2. 62
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  3. 8
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java
  4. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java
  5. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateQuery.java
  6. 7
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java
  7. 84
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
  8. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java
  9. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java
  10. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigatePageVo.java
  11. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java
  12. 41
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

13
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java
View File

@ -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<String> 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 = "品牌")

62
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
View File

@ -545,19 +545,61 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
public List<BaseVehicleExportVo> listExcel(BaseVehicleExportQuery pagerQuery) {
QueryWrapper<BaseVehicleExportVo> qw = new QueryWrapper<>();
List<String> 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<String> 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<BaseVehicleExportVo> p = new ArrayList<>();
return p;
}
} else {
List<BaseVehicleExportVo> 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());

8
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java
View File

@ -186,4 +186,12 @@ public interface LoanHomevisitInvestigateFeign {
@PostMapping("/saveAssetCertificateInfo")
@ResponseBody
public ResultBean saveAssetCertificateInfo(@Valid @RequestBody LoanHomeVisitInvestigateSaveZCLDto dto);
/******************************************************家访进度*******************************************************/
@ApiOperation("家访进度分页列表")
@PostMapping("/jfjdListPage")
@ResponseBody
public ResultBean<PagerVo<LoanHomevisitInvestigateVo>> jfjdListPage(@RequestBody PagerQuery<LoanHomevisitInvestigateQuery> pq);
}

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java
View File

@ -178,4 +178,9 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateSaveZCLDto dto) {
return null;
}
@Override
public ResultBean<PagerVo<LoanHomevisitInvestigateVo>> jfjdListPage(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
return null;
}
}

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateQuery.java
View File

@ -69,10 +69,14 @@ public class LoanHomevisitInvestigateQuery implements Query {
private String contractNo;
@ApiModelProperty("贷款人名称")
private String loanPeoName;
@ApiModelProperty("资方名称")
private String bankName;
@ApiModelProperty("金融产品名称")
private String policyName;
@ApiModelProperty("家访专员姓名")
private String homeVisStaffName;
@ApiModelProperty("考察结果value")
private String investigateValue;
@ApiModelProperty("组织全路径")
private String orgSidPath;
private String menuSid;

7
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java
View File

@ -201,4 +201,11 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateSaveZCLDto dto) {
return loanHomevisitInvestigateService.saveAssetCertificateInfo(dto);
}
@Override
public ResultBean<PagerVo<LoanHomevisitInvestigateVo>> jfjdListPage(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<LoanHomevisitInvestigateVo> pv = loanHomevisitInvestigateService.jfjdListPage(pq);
return rb.success().setData(pv);
}
}

84
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
View File

@ -894,4 +894,88 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
}
return rb.success();
}
public PagerVo<LoanHomevisitInvestigateVo> jfjdListPage(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
LoanHomevisitInvestigateQuery query = pq.getParams();
QueryWrapper<LoanHomevisitInvestigate> qw = new QueryWrapper<>();
qw.eq("li.state", 2);
qw.eq("bb.busNo", 302);
if (StringUtils.isNotBlank(query.getMenuSid())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgSidPath());
privilegeQuery.setMenuUrl(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.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("bo.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("bo.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("bo.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("bo.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("bo.createBySid", query.getUserSid());
} else {
PagerVo<LoanHomevisitInvestigateVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<LoanHomevisitInvestigateVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("bo.useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getSaleDeptName())) {
qw.like("bo.orgName", query.getSaleDeptName());
}
if (StringUtils.isNotBlank(query.getStaffName())) {
qw.like("bo.staffName", query.getStaffName());
}
if (StringUtils.isNotBlank(query.getContractNo())) {
qw.like("bo.contractNo", query.getContractNo());
}
if (StringUtils.isNotBlank(query.getLoanPeoName())) {
qw.like("bb.borrowerName", query.getLoanPeoName());
}
if (StringUtils.isNotBlank(query.getBankName())) {
qw.like("bb.bankName", query.getBankName());
}
if (StringUtils.isNotBlank(query.getHomeVisStaffName())) {
qw.like("li.homeVisStaffName", query.getHomeVisStaffName());
}
if (StringUtils.isNotBlank(query.getInvestigateValue())) {
qw.like("li.investigateValue", query.getInvestigateValue());
}
String orderStartDate = query.getOrderStartDate();
String orderEndDate = query.getOrderEndDate();
qw.apply(StringUtils.isNotBlank(orderStartDate), "date_format (bo.createDate,'%Y-%m-%d') >= date_format('" + orderStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(orderEndDate), "date_format (bo.createDate,'%Y-%m-%d') <= date_format('" + orderEndDate + "','%Y-%m-%d')"
);
String resHomeVisStartDate = query.getResHomeVisStartDate();
String resHomeVisEndDate = query.getResHomeVisEndDate();
qw.apply(StringUtils.isNotBlank(resHomeVisStartDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') >= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')"
);
IPage<LoanHomevisitInvestigate> page = PagerUtil.queryToPage(pq);
IPage<LoanHomevisitInvestigateVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<LoanHomevisitInvestigateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java
View File

@ -189,6 +189,7 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
SolutionDetailsDto solutionsDto = new SolutionDetailsDto();
BeanUtil.copyProperties(loanTemplateSolutionsDto, solutionsDto, "sid");
solutionsDto.setBusSid(sid);
solutionsDto.setShowMore(true);
ResultBean resultBean = loanSolutionsService.saveDtoss(solutionsDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -208,6 +209,7 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
SolutionDetailsDto solutionsDto = new SolutionDetailsDto();
BeanUtil.copyProperties(loanTemplateSolutionsDto, solutionsDto, "sid");
solutionsDto.setBusSid(sid);
solutionsDto.setShowMore(true);
loanSolutionsService.saveDtoss(solutionsDto);
}
baseMapper.updateById(loanTemplate);
@ -628,6 +630,7 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
BeanUtil.copyProperties(loanSolutionsDetail, solutionssVo);
}
}
solutionssVo.setShowMore(true);
List<SolutionListVo> formList = loanSolutionsService.getFormList(solutionssVo);
templateApplyVo.setFinanceForms(formList);
return rb.success().setData(templateApplyVo);

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java
View File

@ -124,4 +124,8 @@ public interface LoanHomeVisitInvestigateFeign {
@ResponseBody
public ResultBean saveAssetCertificateInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateSaveZCLDto dto);
@ApiOperation("获取家访申诉列表")
@PostMapping("/getHomeAppealList")
@ResponseBody
ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeAppealList(@RequestBody PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery);
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigatePageVo.java
View File

@ -26,7 +26,9 @@ public class LoanHomeVisitInvestigatePageVo implements Vo {
@ApiModelProperty("家访地址")
private String address;
@ApiModelProperty("是否显示办理按钮")
private Boolean showHandleBtn;
private Boolean showHandleBtn = false;
@ApiModelProperty("是否显示预约按钮")
private Boolean showAppointmentBtn;
private Boolean showAppointmentBtn = false;
@ApiModelProperty("是否显示申诉按钮")
private Boolean showAppealBtn = false;
}

5
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java
View File

@ -137,4 +137,9 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
public ResultBean saveAssetCertificateInfo(AppLoanHomeVisitInvestigateSaveZCLDto dto) {
return loanHomeVisitInvestigateService.saveAssetCertificateInfo(dto);
}
@Override
public ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeAppealList(PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery) {
return loanHomeVisitInvestigateService.getHomeAppealList(pagerQuery);
}
}

41
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java
View File

@ -249,4 +249,45 @@ public class LoanHomeVisitInvestigateService {
loanHomevisitInvestigateFeign.saveAssetCertificateInfo(loanHomeVisitInvestigateInitZCLDto);
return rb.success();
}
public ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeAppealList(PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery) {
ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> rb = ResultBean.fireFail();
PagerQuery<LoanHomevisitInvestigateQuery> pq = new PagerQuery<>();
LoanHomeVisitInvestigatePageQuery params = pagerQuery.getParams();
LoanHomevisitInvestigateQuery params1 = new LoanHomevisitInvestigateQuery();
params1.setOrgSidPath(params.getOrgPath());
params1.setUserSid(params.getUserSid());
params1.setNames(params.getNames());
pq.setParams(params1);
ResultBean<PagerVo<LoanHomevisitInvestigateVo>> resultBean = loanHomevisitInvestigateFeign.jfjdListPage(pq);
List<LoanHomeVisitInvestigatePageVo> loanHomeVisitInvestigatePageVos = new ArrayList<>();
PagerVo<LoanHomeVisitInvestigatePageVo> v = new PagerVo<>();
List<LoanHomevisitInvestigateVo> records = resultBean.getData().getRecords();
for (LoanHomevisitInvestigateVo record : records) {
LoanHomeVisitInvestigatePageVo loanHomeVisitInvestigatePageVo = new LoanHomeVisitInvestigatePageVo();
loanHomeVisitInvestigatePageVo.setSid(record.getSid());
loanHomeVisitInvestigatePageVo.setContractId(record.getContractNo());
if (StringUtils.isNotBlank(record.getResHomeVisDate())){
loanHomeVisitInvestigatePageVo.setNodeState("已预约");
}else {
loanHomeVisitInvestigatePageVo.setNodeState("未预约");
loanHomeVisitInvestigatePageVo.setShowAppointmentBtn(true);
}
loanHomeVisitInvestigatePageVo.setSalesName(record.getStaffName());
loanHomeVisitInvestigatePageVo.setCreateDate(record.getCreateDate());
loanHomeVisitInvestigatePageVo.setLenderName(record.getBorrowerName());
loanHomeVisitInvestigatePageVo.setMobile(record.getMobile());
loanHomeVisitInvestigatePageVo.setTimes(record.getResHomeVisDate());
loanHomeVisitInvestigatePageVo.setAddress(record.getHomeVisAddress());
if (record.getState().equals("1")) {
loanHomeVisitInvestigatePageVo.setShowHandleBtn(true);
}
if (record.getState().equals("2") && record.getInvestigateValue().equals("不通过")){
loanHomeVisitInvestigatePageVo.setShowAppealBtn(true);
}
loanHomeVisitInvestigatePageVos.add(loanHomeVisitInvestigatePageVo);
}
v.setRecords(loanHomeVisitInvestigatePageVos);
return rb.success().setData(v);
}
}
Write Preview
Loading…
Cancel
Save