Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@@ -40,7 +40,9 @@ import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWait;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontract;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.busvehicledatahandover.BusVehicleDataHandoverDto;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationVo;
 import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverDetailsListVo;
@@ -49,6 +51,8 @@ import com.yxt.anrui.buscenter.biz.bushandoveritems.BusHandoverItemsService;
 import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService;
 import com.yxt.anrui.buscenter.biz.bushandoverwait.BusHandoverWaitService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
+import com.yxt.anrui.buscenter.biz.bussalesorderloancontract.BusSalesOrderLoancontractService;
+import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
 import com.yxt.anrui.buscenter.biz.busvehicledatahandover.BusVehicleDataHandoverService;
 import com.yxt.anrui.buscenter.biz.busvehicleinformationhandover.BusVehicleInformationHandoverService;
 import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
@@ -73,6 +77,10 @@ import com.yxt.anrui.portal.api.sysuser.SysUser;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVo;
+import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.LoanMortgageInformationTransactDto;
+import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.LoanMortgageInformationTransactFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
 import com.yxt.common.base.config.component.DocPdfComponent;
@@ -175,7 +183,14 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
     private BusVehicleDataHandoverService busVehicleDataHandoverService;
     @Autowired
     private BaseVehicleStateFeign baseVehicleStateFeign;
-
+    @Autowired
+    private BusSalesOrderLoancontractService busSalesOrderLoancontractService;
+    @Autowired
+    private LoanFinPolicyFeign loanFinPolicyFeign;
+    @Autowired
+    private LoanMortgageInformationTransactFeign loanMortgageInformationTransactFeign;
+    @Autowired
+    private BusSalesOrderVehicleService busSalesOrderVehicleService;
 
     //    @Transactional(rollbackFor = Exception.class)
     public ResultBean<List<BusHandoverListVo>> saveDeliverybill(BusHandoverDto dto) {
@@ -2147,6 +2162,115 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                     e.printStackTrace();
                 }
             }
+            //------------------推送抵押办理------------------------
+            try {
+                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                        .setNameFormat("demo-pool-%d").build();
+                ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                        0L, TimeUnit.MILLISECONDS,
+                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                BusHandover mortgageHandover = busHandover;
+                Future future1 = pool.submit(() -> {
+                    String orderSid = mortgageHandover.getOrderSid();
+                    BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(orderSid);
+                    String createBySid = "";
+                    String staff = "";
+                    String staffSid = "";
+                    String bankName = "";
+                    String bankSid = "";
+                    String orgPath = "";
+                    String dept = "";
+                    String deptSid = "";
+                    if (null != salesOrder) {
+                        if (StringUtils.isNotBlank(salesOrder.getPayTypeKey())) {
+                            if ("2".equals(salesOrder.getPayTypeKey())) {
+                                if (StringUtils.isNotBlank(salesOrder.getCreateBySid())) {
+                                    createBySid = salesOrder.getCreateBySid();
+                                }
+                                if (StringUtils.isNotBlank(salesOrder.getOrgSidPath())) {
+                                    orgPath = salesOrder.getOrgSidPath();
+                                }
+                                if (StringUtils.isNotBlank(salesOrder.getStaffSid())) {
+                                    staffSid = salesOrder.getStaffSid();
+                                }
+                                if (StringUtils.isNotBlank(salesOrder.getStaffName())) {
+                                    staff = salesOrder.getStaffName();
+                                }
+                                if (StringUtils.isNotBlank(salesOrder.getOrgName())) {
+                                    dept = salesOrder.getOrgName();
+                                }
+                                if (StringUtils.isNotBlank(salesOrder.getOrgSid())) {
+                                    deptSid = salesOrder.getOrgSid();
+                                }
+                                LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(orderSid).getData();
+                                if (null != solutions) {
+                                    if (StringUtils.isNotBlank(solutions.getPolicySid())) {
+                                        LoanFinPolicyVo policyVo = loanFinPolicyFeign.details(solutions.getPolicySid()).getData();
+                                        if (null != policyVo) {
+                                            if (StringUtils.isNotBlank(policyVo.getBankSid())) {
+                                                bankSid = policyVo.getBankSid();
+                                            }
+                                            if (StringUtils.isNotBlank(policyVo.getBankShortName())) {
+                                                bankName = policyVo.getBankShortName();
+                                            }
+                                        }
+                                    }
+                                }
+                                List<BusHandoverItems> vinItems = busHandoverItemsService.getItemsListByMainSid(mortgageHandover.getSid()).getData();
+                                vinItems.removeAll(Collections.singleton(null));
+                                if (!vinItems.isEmpty()) {
+                                    vinItems = vinItems.stream().filter(obj -> obj.getVehivelOrTrailer().equals("主车")).collect(Collectors.toList());
+                                    for (BusHandoverItems vinItem : vinItems) {
+                                        LoanMortgageInformationTransactDto mortagageDto = new LoanMortgageInformationTransactDto();
+                                        mortagageDto.setCreateBySid(createBySid);
+                                        mortagageDto.setOrgSidPath(orgPath);
+                                        mortagageDto.setSalesOrderSid(orderSid);
+                                        mortagageDto.setBankName(bankName);
+                                        mortagageDto.setBankSid(bankSid);
+                                        mortagageDto.setDept(dept);
+                                        mortagageDto.setDeptSid(deptSid);
+                                        mortagageDto.setStaffSid(staffSid);
+                                        mortagageDto.setStaff(staff);
+                                        if (StringUtils.isNotBlank(vinItem.getVinSid())) {
+                                            mortagageDto.setVehSid(vinItem.getVinSid());
+                                            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectOneByVehSidAndOrderSid(vinItem.getVinSid(), orderSid);
+                                            if (null != busSalesOrderVehicle) {
+                                                if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
+                                                    mortagageDto.setVinNo(busSalesOrderVehicle.getLinkNo());
+                                                }
+                                                if (StringUtils.isNotBlank(busSalesOrderVehicle.getSid())) {
+                                                    mortagageDto.setBusVinSid(busSalesOrderVehicle.getSid());
+                                                }
+                                                if (StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowerSid())) {
+                                                    mortagageDto.setBorrowerSid(busSalesOrderVehicle.getBorrowerSid());
+                                                }
+                                                if (StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowName())) {
+                                                    mortagageDto.setBorrowerName(busSalesOrderVehicle.getBorrowName());
+                                                }
+                                                if (StringUtils.isNotBlank(busSalesOrderVehicle.getLoanContractSid())) {
+                                                    mortagageDto.setLoanContractSid(busSalesOrderVehicle.getLoanContractSid());
+                                                    BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractService.fetchBySid(busSalesOrderVehicle.getLoanContractSid());
+                                                    if (null != loancontract) {
+                                                        if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) {
+                                                            mortagageDto.setLoanContractNo(loancontract.getLoanContractNo());
+                                                        }
+                                                    }
+                                                }
+
+                                            }
+                                        }
+                                        loanMortgageInformationTransactFeign.saveMortgageInfo(mortagageDto);
+                                    }
+                                }
+
+                            }
+                        }
+                    }
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
             return rb.success().setData(resultBean.getData());
         } else {
             return rb.setMsg("操作失败!提交的数据不一致");
@@ -2602,7 +2726,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         pdfVo.setColor("-");
         pdfVo.setListPdfVos(listPdfVos);
         String uploadTemplateUrl = docPdfComponent.getUploadTemplateUrl();
-       // ---------------挂车注释PDF
+        // ---------------挂车注释PDF
         String s = receiveVehicleConfirmationCreatePdf(pdfVo);
         String savePath = s.substring(uploadTemplateUrl.length());
         BusHandover entity = fetchBySid(sid);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransact.java

@@ -21,7 +21,7 @@ public class LoanMortgageInformationTransact extends BaseEntity {
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
     @ApiModelProperty("抵押日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date mortgageDate = new Date();
     @ApiModelProperty("业务车辆sid")
     private String busVinSid;
@@ -31,4 +31,17 @@ public class LoanMortgageInformationTransact extends BaseEntity {
     private String useOrgName;
     @ApiModelProperty("使用组织全路径")
     private String orgSidPath;
+    private String bankName; //资方
+    private String bankSid; //资方sid
+    private String vinNo; //车架号
+    private String vehSid; //车辆sid
+    private String loanContractNo; //消贷合同号
+    private String loanContractSid; //消贷合同sid
+    private String dept; //销售部门
+    private String deptSid; //销售部门sid
+    private String staff; //销售专员
+    private String staffSid; //销售专员sid
+    private String borrowerName; //贷款人
+    private String borrowerSid; //贷款人sid
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDto.java

@@ -22,6 +22,7 @@ public class LoanMortgageInformationTransactDto implements Dto {
     private Date mortgageDate;
     @ApiModelProperty("备注")
     private String remarks;
+    private String salesOrderSid;
     @ApiModelProperty("登记证 1-2页")
     private List<String> registrationFiles1 = new ArrayList<>();
     @ApiModelProperty("登记证 3-4页")
@@ -30,4 +31,19 @@ public class LoanMortgageInformationTransactDto implements Dto {
     private List<String> taxiFiles = new ArrayList<>();
     @ApiModelProperty("行驶证")
     private List<String> drivingFiles = new ArrayList<>();
+    private String bankName; //资方
+    private String bankSid; //资方sid
+    private String vinNo; //车架号
+    private String vehSid; //车辆sid
+    private String loanContractNo; //消贷合同号
+    private String loanContractSid; //消贷合同sid
+    private String dept; //销售部门
+    private String deptSid; //销售部门sid
+    private String staff; //销售专员
+    private String staffSid; //销售专员sid
+    private String borrowerName; //贷款人
+    private String borrowerSid; //贷款人sid
+    @ApiModelProperty("使用组织全路径")
+    private String orgSidPath;
+    private String createBySid;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactMapper.java

@@ -28,4 +28,6 @@ public interface LoanMortgageInformationTransactMapper extends BaseMapper<LoanMo
     LoanMortgageInformationTransact fetchByBusVinSid(String busVinSid);
 
     LoanMortgageInformationTransactDetailsVo getMortgageInfo(String busVinSid);
+
+    IPage<LoanMortgageInformationTransactVo> newlistPage(IPage<LoanMortgageInformationTransact> page, @Param(Constants.WRAPPER) QueryWrapper<LoanMortgageInformationTransact> qw);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactMapper.xml

@@ -2,6 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanmortgageinformationtransact.LoanMortgageInformationTransactMapper">
 
+    <select id="newlistPage"
+            resultType="com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.LoanMortgageInformationTransactVo">
+        SELECT
+        busVinSid as sid,
+        date_format (mortgageDate,'%Y-%m-%d') as disbursementDate,
+        createTime,
+        dept as department,
+        salesOrderSid,
+        vinNo as vin,
+        bankName as bankName,
+        useOrgName as company,
+        staff as salesman,
+        borrowerName as lenderName
+        FROM loan_mortgage_information_transact
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
     <select id="listPageDo"
             resultType="com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.LoanMortgageInformationTransactVo">
         SELECT

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactRest.java

@@ -26,10 +26,11 @@ public class LoanMortgageInformationTransactRest implements LoanMortgageInformat
     @Override
     public ResultBean<PagerVo<LoanMortgageInformationTransactVo>> listPage(PagerQuery<LoanMortgageInformationTransactQuery> pq) {
         ResultBean<PagerVo<LoanMortgageInformationTransactVo>> rb = ResultBean.fireFail();
-        PagerVo<LoanMortgageInformationTransactVo> page = loanMortgageInformationTransactService.listPage(pq);
+        PagerVo<LoanMortgageInformationTransactVo> page = loanMortgageInformationTransactService.newlistPage(pq);
         return rb.success().setData(page).setMsg(page.getMsg());
     }
 
+
     @Override
     public ResultBean<String> saveMortgageInfo(LoanMortgageInformationTransactDto dto) {
         return loanMortgageInformationTransactService.saveMortgageInfo(dto);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java

@@ -19,6 +19,9 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loancustomerrecord.LoanCustomerRecord;
+import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordQuery;
+import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordVo;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.*;
@@ -409,6 +412,75 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
         return pagerVo;
     }
 
+
+    /**
+     * 分页列表
+     *
+     * @param pq
+     * @return
+     */
+    public PagerVo<LoanMortgageInformationTransactVo> newlistPage(PagerQuery<LoanMortgageInformationTransactQuery> pq) {
+        IPage<LoanMortgageInformationTransact> page = PagerUtil.queryToPage(pq);
+        LoanMortgageInformationTransactQuery pagerQuery = pq.getParams();
+        QueryWrapper<LoanMortgageInformationTransact> qw = new QueryWrapper<>();
+        //=======================
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(pagerQuery.getOrgPath());
+        privilegeQuery.setMenuSid(pagerQuery.getMenuSid());
+        //  privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
+        privilegeQuery.setUserSid(pagerQuery.getUserSid());
+        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+            String orgSidPath = pagerQuery.getOrgPath();
+            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("orgSidPath", orgSidPath);
+            } else if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i2);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i3);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("4".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i4);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("5".equals(orgLevelKey)) {
+                qw.eq("createBySid", pagerQuery.getUserSid());
+            } else {
+                PagerVo<LoanMortgageInformationTransactVo> p = new PagerVo<>();
+                return p;
+            }
+        } else {
+            PagerVo<LoanMortgageInformationTransactVo> p = new PagerVo<>();
+            return p;
+        }
+        //=======================
+        if (StringUtils.isNotBlank(pagerQuery.getNames())) {
+            qw.and(wrapper -> wrapper.like("vinNo", pagerQuery.getNames()).or().like("loanContractNo", pagerQuery.getNames()).or().like("borrowerName", pagerQuery.getNames()));
+            //  qw.like("customer", pagerQuery.getName());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getType())) {
+            if (pagerQuery.getType().equals("1")) {
+                qw.eq("state", 1);
+            } else if (pagerQuery.getType().equals("2")) {
+                qw.eq("state", 0);
+            }
+        }
+        qw.eq("isDelete", 0);
+        qw.orderByDesc("createTime");
+        IPage<LoanMortgageInformationTransactVo> pagging = baseMapper.newlistPage(page, qw);
+        PagerVo<LoanMortgageInformationTransactVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+
     /**
      * 保存修改
      *
@@ -421,45 +493,37 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
         LoanMortgageInformationTransact entity = baseMapper.fetchByBusVinSid(dto.getBusVinSid());
         // 修改
         if (null != entity) {
-            entity.setMortgageDate(dto.getMortgageDate());
-            entity.setRemarks(dto.getRemarks());
+            if (null != dto.getMortgageDate()) {
+                entity.setMortgageDate(dto.getMortgageDate());
+                entity.setState(0);
+            }
+            if (StringUtils.isNotBlank(dto.getRemarks())) {
+                entity.setRemarks(dto.getRemarks());
+            }
             baseMapper.updateById(entity);
         } else {
             // 新增
             LoanMortgageInformationTransact saveEntity = new LoanMortgageInformationTransact();
-            //根据业务车辆sid查询 销售订单业务车辆表
-            BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(dto.getBusVinSid()).getData();
-            if (null != orderVehicle) {
-                String salesOrderSid = orderVehicle.getSalesOrderSid();
-                BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData();
-                if (null != salesOrder) {
-                    //创建人sid
-                    if (StringUtils.isNotBlank(salesOrder.getCreateBySid())) {
-                        saveEntity.setCreateBySid(salesOrder.getCreateBySid());
-                    }
-                    //组织全路径
-                    if (StringUtils.isNotBlank(salesOrder.getOrgSidPath())) {
-                        saveEntity.setOrgSidPath(salesOrder.getOrgSidPath());
-                        ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(salesOrder.getOrgSidPath());
-                        if (orgSidByPath.getSuccess()) {
-                            String userOrgSid = orgSidByPath.getData();
-                            saveEntity.setUseOrgSid(userOrgSid);
-                            ResultBean<SysOrganizationVo> organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid);
-                            if (organizationVo.getSuccess()) {
-                                SysOrganizationVo organizationVoData = organizationVo.getData();
-                                if (null != organizationVoData) {
-                                    saveEntity.setUseOrgName(organizationVoData.getName());
-                                }
+            BeanUtil.copyProperties(dto, saveEntity, "id", "sid");
+            if (StringUtils.isNotBlank(dto.getOrgSidPath())) {
+                //组织全路径
+                if (StringUtils.isNotBlank(dto.getOrgSidPath())) {
+                    saveEntity.setOrgSidPath(dto.getOrgSidPath());
+                    ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgSidPath());
+                    if (orgSidByPath.getSuccess()) {
+                        String userOrgSid = orgSidByPath.getData();
+                        saveEntity.setUseOrgSid(userOrgSid);
+                        ResultBean<SysOrganizationVo> organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid);
+                        if (organizationVo.getSuccess()) {
+                            SysOrganizationVo organizationVoData = organizationVo.getData();
+                            if (null != organizationVoData) {
+                                saveEntity.setUseOrgName(organizationVoData.getName());
                             }
                         }
                     }
                 }
-                saveEntity.setMortgageDate(dto.getMortgageDate());
-                saveEntity.setRemarks(dto.getRemarks());
-                saveEntity.setSalesOrderSid(salesOrderSid);
-                saveEntity.setBusVinSid(dto.getBusVinSid());
-                baseMapper.insert(saveEntity);
             }
+            baseMapper.insert(saveEntity);
         }
         //删除附件表中关于该linkSid的文件
         loanFileService.deleteByLinkSid(dto.getBusVinSid());

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

@@ -56,6 +56,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.Now;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -608,6 +609,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
                     qw.eq("la.capitalSid", loanFinPolicy.getBankSid());
                 }
             }
+            qw.apply("la.dateTo > now()");
         }
         IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pagerQuery);
         IPage<LoanPreloanVo> pagging = baseMapper.getOrderLoanPagerList(page, qw, query.getName());