Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java

@@ -105,4 +105,9 @@ public interface BusSalesOrderBorrowerFeign {
     @PostMapping("/updateState")
     @ResponseBody
     ResultBean updateState(@RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid,@RequestParam("state") String state);
+
+    @ApiOperation("查询该销售订单已确定的数量")
+    @PostMapping("/selectByNum")
+    @ResponseBody
+    ResultBean<Integer> selectByNum(@RequestParam("saleOrderSid") String saleOrderSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java

@@ -99,4 +99,9 @@ public class BusSalesOrderBorrowerFeignFallback implements BusSalesOrderBorrower
     public ResultBean updateState(String saleOrderBorrowerSid, String state) {
         return null;
     }
+
+    @Override
+    public ResultBean<Integer> selectByNum(String saleOrderSid) {
+        return null;
+    }
 }

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

@@ -7668,11 +7668,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             for (int i = 0; i < vins.size(); i++) {
                 String busVinSid = vins.get(i);
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busVinSid);
-                if (StringUtils.isBlank(busSalesOrderVehicle.getBorrowerSid())) {
+                busSalesOrderVehicle.setBorrowerSid(busSalesOrderBorrower.getSid());
-                    busSalesOrderVehicle.setBorrowerSid(busSalesOrderBorrower.getSid());
+                busSalesOrderVehicle.setBorrowName(busSalesOrderBorrower.getBorrowerName());
-                    busSalesOrderVehicle.setBorrowName(busSalesOrderBorrower.getBorrowerName());
+                busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
-                    busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
-                }
             }
             //更新业务状态码
             busSalesOrderBorrower.setBusName("家访准备");

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java

@@ -124,4 +124,11 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign {
     public ResultBean updateState(String saleOrderBorrowerSid, String state) {
         return busSalesOrderBorrowerService.updateState(saleOrderBorrowerSid, state);
     }
+
+    @Override
+    public ResultBean<Integer> selectByNum(String saleOrderSid) {
+        ResultBean rb = ResultBean.fireFail();
+        int num = busSalesOrderBorrowerService.selectByNum(saleOrderSid);
+        return rb.success().setData(num);
+    }
 }

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

@@ -370,26 +370,39 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                         String customerNumber = "";
                         //判断财务系统是否有客户
                         Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
+                        String linkNo = "";
                         if (!aBoolean) {
-                            List<BdCustomer> bdCustomers = new ArrayList<>();
+                            //  List<BdCustomer> bdCustomers = new ArrayList<>();
                             BdCustomer bdCustomer = new BdCustomer();
                             bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
                             bdCustomer.setFShortName(salesOrder.getContractNo());
                             BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
                             bdCustomer.setTOrgIds(data.getOrgCode());
                             if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
-                                bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getLinkNo());
+                                if (busSalesOrderVehicle.getLinkNo().length() > 8) {
+                                    linkNo = busSalesOrderVehicle.getLinkNo().substring(linkNo.length() - 8);
+                                } else {
+                                    linkNo = busSalesOrderVehicle.getLinkNo();
+                                }
+                                bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
                             } else {
                                 bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
                             }
-                            bdCustomers.add(bdCustomer);
+                            //  bdCustomers.add(bdCustomer);
-                            ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomers(bdCustomers);
+                            ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
                             if (resultBean.getSuccess()) {
                                 customerNumber = bdCustomer.getFNumber();
                             }
                         } else {
                             customerNumber = busSalesOrderVehicle.getTemporaryNo();
                         }
+                        String loanContractSid = busSalesOrderVehicle.getLoanContractSid();
+                        if (StringUtils.isNotBlank(loanContractSid)) {
+                            BusSalesOrderLoancontract loancontract = fetchBySid(loanContractSid);
+                            if (null != loancontract) {
+                                creditResult.setBillNo(loancontract.getLoanContractNo() + linkNo);
+                            }
+                        }
                         creditResult.setCommUnit(customerNumber);
                         SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(salesOrder.getUseOrgSid()).getData();
                         creditResult.setCollectionOrg(sysOrganizationVo1.getOrgCode());
@@ -522,7 +535,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
 
     public ResultBean delByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
         ResultBean rb = ResultBean.fireFail();
-        baseMapper.delByOrderSidAndDkrSid(saleOrderSid,borrowerSid);
+        baseMapper.delByOrderSidAndDkrSid(saleOrderSid, borrowerSid);
         return rb.success();
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml

@@ -75,6 +75,11 @@
     </select>
 
     <select id="selectByOrdersSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
-        select * from bus_sales_order_vehicle where salesOrderSid = #{sid} and (borrowerSid is null or borrowerSid = '')
+        select a.* from(select bv.* from bus_sales_order_vehicle bv where bv.salesOrderSid = #{sid} and (bv.borrowerSid is null or bv.borrowerSid = '')
+                          union all
+                          select bv.* from bus_sales_order_vehicle bv
+                                               left join bus_sales_order_borrower bob on bv.borrowerSid = bob.sid
+                          where bv.salesOrderSid =#{sid} and length(bv.borrowerSid)>0 and bob.state = 0) a group by a.sid
+
     </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java

@@ -32,7 +32,7 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
 //        if (creditResult.getBillNo() == null) {
 //            return rb.setMsg("单据编号不能为空");
 //        }
-//        map_fEntityModel_.put("FBillNo", creditResult.getBillNo());
+        map_fEntityModel_.put("FBillNo", creditResult.getBillNo());
         //业务日期
         if (creditResult.getBussDate() == null) {
             return rb.setMsg("业务日期不能为空");
@@ -40,6 +40,7 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
         map_fEntityModel_.put("FDATE", creditResult.getBussDate());
         //到期日期
         map_fEntityModel_.put("FENDDATE_H", creditResult.getBussDate());
+        map_fEntityModel_.put("FACCNTTIMEJUDGETIME", creditResult.getBussDate());
         //客户
         if (creditResult.getCommUnit() == null) {
             return rb.setMsg("客户编码不能为空");

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json

@@ -3,7 +3,7 @@
   "FBillTypeID": {
     "FNUMBER": "QTYSD01_SYS"
   },
-  "FBillNo": "",
+  "FBillNo": "@KD_FBillNo",
   "FDATE": "@KD_FDATE",
   "FENDDATE_H": "@KD_FENDDATE_H",
   "FISINIT": "false",
@@ -36,7 +36,7 @@
   "FSALEERID": {
     "FNumber": ""
   },
-  "FACCNTTIMEJUDGETIME": "1900-01-01",
+  "FACCNTTIMEJUDGETIME": "@KD_FACCNTTIMEJUDGETIME",
   "FSettleTypeID": {
     "FNumber": ""
   },

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSetting.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.portal.api.sysparametersetting;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Data
+public class SysParameterSetting extends BaseEntity {
+    private static final long serialVersionUID = 5546089724912096395L;
+    @ApiModelProperty("表名key")
+    private String tableNameKey;
+    @ApiModelProperty("表名value")
+    private String tableNameValue;
+    @ApiModelProperty("列名")
+    private String columnName;
+    @ApiModelProperty("注释")
+    private String columnComment;
+    @ApiModelProperty("创建人机构sid")
+    private String createOrgSid;
+    @ApiModelProperty("分公司全路径")
+    private String orgSidPath;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingFeign.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.portal.api.sysparametersetting;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Api(tags = "统计参数设置")
+@FeignClient(
+        contextId = "anrui-portal-SysParameterSetting",
+        name = "anrui-portal",
+        path = "v1/SysParameterSetting",
+        fallback = SysParameterSettingFeignFallback.class)
+public interface SysParameterSettingFeign {
+
+    @ApiOperation("分页")
+    @PostMapping("/listPage")
+    ResultBean<PagerVo<SysParameterSettingVo>> listPage(@RequestBody PagerQuery<SysParameterSettingQuery> pagerQuery);
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingFeignFallback.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.portal.api.sysparametersetting;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Component
+public class SysParameterSettingFeignFallback {
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.portal.api.sysparametersetting;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Data
+public class SysParameterSettingQuery implements Query {
+    private static final long serialVersionUID = 8109733209988872255L;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.portal.api.sysparametersetting;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Data
+public class SysParameterSettingVo {
+
+    private String sid;
+    @ApiModelProperty("表名key")
+    private String tableNameKey;
+    @ApiModelProperty("表名value")
+    private String tableNameValue;
+    @ApiModelProperty("列名")
+    private String columnName;
+    @ApiModelProperty("注释")
+    private String columnComment;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparametersetting/SysParameterSettingRest.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.portal.biz.sysparametersetting;
+
+import com.yxt.anrui.portal.api.sysparametersetting.SysParameterSettingFeign;
+import com.yxt.anrui.portal.api.sysparametersetting.SysParameterSettingQuery;
+import com.yxt.anrui.portal.api.sysparametersetting.SysParameterSettingVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Api(tags = "统计参数设置")
+@RestController
+@RequestMapping("v1/SysParameterSetting")
+public class SysParameterSettingRest implements SysParameterSettingFeign {
+    @Override
+    public ResultBean<PagerVo<SysParameterSettingVo>> listPage(PagerQuery<SysParameterSettingQuery> pagerQuery) {
+        return null;
+    }
+}

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/loanhomevisitappeal/LoanHomevisitAppealService.java

@@ -39,6 +39,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo;
 import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@@ -123,9 +125,9 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
     @Autowired
     private FlowTaskFeign flowTaskFeign;
     @Autowired
-    private LoanHomevisitFileexamineService loanHomevisitFileexamineService;
-    @Autowired
     private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
+    @Autowired
+    private BusSalesOrderPriceFeign busSalesOrderPriceFeign;
 
     public PagerVo<LoanHomevisitAppealVo> listPageVo(PagerQuery<LoanHomevisitAppealQuery> pq) {
         LoanHomevisitAppealQuery query = pq.getParams();
@@ -498,8 +500,15 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-                //修改贷款人状态为正常(1正常，0作废)
+                //查询该销售订单已确定的数量
-                busSalesOrderBorrowerFeign.updateState(loanHomevisitInvestigate.getSaleOrderBorrowerSid(), "1");
+                int count = busSalesOrderBorrowerFeign.selectByNum(loanHomevisitInvestigate.getSaleOrderSid()).getData();
+                //查询销售订单价格中数量
+                AppBusSalesOrderPriceVo appBusSalesOrderPriceVo = busSalesOrderPriceFeign.getPriceInfo(loanHomevisitInvestigate.getSaleOrderSid()).getData();
+                int jgNum = Integer.parseInt(appBusSalesOrderPriceVo.getNumber());
+                if (count < jgNum){
+                    //修改贷款人状态为正常(1正常，0作废)
+                    busSalesOrderBorrowerFeign.updateState(loanHomevisitInvestigate.getSaleOrderBorrowerSid(), "1");
+                }
                 //修改家访考察为待考察，并清空考察结果
                 loanHomevisitInvestigateService.updateState(loanHomevisitInvestigate.getSid(), "1");
             } else {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml

@@ -8,7 +8,7 @@
         SELECT
         li.`sid`,
         li.state,
-        bo.createDate,
+        DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createDate,
         li.`resHomeVisDate`,
         li.`homeVisAddress`,
         bo.`useOrgName`,

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");
+            // baseVehicleStateFeign.updateBusStateByBusSid(dto.getBusVinSid(), "308");
-            LoanMortgageInformationTransact loanMortgageInformationTransact = baseMapper.fetchByBusVinSid(dto.getBusVinSid());
+            LoanMortgageInformationTransact entity = baseMapper.fetchByBusVinSid(dto.getBusVinSid());
-            LoanWarrantInformation warrantInformation = new LoanWarrantInformation();
+            if (null != entity) {
-            warrantInformation.setBusVinSid(dto.getBusVinSid());
+                entity.setState(0);
-            warrantInformation.setAuditStateKey("001");
+                baseMapper.updateById(entity);
-            warrantInformation.setAuditStateValue("待审核");
+                LoanWarrantDto loanWarrantDto = new LoanWarrantDto();
-            warrantInformation.setRemarks(loanMortgageInformationTransact.getRemarks());
+                if (StringUtils.isNotBlank(entity.getVinNo())) {
-            //根据业务车辆sid查询 销售订单业务车辆表
+                    loanWarrantDto.setVinNo(entity.getVinNo());
-            BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(dto.getBusVinSid()).getData();
-            if (null != orderVehicle) {
-                if (StringUtils.isNotBlank(orderVehicle.getLinkNo())) {
-                    warrantInformation.setVinNo(orderVehicle.getLinkNo());
                 }
-                String salesOrderSid = orderVehicle.getSalesOrderSid();
+                if (StringUtils.isNotBlank(entity.getSalesOrderSid())) {
-                warrantInformation.setSalesOrderSid(salesOrderSid);
+                    loanWarrantDto.setSalesOrderSid(entity.getSalesOrderSid());
-                BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData();
+                }
-                if (null != salesOrder) {
+                //组织全路径
-                    //组织全路径
+                if (StringUtils.isNotBlank(entity.getOrgSidPath())) {
-                    if (StringUtils.isNotBlank(salesOrder.getOrgSidPath())) {
+                    loanWarrantDto.setOrgSidPath(entity.getOrgSidPath());
-                        warrantInformation.setOrgSidPath(salesOrder.getOrgSidPath());
+                }
-                        ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(salesOrder.getOrgSidPath());
+                //创建人sid
-                        if (orgSidByPath.getSuccess()) {
+                if (StringUtils.isNotBlank(entity.getCreateBySid())) {
-                            String userOrgSid = orgSidByPath.getData();
+                    loanWarrantDto.setCreateBySid(entity.getCreateBySid());
-                            warrantInformation.setUseOrgSid(userOrgSid);
+                }
-                            ResultBean<SysOrganizationVo> organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid);
+                //销售部门
-                            if (organizationVo.getSuccess()) {
+                if (StringUtils.isNotBlank(entity.getDept())) {
-                                SysOrganizationVo organizationVoData = organizationVo.getData();
+                    loanWarrantDto.setDepartment(entity.getDept());
-                                if (null != organizationVoData) {
+                }
-                                    warrantInformation.setUseOrgName(organizationVoData.getName());
+                //销售专员
-                                }
+                if (StringUtils.isNotBlank(entity.getStaff())) {
-                            }
+                    loanWarrantDto.setSalesman(entity.getStaff());
-                        }
+                }
-                    }
+                //消贷合同编号
-                    //创建人sid
+                if (StringUtils.isNotBlank(entity.getLoanContractNo())) {
-                    if (StringUtils.isNotBlank(salesOrder.getCreateBySid())) {
+                    loanWarrantDto.setContractNo(entity.getLoanContractNo());
-                        warrantInformation.setCreateBySid(salesOrder.getCreateBySid());
+                }
-                    }
+                //贷款人
-                    //销售部门
+                if (StringUtils.isNotBlank(entity.getBorrowerName())) {
-                    if (StringUtils.isNotBlank(salesOrder.getOrgName())) {
+                    loanWarrantDto.setBorrowerName(entity.getBorrowerName());
-                        warrantInformation.setDepartment(salesOrder.getOrgName());
+                }
-                    }
+                //资方
-                    //销售专员
+                if (StringUtils.isNotBlank(entity.getBankName())) {
-                    if (StringUtils.isNotBlank(salesOrder.getStaffName())) {
+                    loanWarrantDto.setBankName(entity.getBankName());
-                        warrantInformation.setSalesman(salesOrder.getStaffName());
+                }
-                    }
+                if (StringUtils.isNotBlank(entity.getBusVinSid())) {
-                    //根据销售订单sid查询消贷合同表
+                    loanWarrantDto.setBusVinSid(entity.getBusVinSid());
-                    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());
-                        }
-                    }
                 }
+                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 = baseMapper.getMortgageInfo(busVinSid);
-        LoanMortgageInformationTransactDetailsVo vo = new LoanMortgageInformationTransactDetailsVo();
+        //登记证 1-2页
-        //根据业务车辆sid查询 销售订单业务车辆表
+        List<LoanFile> fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType());
-        BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
+        fileList.removeAll(Collections.singleton(null));
-        if (null != orderVehicle) {
+        if (!fileList.isEmpty()) {
-            if (StringUtils.isNotBlank(orderVehicle.getLinkNo())) {
+            List<String> registrationFiles1 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
-                vo.setVinNo(orderVehicle.getLinkNo());
+                    collect(Collectors.toList());
-            }
+            vo.setRegistrationFiles1(registrationFiles1);
-            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);
-            }
         }
-        if (null != fetchVo) {
+        //登记证 3-4页
-            if (StringUtils.isNotBlank(fetchVo.getMortgageDate())) {
+        fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_TWO.getAttachType());
-                vo.setMortgageDate(fetchVo.getMortgageDate());
+        fileList.removeAll(Collections.singleton(null));
-            }
+        if (!fileList.isEmpty()) {
-            if (StringUtils.isNotBlank(fetchVo.getRemarks())) {
+            List<String> registrationFiles2 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
-                vo.setRemarks(fetchVo.getRemarks());
+            vo.setRegistrationFiles2(registrationFiles2);
-            }
+        }
-//            else {
+        //营运证
-//                vo.setMortgageDate("-");
+        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/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java

@@ -108,7 +108,11 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
         ResultBean<String> rb = ResultBean.fireFail();
         String borrowerSid = dto.getSalesOrderSid();
         LoanNoGuaranteeCreditReview entity = baseMapper.selectOneByBorrowerSid(borrowerSid);
+        String result = "";
         if (null != entity) {
+            if (StringUtils.isNotBlank(entity.getCreditReview())) {
+                result = entity.getCreditReview();
+            }
             BeanUtil.copyProperties(dto, entity, "id", "sid");
             entity.setBorrowerSid(borrowerSid);
             baseMapper.updateById(entity);
@@ -131,7 +135,7 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
             LoanNoGuaranteeCreditReview creditReview = fetchBySid(sid);
             if (null != creditReview) {
                 if (StringUtils.isNotBlank(creditReview.getCreditReview())) {
-                    if ("通过".equals(creditReview.getCreditReview()) && !"通过".equals(entity.getCreditReview())) {
+                    if ("通过".equals(creditReview.getCreditReview()) && !"通过".equals(result)) {
                         BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(creditReview.getBorrowerSid()).getData();
                         if (null != borrowerDetailsVo) {
                             //推送客户融资放款的应收未收

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -2662,14 +2662,17 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                         }
                     }
                 }
-                if ("01".equals(loanFinPolicy.getDiscountUseTypeKey())) {//01差额放款
+                if ("01".equals(loanFinPolicy.getDiscountUseTypeKey())) {
+                    BigDecimal zer = BigDecimal.ZERO;
                     if (loanSolutions.getFactoryDiscount() != null) {
                         bg = bg.subtract(loanSolutions.getFactoryDiscount());
-                        if(loanSolutions.getFactoryDiscount() != null){
+                        zer = zer.add(loanSolutions.getFactoryDiscount());
-                            pushVo.setOtherReceivableMoney(loanSolutions.getFactoryDiscount().toString());
+                    }
-                        }
+                    if(loanSolutionsOtherpolicy.getOtherDiscount() != null){
-
+                        bg = bg.subtract(loanSolutionsOtherpolicy.getOtherDiscount());
+                        zer = zer.add(loanSolutionsOtherpolicy.getOtherDiscount());
                     }
+                    pushVo.setOtherReceivableMoney(zer.toString());
                 }
             }
         }

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();
+    }
 }