diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturninboundapply/LoanReturnInboundApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturninboundapply/LoanReturnInboundApplyDetailsVo.java index ad125b30bf..0b19b1b613 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturninboundapply/LoanReturnInboundApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturninboundapply/LoanReturnInboundApplyDetailsVo.java @@ -17,6 +17,7 @@ import java.util.List; @Data public class LoanReturnInboundApplyDetailsVo { + private String sid; @ApiModelProperty("申请部门") private String createDept; @ApiModelProperty("申请部门sid") @@ -84,6 +85,8 @@ public class LoanReturnInboundApplyDetailsVo { private String busVinSid; + private String remarks; + private List filesList = new ArrayList<>(); private LoanReturnInboundTrailerDto loanReturnInboundTrailer = new LoanReturnInboundTrailerDto(); @@ -92,5 +95,15 @@ public class LoanReturnInboundApplyDetailsVo { private String orgPath; private String userSid; + private String useOrgSid; + @ApiModelProperty("车型和配置sid") + private String modelConfigSid; + @ApiModelProperty("销售指导价") + private String guildPrice; + + @ApiModelProperty(value = "任务id") + private String taskId; + @ApiModelProperty(value = "流程实例id") + private String procInstId; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturnvehledger/LoanReturnVehLedger.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturnvehledger/LoanReturnVehLedger.java new file mode 100644 index 0000000000..42f1f8e17e --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturnvehledger/LoanReturnVehLedger.java @@ -0,0 +1,76 @@ +package com.yxt.anrui.riskcenter.api.loanreturnvehledger; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/1/17 + **/ +@Data +public class LoanReturnVehLedger extends BaseEntity { + private static final long serialVersionUID = -2097285949752704911L; + @ApiModelProperty("车辆sid") + private String vinSid; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("车辆类型") + private String vehType; + @ApiModelProperty("车辆类型key") + private String vehTypeKey; + @ApiModelProperty("车型") + private String vehModel; + @ApiModelProperty("车型sid") + private String vehModelSid; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("配置") + private String configName; + @ApiModelProperty("客户名称") + private String customer; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("贷款人") + private String borrowerName; + @ApiModelProperty("贷款人sid") + private String borrowerSid; + @ApiModelProperty("存放地点") + private String location; + @ApiModelProperty("存放地点sid") + private String locationSid; + @ApiModelProperty("处置方式key") + private String disposalKey; + @ApiModelProperty("处置方式") + private String disposal; + @ApiModelProperty("入库价") + private int inboundMoney; + @ApiModelProperty("入库日期") + private Date inboundDate; + @ApiModelProperty("出库日期") + private Date outboundDate; + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("组织全路径") + private String orgSidPath; + @ApiModelProperty("逾期金额") + private BigDecimal overMoney; + @ApiModelProperty("未到期金额") + private BigDecimal notBecomeDueMoney; + + private String pSid; + @ApiModelProperty("销售订单sid") + private String saleOrderSid; + @ApiModelProperty("销售订单车辆sid") + private String busVinSid; + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.java index 74a2daa138..db133ee7de 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApply; import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyDetailsVo; import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyVo; @@ -34,4 +35,6 @@ public interface LoanReturnInboundApplyMapper extends BaseMapper getInboundList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("list") List busVinSid); + + BusSalesOrder selectOrder(String busVinSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml index 3440da845c..7435ccc59d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml @@ -143,8 +143,16 @@ la.alRepaidMoneyConPeriod, la.beOverdueMoneyAndPeriod, la.busVinSid, - la.files + la.files, + la.remarks from loan_return_inbound_apply la where sid = #{sid} + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java index 5442471bcb..f7c3b842a0 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java @@ -6,6 +6,9 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; +import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -76,6 +79,8 @@ public class LoanReturnInboundApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanReturnInboundApplyQuery query = pq.getParams(); @@ -365,7 +370,18 @@ public class LoanReturnInboundApplyService extends MybatisBaseService baseVehmodelVoResultBean = baseVehmodelConfigFeign.selectOne(loanReturnInboundApplyDetailsVo.getModelSid(), loanReturnInboundApplyDetailsVo.getConfigSid(), loanReturnInboundApplyDetailsVo.getUseOrgSid()); + if (baseVehmodelVoResultBean.getSuccess()) { + BaseVehmodelVo baseVehmodelVo = baseVehmodelVoResultBean.getData(); + if (baseVehmodelVo != null) { + loanReturnInboundApplyDetailsVo.setModelConfigSid(baseVehmodelVo.getModelConfigSid()); + BusSalesOrder busSalesOrder = baseMapper.selectOrder(loanReturnInboundApplyDetailsVo.getBusVinSid()); + if (busSalesOrder != null) { + loanReturnInboundApplyDetailsVo.setGuildPrice("2".equals(busSalesOrder.getPayTypeKey()) ? baseVehmodelVo.getManufactorSettlementPrice() : baseVehmodelVo.getGuidedPrice()); + } + } + } } else {//编辑初始化 LoanReturnInboundApply loanReturnInboundApply = fetchBySid(sid); @@ -394,7 +410,20 @@ public class LoanReturnInboundApplyService extends MybatisBaseService baseVehmodelVoResultBean = baseVehmodelConfigFeign.selectOne(loanReturnInboundApplyDetailsVo.getModelSid(), loanReturnInboundApplyDetailsVo.getConfigSid(), loanReturnInboundApplyDetailsVo.getUseOrgSid()); + if (baseVehmodelVoResultBean.getSuccess()) { + BaseVehmodelVo baseVehmodelVo = baseVehmodelVoResultBean.getData(); + if (baseVehmodelVo != null) { + loanReturnInboundApplyDetailsVo.setModelConfigSid(baseVehmodelVo.getModelConfigSid()); + BusSalesOrder busSalesOrder = baseMapper.selectOrder(loanReturnInboundApplyDetailsVo.getBusVinSid()); + if (busSalesOrder != null) { + loanReturnInboundApplyDetailsVo.setGuildPrice("2".equals(busSalesOrder.getPayTypeKey()) ? baseVehmodelVo.getManufactorSettlementPrice() : baseVehmodelVo.getGuidedPrice()); + } + } + } + loanReturnInboundApplyDetailsVo.setSid(sid); + loanReturnInboundApplyDetailsVo.setProcInstId(loanReturnInboundApply.getProcInstId()); + loanReturnInboundApplyDetailsVo.setTaskId(loanReturnInboundApply.getTaskId()); } return rb.success().setData(loanReturnInboundApplyDetailsVo); diff --git a/doc/databases/risk_center.sql b/doc/databases/risk_center.sql index 0289af739b..a7467541a5 100644 --- a/doc/databases/risk_center.sql +++ b/doc/databases/risk_center.sql @@ -1412,15 +1412,15 @@ CREATE TABLE `loan_return_inbound_apply` `modelName` varchar(64) DEFAULT NULL COMMENT '车型', `modelSid` varchar(64) DEFAULT NULL COMMENT '车型sid', `configSid` varchar(64) DEFAULT NULL COMMENT '配置sid', - `configName` varchar(64) DEFAULT NULL COMMENT '配置', + `configName` text DEFAULT NULL COMMENT '配置', `tralier` varchar(64) DEFAULT NULL COMMENT '是否带挂车', `customerName` varchar(64) DEFAULT NULL COMMENT '客户名称', `customerSid` varchar(64) DEFAULT NULL COMMENT '客户sid', `loanSid` varchar(64) DEFAULT NULL COMMENT '贷款人sid', `loanName` varchar(64) DEFAULT NULL COMMENT '贷款人', `loanContractNo` varchar(64) DEFAULT NULL COMMENT '贷款合同编号', - `bankName` int(32) DEFAULT NULL COMMENT '资方', - `bankContractNo` date DEFAULT NULL COMMENT '资方合同编号', + `bankName` varchar(64) DEFAULT NULL COMMENT '资方', + `bankContractNo` varchar(64) DEFAULT NULL COMMENT '资方合同编号', `inboundMoney` int(32) DEFAULT NULL COMMENT '入库价', `locationName` varchar(64) DEFAULT NULL COMMENT '停放地点', `locationSid` varchar(64) DEFAULT NULL COMMENT '停放地点sid', diff --git a/doc/databases/统计报表更新.sql b/doc/databases/统计报表更新.sql index f4b34d3f53..f36b2185fa 100644 --- a/doc/databases/统计报表更新.sql +++ b/doc/databases/统计报表更新.sql @@ -64,38 +64,41 @@ BEGIN -- 更新库存-排产-未定（排产订单中未入库，且未被销售订单锁定） UPDATE daily_report r INNER JOIN ( - select sum(v.scount) as scount, v.useOrgSid, v.modelSid, v.modelConfigSid + select sum(v.scount) as scount, v.useOrgSid, v.modelSid, v.modelConfigSid,v.carBrand from ( - select ifnull(sum(si.num), 0) as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid + select ifnull(si.num, 0) as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid,bbm.carBrand from anrui_base.bus_vehicle_apply bo left join anrui_scm.scm_apply_inbound si on bo.sid = si.vehicleOrderSid left join anrui_base.bus_vehicle_order bbo on bbo.purchaseRequisitionSid = bo.sid + left join anrui_base.base_vehicle_model bbm on bbm.sid = si.modelSid where (si.nodeState != '已办结' and si.nodeState != '终止') and bo.isDelete <> 1 and bo.applyTypeKey = '001' and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo) - group by bo.createOrgSid + group by si.applicationCode,bo.createOrgSid,si.modelSid,si.configSid union all select ifnull(sum(bo.platformNo), 0) as scount, bo.useOrgSid, bd.vehicleSid, - bd.configSid modelConfigSid + bd.configSid modelConfigSid,bbm.carBrand from anrui_base.bus_vehicle_order bo left join anrui_base.bus_vehicle_apply_detail bd on bd.sid = bo.purchaseApplyMediumModelSid + left join anrui_base.base_vehicle_model bbm on bbm.sid = bd.vehicleSid where bo.isDelete <> 1 and LENGTH(offlineDate) = 0 and bo.orderStatus != '已作废' and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo) - group by bo.createOrgSid + group by bo.createOrgSid,bd.vehicleSid,bd.configSid union all - (select ifnull(sum(si.num), 0) as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid + select ifnull(si.num, 0) as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid,bbm.carBrand from anrui_base.bus_vehicle_apply bo left join anrui_scm.scm_apply_inbound si on bo.sid = si.vehicleOrderSid + left join anrui_base.base_vehicle_model bbm on bbm.sid = si.modelSid where (si.nodeState != '已办结' and si.nodeState != '终止') and bo.isDelete <> 1 and bo.applyTypeKey = '004' - group by bo.createOrgSid) + group by si.applicationCode,bo.createOrgSid,si.modelSid,si.configSid ) as v GROUP BY v.`useOrgSid`, v.`modelSid`, @@ -129,7 +132,7 @@ BEGIN ) ab ON ab.linkSid = bo.sid WHERE (si.nodeState != '已办结' AND si.nodeState != '终止') AND bo.isDelete <> 1 - group by bo.createOrgSid + group by si.applicationCode,bo.createOrgSid,si.modelSid,si.configSid ) as v GROUP BY v.`useOrgSid`, v.`modelSid`,