优化工作

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java

@@ -72,4 +72,8 @@ public class FinCollectionConfirmationJYDDKYDJVo implements Vo {
     private String collectionMoney;
     @ApiModelProperty("余额")
     private String balance;
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyQuery.java

@@ -63,6 +63,8 @@ public class FinFundsCarriedForwardApplyQuery implements Query {
     private String jzSmallMoney;
     @ApiModelProperty("最大结转金额")
     private String jzBigMoney;
+    @ApiModelProperty("单据编号")
+    private String billNo;
 	@ApiModelProperty("组织全路径")
     private String orgSidPath;
     private String menuUrl;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -211,6 +211,8 @@
         bd.`draweeMobile` AS phone,
         fcc.collectionDate,
         fcc.collectionMoney,
+        fsrd.purchaseSystemSid,
+        fsrd.purchaseSystemName,
         (
         fcc.collectionMoney - COALESCE(SUM(ffc.`thisUseMoney`), 0)
         ) AS balance

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1900,7 +1900,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
                                     dtoList.add(baseVehicleStateDto);
                                 }
-                               //根据busVinSid查询待出库中是否存在该数据
+                                //根据busVinSid查询待出库中是否存在该数据
                                /* ResultBean<BusDelivered> busDeliveredResultBean = busDeliveredFeign.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
                                 if (busDeliveredResultBean.getData() == null) {
                                     if (leftAll.compareTo(rightAll) <= 0) {//推送待出库
@@ -2796,6 +2796,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 return p;
             }
         }
+        qw.eq("fsrd.auditState", 3);
         if (StringUtils.isNotBlank(query.getStaffDeptName())) {
             qw.like("fcc.staffDeptName", query.getStaffDeptName());
         }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -215,6 +215,9 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         if (StringUtils.isNotBlank(query.getCreateByName())) {
             qw.like("fa.createByName", query.getCreateByName());
         }
+        if (StringUtils.isNotBlank(query.getBillNo())){
+            qw.like("fa.billNo",query.getBillNo());
+        }
         String applyStartDate = query.getApplyStartDate();
         String applyEndDate = query.getApplyEndDate();
         qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (bacva.createTime,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
@@ -385,7 +388,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchYeBySid(busSid);
             finCollectionConfirmation = finCollectionConfirmationService.fetchBySid(finSelectedReceivablesDetailed.getCollSid());
             finFundsCarriedForwardApply = fetchBySid(finSelectedReceivablesDetailed.getCollSid());
-            finFundsCarriedForwardVehDetailsVo.setBusBillNo(finSelectedReceivablesDetailed.getContractNo());
+            if (StringUtils.isNotBlank(finSelectedReceivablesDetailed.getContractNo())){
+                finFundsCarriedForwardVehDetailsVo.setBusBillNo(finSelectedReceivablesDetailed.getContractNo());
+            }else {
+                finFundsCarriedForwardVehDetailsVo.setBusBillNo(finCollectionConfirmation.getBillNo());
+            }
             finFundsCarriedForwardVehDetailsVo.setCustomerSid(finSelectedReceivablesDetailed.getCustomerSid());
             finFundsCarriedForwardVehDetailsVo.setCustomerName(finSelectedReceivablesDetailed.getCustomerName());
             finFundsCarriedForwardVehDetailsVo.setVinNo(finSelectedReceivablesDetailed.getVIN());

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -378,6 +378,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
         }
         loanPreloanCreditPeoService.delByMainSid(dtoSid);
         for (LoanPreloanCreditPeoDto loanPreloanCreditPeo : loanPreloanCreditPeos) {
+            loanPreloanCreditPeo.setMainSid(dtoSid);
             String peoSid = loanPreloanCreditPeoService.insertByDto(loanPreloanCreditPeo).getData();
             List<String> idCardImages1 = loanPreloanCreditPeo.getIdCardImages();
             for (String s : idCardImages1) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java

@@ -54,6 +54,11 @@ public interface CreditReviewFeign {
     @ResponseBody
     public ResultBean saveCreditReviewInfo(@RequestBody CreditReviewDto dto);
 
+    @ApiOperation("提交贷前信用审核申请")
+    @PostMapping("/submitCreditReviewInfo")
+    @ResponseBody
+    public ResultBean submitCreditReviewInfo(@RequestBody CreditReviewDto dto);
+
     @ApiOperation("保存贷前信用审核申请1")
     @PostMapping("/saveCreditReviewInfo1")
     @ResponseBody

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java

@@ -45,6 +45,11 @@ public class CreditReviewFeignFallback implements CreditReviewFeign {
         return null;
     }
 
+    @Override
+    public ResultBean submitCreditReviewInfo(CreditReviewDto dto) {
+        return null;
+    }
+
     @Override
     public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) {
         return null;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java

@@ -54,6 +54,11 @@ public class CreditReviewRest implements CreditReviewFeign {
         return creditReviewService.saveCreditReviewInfo(dto);
     }
 
+    @Override
+    public ResultBean submitCreditReviewInfo(CreditReviewDto dto) {
+        return creditReviewService.submitCreditReviewInfo(dto);
+    }
+
     @Override
     public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) {
         return null;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java

@@ -257,10 +257,15 @@ public class CreditReviewService {
             loanPreloanCreditPeoDtos.add(loanPreloanCreditPeoDto);
         }
         loanPreloanCreditApplyDto.setLoanPreloanCreditPeos(loanPreloanCreditPeoDtos);
+        loanPreloanCreditApplyDto.setComFkFiles(dto.getMaterialImages());
         loanPreloanCreditApplyFeign.save(loanPreloanCreditApplyDto);
         return rb.success();
     }
 
+    public ResultBean submitCreditReviewInfo(CreditReviewDto dto) {
+        return null;
+    }
+
     public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) {
         ResultBean rb = ResultBean.fireFail();
         LoanPreloanCreditApplyDto loanPreloanCreditApplyDto = new LoanPreloanCreditApplyDto();
@@ -300,4 +305,6 @@ public class CreditReviewService {
         //loanPreloanCreditApplyFeign.save()
         return null;
     }
+
+
 }