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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
453b4354cc b44337fa21
commit
30bb33f80f
2 changed files with 32 additions and 17 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. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java
  2. 43
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java
View File

@ -78,6 +78,7 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.*;
@ -203,9 +204,8 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
for (LoanCapitalCreditResultVo record : pagging.getRecords()) {
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(record.getContractNo()).getData();
LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrder.getSid());
AppLoanSolutionsTrailerVo appLoanSolutionsTrailerVo = loanSolutionsTrailerService.getAppTrailerVoBySolutionsSid(loanSolutions.getSid());
if (appLoanSolutionsTrailerVo != null){
if (Integer.parseInt(appLoanSolutionsTrailerVo.getSinglePrice()) > 0){
if (loanSolutions != null){
if (loanSolutions.getTrailerAmount().compareTo(BigDecimal.ZERO) == 1){
record.setIsHavTrailer(true);
}
}

43
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java
View File

@ -18,7 +18,9 @@ import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReview;
import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo;
import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDto;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.core.result.ResultBean;
@ -27,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@ -56,7 +59,8 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
private BaseVehicleStateFeign baseVehicleStateFeign;
@Autowired
private BaseTrailerFeign baseTrailerFeign;
@Autowired
private LoanSolutionsService loanSolutionsService;
public ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> details(String salesOrderSid) {
ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> rb = ResultBean.fireFail();
LoanNoGuaranteeCreditReviewDetailsVo vo = new LoanNoGuaranteeCreditReviewDetailsVo();
@ -75,7 +79,18 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
}
orderSid = busSalesOrder.getSid();
}
}
if (StringUtils.isNotBlank(orderSid)) {
LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(orderSid);
if (null != loanSolutions) {
if (null != loanSolutions.getTrailerAmount()) {
BigDecimal trailerAmount = loanSolutions.getTrailerAmount();
String money = String.valueOf(trailerAmount);
if (!money.equals("0") || !money.equals("0.00")) {
vo.setIsHavTrailer(true);
}
}
}
}
if (null != entity) {
BeanUtil.copyProperties(entity, vo);
@ -84,18 +99,18 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
sid = entity.getSid();
}
String borrowerSid = entity.getBorrowerSid();
List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(orderSid, borrowerSid).getData();
if (!vehicles.isEmpty()) {
for (BusSalesOrderVehicle vehicle : vehicles) {
if (StringUtils.isNotBlank(vehicle.getLinkSid())) {
String vehicleLinkSid = vehicle.getLinkSid();
List<BaseTrailer> baseTrailers = baseTrailerFeign.getByVehSid(vehicleLinkSid).getData();
if (baseTrailers != null && baseTrailers.size() > 0) {
vo.setIsHavTrailer(true);
}
}
}
}
// List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(orderSid, borrowerSid).getData();
// if (!vehicles.isEmpty()) {
// for (BusSalesOrderVehicle vehicle : vehicles) {
// if (StringUtils.isNotBlank(vehicle.getLinkSid())) {
// String vehicleLinkSid = vehicle.getLinkSid();
// List<BaseTrailer> baseTrailers = baseTrailerFeign.getByVehSid(vehicleLinkSid).getData();
// if (baseTrailers != null && baseTrailers.size() > 0) {
// vo.setIsHavTrailer(true);
// }
// }
// }
// }
//家访考察结果截图
List<LoanFile> fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.HOME_VISIT_FILES.getAttachType());
fileList.removeAll(Collections.singleton(null));

Write Preview
Loading…
Cancel
Save