Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -153,10 +153,12 @@ public interface BusSalesOrderFeign {
 
     @ApiOperation(value = "加签")
     @PostMapping(value = "/delegate")
+    @ResponseBody
     public ResultBean delegate(@RequestBody BusSalesOrderDelegateQuery query);
 
     @ApiOperation(value = "转办")
-    @PostMapping(value = "/assignTask")
+    @PutMapping(value = "/assignTask")
+    @ResponseBody
     public ResultBean assignTask(@RequestBody BusSalesOrderDelegateQuery query);
 
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1996,25 +1996,29 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 record.setClosingDate("-");
             }
             record.setShowFinancialBtn(false);
-            if (StringUtils.isNotBlank(record.getSaleOrderState())) {
-                if (record.getSaleOrderState().equals("已办结") && record.getCarPurchaseKey().equals("2")) {
-                    //查询金融方案
-                    LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
-                    if (solutions != null) {
-                        String solutionsSid = solutions.getSid();
-                        BusSolutionsChange busSolutionsChange = busSolutionsChangeService.selectBySolutionSid(solutionsSid);
-                        if (null != busSolutionsChange) {
-                            if (busSolutionsChange.getNodeState().equals("终止") || busSolutionsChange.getNodeState().equals("已办结")) {
+            LoanSolutions data = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
+            if (null != data) {
+                if (StringUtils.isNotBlank(record.getSaleOrderState())) {
+                    if (record.getSaleOrderState().equals("已办结")) {
+                        //查询金融方案
+                        LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
+                        if (solutions != null) {
+                            String solutionsSid = solutions.getSid();
+                            BusSolutionsChange busSolutionsChange = busSolutionsChangeService.selectBySolutionSid(solutionsSid);
+                            if (null != busSolutionsChange) {
+                                if (busSolutionsChange.getNodeState().equals("终止") || busSolutionsChange.getNodeState().equals("已办结")) {
+                                    record.setShowFinancialBtn(true);
+                                }
+                            } else {
                                 record.setShowFinancialBtn(true);
                             }
-                        } else {
-                            record.setShowFinancialBtn(true);
                         }
                     }
                 }
             }
 
 
+
            /* ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid());
             if (commonContractVoResultBean.getData() != null) {
                 record.setContractId(commonContractVoResultBean.getData().getContractNo());
@@ -5522,7 +5526,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 entityForCloseDate.setClosingDate(new Date());
                 baseMapper.updateById(entityForCloseDate);
                 //==================================添加线程
-                if("2".equals(busSalesOrder.getPayTypeKey())){
+                if ("2".equals(busSalesOrder.getPayTypeKey())) {
                     try {
                         ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                                 .setNameFormat("demo-pool-%d").build();
@@ -7486,7 +7490,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
         }
         VinVo2 vinVo = new VinVo2();
-        List<BusBorrowVehicleVo> busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrdersSid(saleOrderSid);
+        List<BusBorrowVehicleVo> busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrdersSid2(saleOrderSid);
         busSalesOrderVehicleList.removeAll(Collections.singleton(null));
         List<String> borrowSidList = busSalesOrderVehicleList.stream().map(v -> v.getBorrowerSid()).collect(Collectors.toList());
         List<VinListVo2> vinList = new ArrayList<>();
@@ -7507,14 +7511,19 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     String borrowName = busSalesOrderVehicle.getBorrowName();
                     if (StringUtils.isNotBlank(borrowSid)) {
                         BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(borrowSid);
-                        borrowName = busSalesOrderBorrower.getBorrowerName();
-                        vinListVo2.setGroupName("贷款人:" + borrowName);
+                        if(busSalesOrderBorrower.getState() != 1){
+                            borrowSid = "";
+                            vinListVo2.setGroupName("贷款人:不确定贷款人");
+                        }else{
+                            borrowName = busSalesOrderBorrower.getBorrowerName();
+                            vinListVo2.setGroupName("贷款人:" + borrowName);
+                        }
+
                     } else {
                         vinListVo2.setGroupName("贷款人:不确定贷款人");
                     }
                     vinList.add(vinListVo2);
                 }
-
                 List<BusBorrowVehicleVo> busSalesOrderVehicleLists = new ArrayList<>();
                 if (StringUtils.isNotBlank(borrowSid)) {
                     busSalesOrderVehicleLists = busSalesOrderVehicleService.selectListByOrderSid2(saleOrderSid, borrowSid);
@@ -7729,9 +7738,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
     public ResultBean assignTask(BusSalesOrderDelegateQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        DelegateQuery delegateQuery = new DelegateQuery();
+        FlowDelegateQuery delegateQuery = new
+                FlowDelegateQuery();
         BeanUtil.copyProperties(query, delegateQuery);
-        flowTaskFeign.assignTask(delegateQuery);
+        flowFeign.assignTask(delegateQuery);
         return rb.success();
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml

@@ -21,7 +21,7 @@
         bs.orgName as orgName,
         bs.staffName as staffName,
         bs.useOrgName as useOrgName,
-        co.loanCotractNo as loanContractNo,
+        co.loanContractNo as loanContractNo,
         co.borrowerName as borrowerName,
         co.bankName as bankName,
         co.bankContractNo as bankContractNo,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -237,7 +237,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
         }
         //消贷合同编号
         if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) {
-            qw.like("co.loanCotractNo", pagerQuery.getLoanContractNo());
+            qw.like("co.loanContractNo", pagerQuery.getLoanContractNo());
         }
         //贷款人
         if (StringUtils.isNotBlank(pagerQuery.getBorrowerName())) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -151,6 +151,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid);
 
     List<BusBorrowVehicleVo> selectListByOrdersSid(String saleOrderSid);
+    List<BusBorrowVehicleVo> selectListByOrdersSid2(String saleOrderSid);
 
     BusSalesOrderVehicle selectByBorrowSid(String sid);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -92,6 +92,12 @@
         from bus_sales_order_vehicle bv
         left join bus_sales_order bso on bso.sid = bv.salesOrderSid
         where bv.salesOrderSid = #{salesOrderSid} and (bv.borrowerSid IS NULL OR bv.borrowerSid = '')
+        union all
+        select if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) as temporaryNo,bv.linkSid,bv.linkNo
+        from bus_sales_order_vehicle bv
+        left join bus_sales_order bso on bso.sid = bv.salesOrderSid
+        left join bus_sales_order_borrower bbb on bbb.sid = bv.borrowerSid
+        where bv.salesOrderSid = #{salesOrderSid} and length(bv.borrowerSid)>0 and bbb.state != 1
     </select>
 
     <select id="selectByNoAndVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
@@ -272,6 +278,14 @@
         where bv.salesOrderSid = #{saleOrderSid} and bbb.state = 1 group by bv.borrowerSid
     </select>
 
+    <select id="selectListByOrdersSid2"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo">
+        select bv.sid,ifnull(bv.borrowerSid,'') as borrowerSid,bv.borrowName,bv.linkNo,bv.linkSid,if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) as temporaryNo
+        from bus_sales_order_vehicle bv
+        left join bus_sales_order bso on bso.sid = bv.salesOrderSid
+        where bv.salesOrderSid = #{saleOrderSid} group by bv.borrowerSid
+    </select>
+
     <select id="selectByBorrowSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select * from bus_sales_order_vehicle where borrowerSid = #{sid}
     </select>
@@ -282,6 +296,12 @@
                    from bus_sales_order_vehicle bv
                                                                    LEFT JOIN bus_sales_order AS bso ON bv.salesOrderSid = bso.sid
         where (bv.borrowerSid is null or bv.borrowerSid = '') and bv.salesOrderSid = #{sale0rderSid}
+        union all
+        select if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) as temporaryNo,concat(if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)),':',if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,'-',RIGHT(bv.linkNo, 8))) as dictValue,bv.sid dictKey
+        from bus_sales_order_vehicle bv
+        LEFT JOIN bus_sales_order AS bso ON bv.salesOrderSid = bso.sid
+        left join bus_sales_order_borrower bbb on bbb.sid = bv.borrowerSid
+        where length(bv.borrowerSid)>0 and bv.salesOrderSid = #{sale0rderSid} and bbb.state = 1
         order by temporaryNo asc
     </select>
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -590,6 +590,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.selectListByOrdersSid(saleOrderSid);
     }
 
+    public List<BusBorrowVehicleVo> selectListByOrdersSid2(String saleOrderSid) {
+        return baseMapper.selectListByOrdersSid2(saleOrderSid);
+    }
+
     public BusSalesOrderVehicle selectByBorrowSid(String sid) {
         return baseMapper.selectByBorrowSid(sid);
     }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java

@@ -46,6 +46,11 @@ public interface FlowFeign {
     @PostMapping(value = "/delegate")
     public ResultBean delegate(@RequestBody FlowDelegateQuery flowDelegateQuery);
 
+    @ApiOperation(value = "转办")
+    @PostMapping(value = "/assignTask")
+    public ResultBean assignTask(@RequestBody FlowDelegateQuery flowDelegateQuery);
+
+
     @ApiOperation(value = "催办统计查询发起人信息")
     @GetMapping(value = "/getApplicantInfoForUrgeCount")
     @ResponseBody

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java

@@ -104,6 +104,11 @@ public class FlowRest implements FlowFeign {
         return flowService.delegate(flowDelegateQuery);
     }
 
+    @Override
+    public ResultBean assignTask(FlowDelegateQuery flowDelegateQuery) {
+        return flowService.assignTask(flowDelegateQuery);
+    }
+
     @Override
     public ResultBean<FlowableMessageVo> getApplicantInfoForUrgeCount(String taskId, String procInstId) {
         return flowService.getApplicantInfoForUrgeCount(taskId,procInstId);

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java

@@ -852,6 +852,91 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
 
     }
 
+    public ResultBean assignTask(FlowDelegateQuery flowDelegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        DelegateQuery delegateQuery = new DelegateQuery();
+        BeanUtil.copyProperties(flowDelegateQuery, delegateQuery);
+        ResultBean assignTask = flowTaskService.assignTask(delegateQuery);
+        String userSid = flowDelegateQuery.getUserSid();
+        String assigneeSid = flowDelegateQuery.getAssignee();
+        String instanceId = flowDelegateQuery.getInstanceId();
+        String views = "";
+        if (StringUtils.isNotBlank(flowDelegateQuery.getViews())) {
+            views = flowDelegateQuery.getViews();
+        }
+        ResultBean<SysUserVo> userVoResultBean1 = sysUserFeign.fetchBySid(userSid);
+        String userName = "";
+        if (userVoResultBean1.getData() != null) {
+            userName = userVoResultBean1.getData().getName();
+        }
+        ResultBean<SysUserVo> userVoResultBean2 = sysUserFeign.fetchBySid(assigneeSid);
+        ProcessCommentDto processCommentDto = new ProcessCommentDto();
+        processCommentDto.setReviewerSid(userSid);
+        if (userVoResultBean2.getData() != null) {
+            String changeName = userVoResultBean2.getData().getName();
+            processCommentDto.setReviewer(userName);
+            processCommentDto.setContent(userName + "转办给" + changeName + "：" + views);
+        }
+        processCommentDto.setTime(new Date());
+        processCommentDto.setProcessId(instanceId);
+        processCommentService.saveOrUpdateDto(processCommentDto);
+        //转办内容推送至待阅
+        HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+                .includeProcessVariables().taskId(delegateQuery.getTaskId()).singleResult();
+        if (historicTaskInstance == null) {
+            return rb.setMsg("分享失败！");
+        }
+        MessageFlowVo messageFlowVo = new MessageFlowVo();
+        String procDefId = historicTaskInstance.getProcessDefinitionId();
+        String procInsId = historicTaskInstance.getProcessInstanceId();
+        String nodeState = historicTaskInstance.getName();
+        String taskDefKey = historicTaskInstance.getTaskDefinitionKey();
+        messageFlowVo.setProcDefId(procDefId);
+        messageFlowVo.setTaskId(delegateQuery.getTaskId());
+        messageFlowVo.setNodeState(nodeState);
+        messageFlowVo.setProcInsId(procInsId);
+        messageFlowVo.setTaskDefKey(taskDefKey);
+        Map<String, Object> processVariables = historicTaskInstance.getProcessVariables();
+        MessageFlowableQuery mfq = new MessageFlowableQuery();
+        mfq.setUfVo(messageFlowVo);
+        String createrOrgPath = (String) processVariables.get("createrOrgPath");
+        if (historicTaskInstance == null) {
+            return rb.setMsg("分享失败！");
+        }
+        //
+        String assignee = (String) processVariables.get("assignee");
+        ResultBean<SysUserVo> stringResultBean = sysUserFeign.fetchBySid(assignee);
+        String assigneeName = "";
+        if (stringResultBean.getData() != null) {
+            assigneeName = stringResultBean.getData().getName();
+        }
+
+        Map<String, Object> app = new HashMap<>();
+        if (processVariables.get("app") != null) {
+            app = (Map<String, Object>) processVariables.get("app");
+        }
+        mfq.setAppMap(app);
+        String businessSid = (String) processVariables.get("businessSid");
+        mfq.setBusinessSid(businessSid);
+        mfq.setMsgContent(userName + "分享的流程审批,请查看");
+//        act_re_procdef
+        Map<String, String> process = processService.getProcessDefByDefId(historicTaskInstance.getProcessDefinitionId());
+
+        mfq.setModuleName(process.get("NAME_"));
+        if (processVariables.containsKey("orderNames")) {
+            mfq.setMsgTitle(processVariables.get("orderNames").toString());
+        } else {
+            mfq.setMsgTitle(process.get("NAME_"));
+        }
+        mfq.setUserSids(userSid);
+        mfq.setOrgPath(createrOrgPath);
+        mfq.setUserSid(assignee);
+        mfq.setApplicationName(assigneeName);
+        ResultBean<String> resultBean = messageFeign.pushMessageShare(mfq);
+        return rb.success();
+    }
+
+
     public ResultBean<FlowableMessageVo> getApplicantInfoForUrgeCount(String taskId, String procInstId) {
         ResultBean<FlowableMessageVo> rb = ResultBean.fireFail();
         FlowableMessageVo flowableMessageVo = baseMapper.getApplicantInfoForUrgeCount(taskId, procInstId);
@@ -915,4 +1000,6 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
         }
         return rb.success().setData(vo);
     }
+
+
 }

anrui-riskcenter-ui/src/views/homevisitdatareview/homevisitdatareviewAdd.vue

@@ -4,6 +4,7 @@
       <div>{{ viewTitle }}</div>
       <div>
         <el-button type="primary" size="small" @click="handlePush">推送问题反馈</el-button>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存</el-button>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交下一环节</el-button>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
@@ -200,6 +201,7 @@ export default {
       image_list16: [],
       image_list17: [],
       formobj: {
+        isSave: '',
         carProperty: [],
         doorway: [],
         groupPhoto: [],
@@ -418,6 +420,25 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '存在的问题反馈内容不能为空' })
       }
     },
+    save() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.getUrl()
+          this.submitdisabled = true
+          this.formobj.isSave = '1'
+          req.save(this.formobj).then((resp) => {
+            if (resp.success) {
+              this.$message({ showClose: true, type: 'success', message: '操作成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
     submit() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
@@ -594,6 +615,7 @@ export default {
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       this.formobj = {
+        isSave: '',
         carProperty: [],
         doorway: [],
         groupPhoto: [],

anrui-riskcenter-ui/src/views/homevisitdatareview/homevisitdatareviewReplenish.vue

@@ -3,7 +3,7 @@
     <div class="tab-header webtop">
       <div>{{ viewTitle }}</div>
       <div>
-        <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">保存</el-button>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存</el-button>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
     </div>
@@ -233,6 +233,7 @@ export default {
       image_list16: [],
       image_list17: [],
       formobj: {
+        isSave: '',
         carProperty: [],
         doorway: [],
         groupPhoto: [],
@@ -474,11 +475,12 @@ export default {
         })
       })
     },
-    submit() {
+    save() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.getUrl()
           this.submitdisabled = true
+          this.formobj.isSave = '1'
           req.save(this.formobj).then((resp) => {
             if (resp.success) {
               this.$message({ showClose: true, type: 'success', message: '操作成功' })
@@ -650,6 +652,7 @@ export default {
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       this.formobj = {
+        isSave: '',
         carProperty: [],
         doorway: [],
         groupPhoto: [],

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

@@ -26,6 +26,8 @@ public class LoanAuditInfoDto implements Dto {
     private String bankName;
     @ApiModelProperty("备注")
     private String remarks;
+    @ApiModelProperty("车牌号")
+    private String vehicleMark;
     @ApiModelProperty("登记证 1-2页")
     private List<String> registrationFiles1 = new ArrayList<>();
     @ApiModelProperty("登记证 3-4页")

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

@@ -26,6 +26,8 @@ public class LoanAuditInfoVo implements Vo {
     private String bankName;
     @ApiModelProperty("备注")
     private String remarks;
+    @ApiModelProperty("车牌号")
+    private String vehicleMark;
     @ApiModelProperty("登记证 1-2页")
     private List<String> registrationFiles1 = new ArrayList<>();
     @ApiModelProperty("登记证 3-4页")

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

@@ -32,4 +32,6 @@ public class LoanTransferInfoDto implements Dto {
     private String recipient;
     @ApiModelProperty("移交备注")
     private String transferRemarks;
+    @ApiModelProperty("车牌号")
+    private String vehicleMark;
 }

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

@@ -36,4 +36,6 @@ public class LoanTransferInfoVo implements Vo {
     private String recipient;
     @ApiModelProperty("移交备注")
     private String transferRemarks;
+    @ApiModelProperty("车牌号")
+    private String vehicleMark;
 }

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

@@ -63,4 +63,7 @@ public class LoanWarrantInformation extends BaseEntity {
     private String useOrgName;
     @ApiModelProperty("使用组织全路径")
     private String orgSidPath;
+    @ApiModelProperty("车牌号")
+    private String vehicleMark;
+
 }

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

@@ -50,4 +50,6 @@ public class LoanWarrantInformationDetailsVo implements Vo {
     private String recipient;
     @ApiModelProperty("移交备注")
     private String transferRemarks;
+    @ApiModelProperty("车牌号")
+    private String vehicleMark;
 }

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

@@ -36,4 +36,6 @@ public class LoanWarrantInformationVo implements Vo {
     private String bankName;
     @ApiModelProperty("备注")
     private String transferRemarks;
+    @ApiModelProperty("车牌号")
+    private String vehicleMark;
 }

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

@@ -29,7 +29,8 @@
         auditStateValue,
         date_format(transferDate, '%Y-%m-%d') as transferDate,
         bankName,
-        transferRemarks
+        transferRemarks,
+        vehicleMark
         from loan_warrant_information
         <where>
             ${ew.sqlSegment}

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

@@ -267,12 +267,19 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         StringBuffer sbVinNo = new StringBuffer();
         StringBuffer sbConNo = new StringBuffer();
+        StringBuffer sbVinMark = new StringBuffer();
         HashSet<String> hashSet = new HashSet<>();
         for (String sid : sids) {
             LoanWarrantInformation entity = fetchBySid(sid);
             if (StringUtils.isNotBlank(entity.getVinNo())) {
                 sbVinNo.append(entity.getVinNo()).append("，");
             }
+            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());
             }
@@ -308,6 +315,10 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
             sbVinNo.delete(sbVinNo.length() - 1, sbVinNo.length());
             vo.setVinNo(sbVinNo.toString());
         }
+        if (sbVinMark.length() > 0) {
+            sbVinMark.delete(sbVinMark.length() - 1, sbVinMark.length());
+            vo.setVehicleMark(sbVinMark.toString());
+        }
         if (!hashSet.isEmpty()) {
             for (String s : hashSet) {
                 sbConNo.append(s).append("，");