diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java index c6141ee655..8fc8384698 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java +++ b/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 selectByNum(@RequestParam("saleOrderSid") String saleOrderSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java index 052deed745..a11655472f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java +++ b/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 selectByNum(String saleOrderSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 56825c5419..f8fd1e03b9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/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 selectByNum(String saleOrderSid) { + ResultBean rb = ResultBean.fireFail(); + int num = busSalesOrderBorrowerService.selectByNum(saleOrderSid); + return rb.success().setData(num); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java index bba2906310..afdd852bbd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java +++ b/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 bdCustomers = new ArrayList<>(); + // List 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); - ResultBean resultBean = finKingDeeFeign.draftBdCustomers(bdCustomers); + // bdCustomers.add(bdCustomer); + ResultBean 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 \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java index c8d24fbd2e..58754a8ac4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java +++ b/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("客户编码不能为空"); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json index 0010f593fc..144c7f9c41 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json +++ b/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": "" }, diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSetting.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSetting.java new file mode 100644 index 0000000000..d7060fe8ed --- /dev/null +++ b/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; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingFeign.java new file mode 100644 index 0000000000..83526caf0b --- /dev/null +++ b/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> listPage(@RequestBody PagerQuery pagerQuery); +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingFeignFallback.java new file mode 100644 index 0000000000..acb9cd0da9 --- /dev/null +++ b/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 { +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingQuery.java new file mode 100644 index 0000000000..a97b9ece89 --- /dev/null +++ b/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; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingVo.java new file mode 100644 index 0000000000..2823af6d94 --- /dev/null +++ b/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; +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparametersetting/SysParameterSettingRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparametersetting/SysParameterSettingRest.java new file mode 100644 index 0000000000..a36a002aee --- /dev/null +++ b/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> listPage(PagerQuery pagerQuery) { + return null; + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantDto.java new file mode 100644 index 0000000000..90d1576342 --- /dev/null +++ b/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; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeign.java index 85da645b06..742e279929 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeign.java +++ b/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> listPage(@RequestBody PagerQuery pq); + /** + * 保存推送 + * + * @param + */ + @ApiOperation("审核保存") + @PostMapping("/saveWarrant") + public ResultBean saveWarrant(@RequestBody LoanWarrantDto dto); + /** * 审核回显 diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeignFallback.java index 1961c3b4c3..ae76447783 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeignFallback.java +++ b/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 saveWarrant(LoanWarrantDto dto) { + return null; + } + @Override public ResultBean getAuditInfo(String sid) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java index 1ccec3abf8..f766d545d5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java +++ b/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 listPageVo(PagerQuery pq) { LoanHomevisitAppealQuery query = pq.getParams(); @@ -498,8 +500,15 @@ public class LoanHomevisitAppealService extends MybatisBaseService ${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} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java index a9eabaf6bb..ef1925c532 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java +++ b/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 pagging = baseMapper.newlistPage(page, qw); + List 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 p = PagerUtil.pageToVo(pagging, null); return p; } @@ -495,7 +507,6 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(salesOrder.getOrgSidPath()); - if (orgSidByPath.getSuccess()) { - String userOrgSid = orgSidByPath.getData(); - warrantInformation.setUseOrgSid(userOrgSid); - ResultBean 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 getMortgageInfo(String busVinSid) { ResultBean 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 fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType()); - fileList.removeAll(Collections.singleton(null)); - if (!fileList.isEmpty()) { - List 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 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 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 drivingFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); - vo.setDrivingFiles(drivingFiles); - } + LoanMortgageInformationTransactDetailsVo vo = baseMapper.getMortgageInfo(busVinSid); + //登记证 1-2页 + List fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List 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 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 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 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); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java index 632dacc56b..49011e0c3a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java +++ b/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 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 saveWarrant(LoanWarrantDto dto) { + return loanMortgageInformationTransactService.saveWarrant(dto); + } + @Override public ResultBean getAuditInfo(String sid) { return loanMortgageInformationTransactService.getAuditInfo(sid); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java index f586597e83..e9e94d18d8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java +++ b/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 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 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 orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgSidPath()); + if (orgSidByPath.getSuccess()) { + String userOrgSid = orgSidByPath.getData(); + entity.setUseOrgSid(userOrgSid); + ResultBean organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid); + if (organizationVo.getSuccess()) { + SysOrganizationVo organizationVoData = organizationVo.getData(); + if (null != organizationVoData) { + entity.setUseOrgName(organizationVoData.getName()); + } + } + } + } + baseMapper.insert(entity); + } + } + return rb.success(); + } }