Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/views/warrantinformation/warrantinformationAdd.vue

@@ -33,7 +33,9 @@
         <el-row>
           <el-col :span="24">
             <div class="span-sty">车牌号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.vehicleMark }}</span></el-form-item>
+            <el-form-item>
+              <el-input v-model="formobj.vehicleMark" class="addinputInfo addinputw" clearable placeholder=""/>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantDto.java

@@ -0,0 +1,40 @@
+package com.yxt.anrui.riskcenter.api.loanwarrantinformation;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/3 13:46
+ */
+@Data
+public class LoanWarrantDto implements Dto {
+    @ApiModelProperty("业务车辆sid")
+    private String busVinSid;
+    @ApiModelProperty("销售订单sid")
+    private String salesOrderSid;
+    @ApiModelProperty("审核状态key")
+    private String auditStateKey;
+    @ApiModelProperty("审核状态Value")
+    private String auditStateValue;
+    @ApiModelProperty("消贷合同号")
+    private String contractNo;
+    @ApiModelProperty("销售部门")
+    private String department;
+    @ApiModelProperty("销售专员")
+    private String salesman;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("贷款人")
+    private String borrowerName;
+    @ApiModelProperty("使用组织全路径")
+    private String orgSidPath;
+    private String createBySid;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeign.java

@@ -32,6 +32,15 @@ public interface LoanWarrantInformationFeign {
     @ResponseBody
     public ResultBean<PagerVo<LoanWarrantInformationVo>> listPage(@RequestBody PagerQuery<LoanWarrantInformationQuery> pq);
 
+    /**
+     * 保存推送
+     *
+     * @param
+     */
+    @ApiOperation("审核保存")
+    @PostMapping("/saveWarrant")
+    public ResultBean<String> saveWarrant(@RequestBody LoanWarrantDto dto);
+
 
     /**
      * 审核回显

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeignFallback.java

@@ -19,6 +19,11 @@ public class LoanWarrantInformationFeignFallback implements LoanWarrantInformati
         return null;
     }
 
+    @Override
+    public ResultBean<String> saveWarrant(LoanWarrantDto dto) {
+        return null;
+    }
+
     @Override
     public ResultBean<LoanAuditInfoVo> getAuditInfo(String sid) {
         return null;

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

@@ -14,7 +14,8 @@
         bankName as bankName,
         useOrgName as company,
         staff as salesman,
-        borrowerName as lenderName
+        borrowerName as lenderName,
+        loanContractNo as contractId
         FROM loan_mortgage_information_transact
         <where>
             ${ew.sqlSegment}
@@ -43,7 +44,10 @@
             resultType="com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.LoanMortgageInformationTransactDetailsVo">
         SELECT busVinSid,
                remarks,
-               date_format(mortgageDate, '%Y-%m-%d') as mortgageDate
+               date_format(mortgageDate, '%Y-%m-%d') as mortgageDate,
+               borrowerName as borrowerName,
+               vinNo,
+               loanContractNo as contractId
         from loan_mortgage_information_transact
         where busVinSid = #{busVinSid}
     </select>

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

@@ -28,6 +28,7 @@ import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.*;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
+import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantDto;
 import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformation;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.anrui.riskcenter.biz.loanwarrantinformation.LoanWarrantInformationService;
@@ -476,6 +477,17 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
         qw.eq("isDelete", 0);
         qw.orderByDesc("createTime");
         IPage<LoanMortgageInformationTransactVo> pagging = baseMapper.newlistPage(page, qw);
+        List<LoanMortgageInformationTransactVo> records = pagging.getRecords();
+        records.removeAll(Collections.singleton(null));
+        if (!records.isEmpty()) {
+            for (LoanMortgageInformationTransactVo record : records) {
+                if (pagerQuery.getType().equals("1")) {
+                    record.setShowHandleBtn(true);
+                } else if (pagerQuery.getType().equals("2")) {
+                    record.setShowHandleBtn(false);
+                }
+            }
+        }
         PagerVo<LoanMortgageInformationTransactVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -495,7 +507,6 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
         if (null != entity) {
             if (null != dto.getMortgageDate()) {
                 entity.setMortgageDate(dto.getMortgageDate());
-                entity.setState(0);
             }
             if (StringUtils.isNotBlank(dto.getRemarks())) {
                 entity.setRemarks(dto.getRemarks());
@@ -557,141 +568,89 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
         ResultBean rb = ResultBean.fireFail();
         ResultBean resultBean = saveMortgageInfo(dto);
         if (resultBean.getSuccess()) {
-            baseVehicleStateFeign.updateBusStateByBusSid(dto.getBusVinSid(), "308");
-            LoanMortgageInformationTransact loanMortgageInformationTransact = baseMapper.fetchByBusVinSid(dto.getBusVinSid());
-            LoanWarrantInformation warrantInformation = new LoanWarrantInformation();
-            warrantInformation.setBusVinSid(dto.getBusVinSid());
-            warrantInformation.setAuditStateKey("001");
-            warrantInformation.setAuditStateValue("待审核");
-            warrantInformation.setRemarks(loanMortgageInformationTransact.getRemarks());
-            //根据业务车辆sid查询 销售订单业务车辆表
-            BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(dto.getBusVinSid()).getData();
-            if (null != orderVehicle) {
-                if (StringUtils.isNotBlank(orderVehicle.getLinkNo())) {
-                    warrantInformation.setVinNo(orderVehicle.getLinkNo());
+            // baseVehicleStateFeign.updateBusStateByBusSid(dto.getBusVinSid(), "308");
+            LoanMortgageInformationTransact entity = baseMapper.fetchByBusVinSid(dto.getBusVinSid());
+            if (null != entity) {
+                entity.setState(0);
+                baseMapper.updateById(entity);
+                LoanWarrantDto loanWarrantDto = new LoanWarrantDto();
+                if (StringUtils.isNotBlank(entity.getVinNo())) {
+                    loanWarrantDto.setVinNo(entity.getVinNo());
                 }
-                String salesOrderSid = orderVehicle.getSalesOrderSid();
-                warrantInformation.setSalesOrderSid(salesOrderSid);
-                BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData();
-                if (null != salesOrder) {
-                    //组织全路径
-                    if (StringUtils.isNotBlank(salesOrder.getOrgSidPath())) {
-                        warrantInformation.setOrgSidPath(salesOrder.getOrgSidPath());
-                        ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(salesOrder.getOrgSidPath());
-                        if (orgSidByPath.getSuccess()) {
-                            String userOrgSid = orgSidByPath.getData();
-                            warrantInformation.setUseOrgSid(userOrgSid);
-                            ResultBean<SysOrganizationVo> organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid);
-                            if (organizationVo.getSuccess()) {
-                                SysOrganizationVo organizationVoData = organizationVo.getData();
-                                if (null != organizationVoData) {
-                                    warrantInformation.setUseOrgName(organizationVoData.getName());
-                                }
-                            }
-                        }
-                    }
-                    //创建人sid
-                    if (StringUtils.isNotBlank(salesOrder.getCreateBySid())) {
-                        warrantInformation.setCreateBySid(salesOrder.getCreateBySid());
-                    }
-                    //销售部门
-                    if (StringUtils.isNotBlank(salesOrder.getOrgName())) {
-                        warrantInformation.setDepartment(salesOrder.getOrgName());
-                    }
-                    //销售专员
-                    if (StringUtils.isNotBlank(salesOrder.getStaffName())) {
-                        warrantInformation.setSalesman(salesOrder.getStaffName());
-                    }
-                    //根据销售订单sid查询消贷合同表
-                    BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData();
-                    if (null != loancontract) {
-                        //消贷合同编号
-                        if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) {
-                            warrantInformation.setContractNo(loancontract.getLoanContractNo());
-                        }
-                        //贷款人
-                        if (StringUtils.isNotBlank(loancontract.getBorrowerName())) {
-                            warrantInformation.setBorrowerName(loancontract.getBorrowerName());
-                        }
-                        //资方
-                        if (StringUtils.isNotBlank(loancontract.getBankName())) {
-                            warrantInformation.setBankName(loancontract.getBankName());
-                        }
-                    }
+                if (StringUtils.isNotBlank(entity.getSalesOrderSid())) {
+                    loanWarrantDto.setSalesOrderSid(entity.getSalesOrderSid());
+                }
+                //组织全路径
+                if (StringUtils.isNotBlank(entity.getOrgSidPath())) {
+                    loanWarrantDto.setOrgSidPath(entity.getOrgSidPath());
+                }
+                //创建人sid
+                if (StringUtils.isNotBlank(entity.getCreateBySid())) {
+                    loanWarrantDto.setCreateBySid(entity.getCreateBySid());
+                }
+                //销售部门
+                if (StringUtils.isNotBlank(entity.getDept())) {
+                    loanWarrantDto.setDepartment(entity.getDept());
+                }
+                //销售专员
+                if (StringUtils.isNotBlank(entity.getStaff())) {
+                    loanWarrantDto.setSalesman(entity.getStaff());
+                }
+                //消贷合同编号
+                if (StringUtils.isNotBlank(entity.getLoanContractNo())) {
+                    loanWarrantDto.setContractNo(entity.getLoanContractNo());
+                }
+                //贷款人
+                if (StringUtils.isNotBlank(entity.getBorrowerName())) {
+                    loanWarrantDto.setBorrowerName(entity.getBorrowerName());
+                }
+                //资方
+                if (StringUtils.isNotBlank(entity.getBankName())) {
+                    loanWarrantDto.setBankName(entity.getBankName());
+                }
+                if (StringUtils.isNotBlank(entity.getBusVinSid())) {
+                    loanWarrantDto.setBusVinSid(entity.getBusVinSid());
                 }
+                loanWarrantDto.setAuditStateKey("001");
+                loanWarrantDto.setAuditStateValue("待审核");
+                loanWarrantInformationService.saveWarrant(loanWarrantDto);
             }
-            loanWarrantInformationService.insert(warrantInformation);
         }
         return rb.success().setData(dto.getBusVinSid());
     }
 
     public ResultBean<LoanMortgageInformationTransactDetailsVo> getMortgageInfo(String busVinSid) {
         ResultBean<LoanMortgageInformationTransactDetailsVo> rb = ResultBean.fireFail();
-        LoanMortgageInformationTransactDetailsVo fetchVo = baseMapper.getMortgageInfo(busVinSid);
-        LoanMortgageInformationTransactDetailsVo vo = new LoanMortgageInformationTransactDetailsVo();
-        //根据业务车辆sid查询 销售订单业务车辆表
-        BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
-        if (null != orderVehicle) {
-            if (StringUtils.isNotBlank(orderVehicle.getLinkNo())) {
-                vo.setVinNo(orderVehicle.getLinkNo());
-            }
-            String salesOrderSid = orderVehicle.getSalesOrderSid();
-            //根据销售订单sid查询消贷合同表
-            BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData();
-            if (null != loancontract) {
-                //消贷合同编号
-                if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) {
-                    vo.setContractId(loancontract.getLoanContractNo());
-                }
-                //贷款人
-                if (StringUtils.isNotBlank(loancontract.getBorrowerName())) {
-                    vo.setBorrowerName(loancontract.getBorrowerName());
-                }
-            }
-            //登记证 1-2页
-            List<LoanFile> fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType());
-            fileList.removeAll(Collections.singleton(null));
-            if (!fileList.isEmpty()) {
-                List<String> registrationFiles1 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
-                        collect(Collectors.toList());
-                vo.setRegistrationFiles1(registrationFiles1);
-            }
-            //登记证 3-4页
-            fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_TWO.getAttachType());
-            fileList.removeAll(Collections.singleton(null));
-            if (!fileList.isEmpty()) {
-                List<String> registrationFiles2 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
-                vo.setRegistrationFiles2(registrationFiles2);
-            }
-            //营运证
-            fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.TAXI_FILES.getAttachType());
-            fileList.removeAll(Collections.singleton(null));
-            if (!fileList.isEmpty()) {
-                List<String> taxiFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
-                vo.setTaxiFiles(taxiFiles);
-            }
-            //行驶证
-            fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.DRIVING_CARD_FILES.getAttachType());
-            fileList.removeAll(Collections.singleton(null));
-            if (!fileList.isEmpty()) {
-                List<String> drivingFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
-                vo.setDrivingFiles(drivingFiles);
-            }
+        LoanMortgageInformationTransactDetailsVo vo = baseMapper.getMortgageInfo(busVinSid);
+        //登记证 1-2页
+        List<LoanFile> fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType());
+        fileList.removeAll(Collections.singleton(null));
+        if (!fileList.isEmpty()) {
+            List<String> registrationFiles1 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
+                    collect(Collectors.toList());
+            vo.setRegistrationFiles1(registrationFiles1);
         }
-        if (null != fetchVo) {
-            if (StringUtils.isNotBlank(fetchVo.getMortgageDate())) {
-                vo.setMortgageDate(fetchVo.getMortgageDate());
-            }
-            if (StringUtils.isNotBlank(fetchVo.getRemarks())) {
-                vo.setRemarks(fetchVo.getRemarks());
-            }
-//            else {
-//                vo.setMortgageDate("-");
-//            }
+        //登记证 3-4页
+        fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_TWO.getAttachType());
+        fileList.removeAll(Collections.singleton(null));
+        if (!fileList.isEmpty()) {
+            List<String> registrationFiles2 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
+            vo.setRegistrationFiles2(registrationFiles2);
+        }
+        //营运证
+        fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.TAXI_FILES.getAttachType());
+        fileList.removeAll(Collections.singleton(null));
+        if (!fileList.isEmpty()) {
+            List<String> taxiFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
+            vo.setTaxiFiles(taxiFiles);
+        }
+        //行驶证
+        fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.DRIVING_CARD_FILES.getAttachType());
+        fileList.removeAll(Collections.singleton(null));
+        if (!fileList.isEmpty()) {
+            List<String> drivingFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
+            vo.setDrivingFiles(drivingFiles);
         }
-//        else {
-//            vo.setMortgageDate("-");
-//        }
         vo.setBusVinSid(busVinSid);
         return rb.success().setData(vo);
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationRest.java

@@ -29,6 +29,11 @@ public class LoanWarrantInformationRest implements LoanWarrantInformationFeign {
         return rb.success().setData(page);
     }
 
+    @Override
+    public ResultBean<String> saveWarrant(LoanWarrantDto dto) {
+        return loanMortgageInformationTransactService.saveWarrant(dto);
+    }
+
     @Override
     public ResultBean<LoanAuditInfoVo> getAuditInfo(String sid) {
         return loanMortgageInformationTransactService.getAuditInfo(sid);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java

@@ -277,9 +277,6 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
             if (StringUtils.isNotBlank(entity.getVehicleMark())) {
                 sbVinMark.append(entity.getVehicleMark()).append("，");
             }
-            if (StringUtils.isNotBlank(entity.getVinNo())) {
-                sbVinNo.append(entity.getVinNo()).append("，");
-            }
             if (StringUtils.isNotBlank(entity.getContractNo())) {
                 hashSet.add(entity.getContractNo());
             }
@@ -324,7 +321,7 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
                 sbConNo.append(s).append("，");
             }
         }
-        if (sbVinNo.length() > 0) {
+        if (sbConNo.length() > 0) {
             sbConNo.delete(sbConNo.length() - 1, sbConNo.length());
             vo.setContractNo(sbConNo.toString());
         }
@@ -355,6 +352,7 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
 
     /**
      * 详情
+     *
      * @param sid
      * @return
      */
@@ -364,7 +362,7 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
         LoanAuditInfoVo auditInfoVo = getAuditInfo(sid).getData();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         if (null != auditInfoVo) {
-            BeanUtil.copyProperties(auditInfoVo,vo);
+            BeanUtil.copyProperties(auditInfoVo, vo);
         }
         LoanWarrantInformation entity = fetchBySid(sid);
         if (null != entity) {
@@ -395,4 +393,35 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
         }
         return rb.success().setData(vo);
     }
+
+    public ResultBean<String> saveWarrant(LoanWarrantDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isNotBlank(dto.getBusVinSid())) {
+            LoanWarrantInformation loanWarrantInformation = baseMapper.fetchByBusVinSid(dto.getBusVinSid());
+            if (loanWarrantInformation != null) {
+                BeanUtil.copyProperties(dto, loanWarrantInformation);
+                baseMapper.updateById(loanWarrantInformation);
+            } else {
+                LoanWarrantInformation entity = new LoanWarrantInformation();
+                BeanUtil.copyProperties(dto, entity);
+                //组织全路径
+                if (StringUtils.isNotBlank(dto.getOrgSidPath())) {
+                    ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgSidPath());
+                    if (orgSidByPath.getSuccess()) {
+                        String userOrgSid = orgSidByPath.getData();
+                        entity.setUseOrgSid(userOrgSid);
+                        ResultBean<SysOrganizationVo> organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid);
+                        if (organizationVo.getSuccess()) {
+                            SysOrganizationVo organizationVoData = organizationVo.getData();
+                            if (null != organizationVoData) {
+                                entity.setUseOrgName(organizationVoData.getName());
+                            }
+                        }
+                    }
+                }
+                baseMapper.insert(entity);
+            }
+        }
+        return rb.success();
+    }
 }