From da148ad3f110443650caa8b42645bd45c5ff787c Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 12 Jan 2024 16:10:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=BE=E6=9C=9F=E5=AF=B9=E8=B4=A6=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E8=B5=84=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanOverdueBankDetailVo.java | 4 +- .../loanoverduebank/LoanOverdueBankVo.java | 6 +++ .../LoanOverdueBankDetails.java | 3 +- .../LoanOverdueBankDetailsDto.java | 4 +- .../api/loanoverduefin/LoanOverdueFinVo.java | 5 ++ .../loanoverduefin/flowable/CompleteDto.java | 5 ++ .../loanoverduebank/LoanOverdueBankMapper.xml | 26 +++++----- .../LoanOverdueBankService.java | 41 +++++++--------- .../loanoverduefin/LoanOverdueFinMapper.xml | 8 ++-- .../loanoverduefin/LoanOverdueFinService.java | 7 ++- doc/databases/统计报表更新.sql | 47 ++++++++++++------- 11 files changed, 94 insertions(+), 62 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankDetailVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankDetailVo.java index f17652b4cb..be7c53f340 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankDetailVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankDetailVo.java @@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.api.loanoverduebank; import com.fasterxml.jackson.annotation.JsonIgnore; import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetailsDto; +import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery; import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetailsDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -35,7 +36,8 @@ public class LoanOverdueBankDetailVo { @ApiModelProperty("备注") private String remarks; @ApiModelProperty("附件") - private List filesList = new ArrayList<>(); +// private List filesList = new ArrayList<>(); + private List filesList = new ArrayList<>(); private List detailsVoList = new ArrayList<>(); @JsonIgnore diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankVo.java index fe201736a7..beeed0dca7 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankVo.java @@ -34,4 +34,10 @@ public class LoanOverdueBankVo implements Vo { @ApiModelProperty("是否允许点击办理，true允许，false不允许") private boolean allowModify; private String createBySid; + + + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("流程实例id") + private String procInstId; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebankdetails/LoanOverdueBankDetails.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebankdetails/LoanOverdueBankDetails.java index e1e111364d..040fa3e843 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebankdetails/LoanOverdueBankDetails.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebankdetails/LoanOverdueBankDetails.java @@ -1,5 +1,6 @@ package com.yxt.anrui.riskcenter.api.loanoverduebankdetails; +import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,7 +12,7 @@ import java.math.BigDecimal; * @date: 2023/12/26 **/ @Data -public class LoanOverdueBankDetails { +public class LoanOverdueBankDetails extends BaseEntity { private String mainSid; @ApiModelProperty("贷款合同编号") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebankdetails/LoanOverdueBankDetailsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebankdetails/LoanOverdueBankDetailsDto.java index f55a965382..3afdb24db4 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebankdetails/LoanOverdueBankDetailsDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebankdetails/LoanOverdueBankDetailsDto.java @@ -31,8 +31,8 @@ public class LoanOverdueBankDetailsDto { @ApiModelProperty("资方") private String bankName; - @ApiModelProperty("资方sid") - private String bankSid; + /*@ApiModelProperty("资方sid") + private String bankSid;*/ @ApiModelProperty("期数") private String period; @ApiModelProperty("平台逾期月还") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinVo.java index 428e3637f2..20f7989a96 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinVo.java @@ -34,4 +34,9 @@ public class LoanOverdueFinVo implements Vo { @ApiModelProperty("是否允许点击办理，true允许，false不允许") private boolean allowModify; private String createBySid; + + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("流程实例id") + private String procInstId; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/flowable/CompleteDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/flowable/CompleteDto.java index cf7a4d5452..6a9194cd24 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/flowable/CompleteDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/flowable/CompleteDto.java @@ -1,10 +1,13 @@ package com.yxt.anrui.riskcenter.api.loanoverduefin.flowable; +import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetailsDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.ArrayList; +import java.util.List; /** * @description: @@ -34,4 +37,6 @@ public class CompleteDto implements Dto { @ApiModelProperty(value = "业务sid") @NotBlank(message = "参数错误：businessSid") private String businessSid; + + } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml index 11fa9fe87e..09d9d03a90 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml @@ -6,11 +6,12 @@ lob.files, lob.remarks, lob.createByName, - lob.createBySid userSid, + lob.createBySid userSid, lob.createDept, lob.createDeptSid, - lob.orgSidPath orgPath, - lob.stopDate + lob.orgSidPath orgPath, + lob.stopDate, + DATE_FORMAT(lob.createTime, '%Y-%m-%d') as createDate from loan_overdue_bank lob where sid = #{sid} @@ -42,16 +43,17 @@ select lof.sid, - if(length(lof.nodeState)>0,lof.nodeState,'待提交') as nodeState, + if(length(lof.nodeState) > 0, lof.nodeState, '待提交') as nodeState, lof.useOrgName, lof.createDept, lof.createByName, - DATE_FORMAT(lof.createTime, '%Y-%m-%d') as createTime, + DATE_FORMAT(lof.createTime, '%Y-%m-%d') as createTime, lof.closeDate, lof.stopDate, lof.remarks, - lof.createBySid + lof.createBySid, + lof.procInstId, + lof.procDefId from loan_overdue_fin lof ${ew.sqlSegment} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java index c4f48cdf9e..5e7ef75933 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo; +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; @@ -394,7 +395,9 @@ public class LoanOverdueFinService extends MybatisBaseService '0002' @@ -13,7 +13,8 @@ BEGIN r.useOrgSid = s.useOrgSid AND r.vehModelSid = s.modelSid AND r.vehMConfigSid = s.modelConfigSid SET r.`stock_unreserve`=s.scount WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); - -- 更新库存-已定 + + -- 更新库存-已定（库存状态不是出库0002且不是内销0007且不是退库0004的，非删除，锁定状态为销售订单锁定02） UPDATE daily_report r INNER JOIN (SELECT COUNT(id) AS scount, `useOrgSid`, `modelSid`, `modelConfigSid` FROM anrui_base.`base_vehicle` WHERE vehicleState <> '0002' @@ -29,7 +30,8 @@ BEGIN UPDATE daily_report SET stock_subtotal=stock_unreserve + stock_reserve WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); - -- 更新库存-买断-未定 + + -- 更新库存-买断-未定（库存状态不是出库0002且不是内销0007且不是退库0004的，非删除，非销售订单锁定、已买断） UPDATE daily_report r INNER JOIN (SELECT COUNT(id) AS scount, `useOrgSid`, `modelSid`, `modelConfigSid` FROM anrui_base.`base_vehicle` WHERE vehicleState <> '0002' @@ -42,7 +44,7 @@ BEGIN r.useOrgSid = s.useOrgSid AND r.vehModelSid = s.modelSid AND r.vehMConfigSid = s.modelConfigSid SET r.`stock_buyout_unreserve`=s.scount WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); - -- 更新库存-买断-已定 + -- 更新库存-买断-已定（库存状态不是出库0002且不是内销0007且不是退库0004的，非删除，销售订单锁定，已买断） UPDATE daily_report r INNER JOIN (SELECT COUNT(id) AS scount, `useOrgSid`, `modelSid`, `modelConfigSid` FROM anrui_base.`base_vehicle` WHERE vehicleState <> '0002' @@ -59,7 +61,7 @@ BEGIN UPDATE daily_report SET `stock_buyout_subtotal`=`stock_buyout_unreserve` + `stock_buyout_reserve` WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); --- 更新库存-排产-未定 +-- 更新库存-排产-未定（排产订单中未入库，且未被销售订单锁定） UPDATE daily_report r INNER JOIN ( select sum(v.scount) as scount, v.useOrgSid, v.modelSid, v.modelConfigSid @@ -67,8 +69,10 @@ BEGIN select ifnull(sum(si.num), 0) as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid 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 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 union all @@ -84,6 +88,14 @@ BEGIN and bo.orderStatus != '已作废' and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo) group by bo.createOrgSid + union all + (select ifnull(sum(si.num), 0) as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid + from anrui_base.bus_vehicle_apply bo + left join anrui_scm.scm_apply_inbound si on bo.sid = si.vehicleOrderSid + where (si.nodeState != '已办结' and si.nodeState != '终止') + and bo.isDelete <> 1 + and bo.applyTypeKey = '004' + group by bo.createOrgSid) ) as v GROUP BY v.`useOrgSid`, v.`modelSid`, @@ -94,8 +106,7 @@ BEGIN SET r.`pcOrder_unreserve` = s.scount WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); --- 更新库存-排产已定 - +-- 更新库存-排产已定（未入库且被销售订单锁定的台数） UPDATE daily_report r INNER JOIN ( select sum(v.scount) as scount, v.useOrgSid, v.modelSid, v.modelConfigSid @@ -135,7 +146,7 @@ BEGIN SET pcOrder_subtotal=pcOrder_reserve + pcOrder_unreserve WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); --- 简易订单-每日 +-- 简易订单-每日（简易订单今日已办结的） UPDATE daily_report r INNER JOIN (select count(bbv.id) as scount, bbv.modelSid, bbv.modelConfigSid, bbm.orgSid useOrgSid @@ -153,7 +164,7 @@ BEGIN WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); --- 简易订单-每月 +-- 简易订单-每月（简易订单本月已办结的） UPDATE daily_report r INNER JOIN (select count(bbv.id) as scount, bbv.modelSid, bbv.modelConfigSid, bbm.orgSid useOrgSid @@ -244,7 +255,7 @@ BEGIN SET saleOrder_subtotal_month=saleOrder_loan_month + saleOrder_full_month WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); --- 销售订单-待交车累计 +-- 销售订单-待交车累计（销售订单已办结且库存状态为库存和在途的） UPDATE daily_report r INNER JOIN (select count(bv.id) as scount, bv.useOrgSid, bv.modelSid, bv.modelConfigSid, bo.contractNo from anrui_base.base_vehicle bv @@ -259,7 +270,7 @@ BEGIN SET r.`saleOrder_waitVeh_total` = s.scount WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); --- 本日销售全款 +-- 本日销售全款（销售日期为本日、全款、主车（包含value为空的）） UPDATE daily_report r INNER JOIN (select sum(ss.scount) as scount, ss.modelSid, ss.modelConfigSid, ss.useOrgSid from (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid @@ -277,7 +288,7 @@ BEGIN AND r.vehMConfigSid = s.modelConfigSid SET r.`sale_full_day` = s.scount WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); --- 本日销售贷款 +-- 本日销售贷款（贷款、销售日期为本日、主车（包含value为空的）） UPDATE daily_report r INNER JOIN (select sum(ss.scount) as scount, ss.modelSid, ss.modelConfigSid, ss.useOrgSid from (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid @@ -302,7 +313,7 @@ BEGIN WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); --- 本月销售全款 +-- 本月销售全款（全款、销售日期本月、主车（包含value为空的）） UPDATE daily_report r INNER JOIN (select sum(ss.scount) as scount, ss.modelSid, ss.modelConfigSid, ss.useOrgSid from (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid @@ -320,7 +331,7 @@ BEGIN AND r.vehMConfigSid = s.modelConfigSid SET r.`sale_full_month` = s.scount WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); --- 本月销售贷款 +-- 本月销售贷款（贷款、销售日期为本月、主车（包含value为空的）） UPDATE daily_report r INNER JOIN (select sum(ss.scount) as scount, ss.modelSid, ss.modelConfigSid, ss.useOrgSid from (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid @@ -345,7 +356,7 @@ BEGIN WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); --- 本年销售全款 +-- 本年销售全款（全款、销售日期为本年、主车（包含value为空的）） UPDATE daily_report r INNER JOIN (select sum(ss.scount) as scount, ss.modelSid, ss.modelConfigSid, ss.useOrgSid from (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid @@ -363,7 +374,7 @@ BEGIN AND r.vehMConfigSid = s.modelConfigSid SET r.`sale_full_year` = s.scount WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); --- 本年销售贷款 +-- 本年销售贷款（贷款、销售日期本年、主车（value为空的））） UPDATE daily_report r INNER JOIN (select sum(ss.scount) as scount, ss.modelSid, ss.modelConfigSid, ss.useOrgSid from (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid @@ -618,7 +629,7 @@ BEGIN set stock_total = (stock_subtotal + pcOrder_subtotal) where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); --- 欠款出库数量--截止当日欠款出库申请通过且未回清款的台数 +-- 欠款出库数量--截止当日欠款出库申请通过且未回清款的台数（欠款出库申请通过，且未认完款的台数总和加上欠款提车申请通过，且全款已出库未认完款的台数总和） update daily_report r inner join (SELECT SUM(cc.scount) AS scount, cc.useOrgSid, cc.vehMConfigSid, @@ -744,7 +755,7 @@ BEGIN where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); --- 欠款出库金融--截止当日欠款出库申请通过且未回清款的台数欠款总额 +-- 欠款出库金融--截止当日欠款出库申请通过且未回清款的台数欠款总额（欠款出库申请通过，且未认完款的剩余认款总和加上欠款提车申请通过，且全款已出库未认完款的剩余认款总和） update daily_report r inner join (SELECT sum(cc.scount) AS scount, cc.useOrgSid, cc.vehMConfigSid,