Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 2 years ago
parent
commit
56ceebb08d
  1. 7
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java
  2. 4
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java
  3. 12
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
  4. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamine.java
  5. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDto.java
  6. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java
  7. 11
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java
  8. 8
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml
  9. 7
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
  10. 113
      doc/databases/报表中心.sql

7
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java

@ -5,6 +5,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
/**
@ -27,7 +28,7 @@ public interface DailyReportFeign {
*/
@PostMapping("listPage")
@ResponseBody
ResultBean<PagerVo<DailyReportVo>> listPage(PagerQuery<DailyReportQuery> pagerQuery);
ResultBean<PagerVo<DailyReportVo>> listPage(@RequestBody PagerQuery<DailyReportQuery> pagerQuery);
/**
* 按照生成日期
@ -38,7 +39,7 @@ public interface DailyReportFeign {
*/
@PostMapping("listPage2")
@ResponseBody
ResultBean<PagerVo<DailyReportVo>> listPage2(PagerQuery<DailyReportQuery> pagerQuery);
ResultBean<PagerVo<DailyReportVo>> listPage2(@RequestBody PagerQuery<DailyReportQuery> pagerQuery);
/**
* 按照生成日期查询按照事业部sid品牌sid车型sid配置sid分组
@ -48,5 +49,5 @@ public interface DailyReportFeign {
*/
@PostMapping("listPage3")
@ResponseBody
ResultBean<PagerVo<DailyReportVo>> listPage3(PagerQuery<DailyReportQuery> pagerQuery);
ResultBean<PagerVo<DailyReportVo>> listPage3(@RequestBody PagerQuery<DailyReportQuery> pagerQuery);
}

4
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java

@ -14,9 +14,9 @@ public class DailyReportQuery implements Query {
private static final long serialVersionUID = -3990941897379861702L;
@ApiModelProperty("生成日期开始")
private String createTimeStart;
private String startTime;
@ApiModelProperty("生成日期结束")
private String createTimeEnd;
private String endTime;
private String orgPath;
}

12
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java

@ -30,9 +30,9 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
QueryWrapper<DailyReport> qw = new QueryWrapper<>();
if (query != null) {
//生成日期开始时间
String createTimeStart = query.getCreateTimeStart();
String createTimeStart = query.getStartTime();
//生成日期结束时间
String createTimeEnd = query.getCreateTimeEnd();
String createTimeEnd = query.getEndTime();
qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')"
);
@ -52,9 +52,9 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
QueryWrapper<DailyReport> qw = new QueryWrapper<>();
if (query != null) {
//生成日期开始时间
String createTimeStart = query.getCreateTimeStart();
String createTimeStart = query.getStartTime();
//生成日期结束时间
String createTimeEnd = query.getCreateTimeEnd();
String createTimeEnd = query.getEndTime();
qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')"
);
@ -75,9 +75,9 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
QueryWrapper<DailyReport> qw = new QueryWrapper<>();
if (query != null) {
//生成日期开始时间
String createTimeStart = query.getCreateTimeStart();
String createTimeStart = query.getStartTime();
//生成日期结束时间
String createTimeEnd = query.getCreateTimeEnd();
String createTimeEnd = query.getEndTime();
qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')"
);

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamine.java

@ -54,6 +54,8 @@ public class LoanFileexamine extends BaseEntity {
private String saleOrderSid;
@ApiModelProperty("销售订单消贷合同sid")
private String loanContractSid;
@ApiModelProperty("家访考察sid")
private String homeVisitSid;
@ApiModelProperty("资方状态key")
private String bankStateKey;
@ApiModelProperty("资方状态value")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDto.java

@ -58,6 +58,8 @@ public class LoanFileexamineDto implements Dto {
private String saleOrderSid;
@ApiModelProperty("销售订单消贷合同sid")
private String loanContractSid;
@ApiModelProperty("家访考察sid")
private String homeVisitSid;
@ApiModelProperty("资方状态key")
private String bankStateKey;
@ApiModelProperty("资方状态value")

1
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java

@ -197,6 +197,7 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
LoanFileexamineDto loanFileexamineDto = new LoanFileexamineDto();
loanFileexamineDto.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
loanFileexamineDto.setLoanContractSid(dto.getLoanContractSid());
loanFileexamineDto.setHomeVisitSid(loanCapitalCreditResult.getHomeVisitSid());
loanFileexamineService.saveOrUpdateDto(loanFileexamineDto);
if ("通过".equals(dto.getCapCarefulResult())) {//通过推送融资放款到应收未收
LoanContractPush loanContractPush = new LoanContractPush();

11
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java

@ -269,9 +269,11 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
}
this.updateByDto(dto);
loanHomevisitInvestigateFileService.delByMainSid(dtoSid);
LoanFileexamine loanFileexamine = fetchBySid(dtoSid);
loanHomevisitInvestigateFileService.delByMainSidAndType(loanFileexamine.getHomeVisitSid(),LoanAttachTypeEnum.YHK.getAttachType());
for (String yhkImage : yhkImages) {
LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
loanHomevisitInvestigateFileDto.setMainSid(loanFileexamine.getHomeVisitSid());
loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType());
if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), "");
@ -386,7 +388,7 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
vo.setHgzImages(hgzImages);
vo.setFpImages(fpImages);
//银行卡
List<LoanHomevisitInvestigateFileDetailsVo> yhkVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
List<LoanHomevisitInvestigateFileDetailsVo> yhkVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(entity.getHomeVisitSid(), LoanAttachTypeEnum.YHK.getAttachType());
List<String> yhkImages = new ArrayList<>();
if (yhkVos != null && yhkVos.size() > 0) {
for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : yhkVos) {
@ -448,13 +450,14 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
List<String> gzsfpImages = loanFileDto.getGzsfpImages();
List<String> bxfpImages = loanFileDto.getBxfpImages();
List<String> bdImages = loanFileDto.getBdImages();
loanHomevisitInvestigateFileService.delByMainSidAndType(sid,LoanAttachTypeEnum.YHK.getAttachType());
LoanFileexamine loanFileexamine = fetchBySid(sid);
loanHomevisitInvestigateFileService.delByMainSidAndType(loanFileexamine.getHomeVisitSid(),LoanAttachTypeEnum.YHK.getAttachType());
loanHomevisitInvestigateFileService.delByMainSidAndType(sid,LoanAttachTypeEnum.GZSFP.getAttachType());
loanHomevisitInvestigateFileService.delByMainSidAndType(sid,LoanAttachTypeEnum.BXFP.getAttachType());
loanHomevisitInvestigateFileService.delByMainSidAndType(sid,LoanAttachTypeEnum.BD.getAttachType());
for (String yhkImage : yhkImages) {
LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
loanHomevisitInvestigateFileDto.setMainSid(sid);
loanHomevisitInvestigateFileDto.setMainSid(loanFileexamine.getHomeVisitSid());
loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType());
if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), "");

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

@ -80,11 +80,11 @@
where li.sid = #{sid}
</select>
<select id="setState" resultType="int">
<update id="setState">
update anrui_buscenter.bus_sales_order_borrower set state = 0 where sid = #{saleOrderBorrowerSid}
</select>
</update>
<select id="setState2" resultType="int">
<update id="setState2">
update anrui_buscenter.bus_sales_order_loancontract set state = 0 where borrowerSid = #{saleOrderBorrowerSid}
</select>
</update>
</mapper>

7
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@ -34,6 +34,7 @@ import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontract;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDto;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
@ -202,8 +203,12 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
public ResultBean visit(String sid) {
ResultBean rb = ResultBean.fireFail();
baseMapper.visit(sid);
LoanHomevisitPrep loanHomevisitPrep = fetchBySid(sid);
List<BusSalesOrderLoancontract> busSalesOrderLoancontracts = busSalesOrderLoancontractFeign.fetchAllByOrderSid(loanHomevisitPrep.getSaleOrderSid()).getData();
if (busSalesOrderLoancontracts == null || busSalesOrderLoancontracts.isEmpty()){
return rb.setMsg("未生成消贷合同信息");
}
baseMapper.visit(sid);
//推送家访考察
LoanHomevisitInvestigate loanHomevisitInvestigate = new LoanHomevisitInvestigate();
loanHomevisitInvestigate.setSaleOrderSid(loanHomevisitPrep.getSaleOrderSid());

113
doc/databases/报表中心.sql

@ -0,0 +1,113 @@
-- 更新库存-排产-未定
UPDATE daily_report r
INNER JOIN (
select sum(v.scount) as scount, v.useOrgSid, v.modelSid, v.modelConfigSid
from (
select bo.platformNo as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid
from anrui_base.bus_vehicle_order bo
left join anrui_scm.scm_apply_inbound si on bo.purchaseRequisitionSid = si.vehicleOrderSid
where si.nodeState != '已办结'
and bo.isDelete <> 1
and LENGTH(offlineDate) > 0
and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
union all
select bo.platformNo as scount, bo.useOrgSid, bd.vehicleSid modelSid, bd.configSid modelConfigSid
from anrui_base.bus_vehicle_order bo
left join anrui_base.bus_vehicle_apply_detail bd on bd.sid = bo.purchaseApplyMediumModelSid
where LENGTH(offlineDate) < 1
and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)) as v
GROUP BY v.`useOrgSid`,
v.`modelSid`,
v.`modelConfigSid`
) AS s ON r.useOrgSid = s.useOrgSid
AND r.vehModelSid = s.modelSid
AND r.vehMConfigSid = s.modelConfigSid
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
from (
select bo.platformNo as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid
from anrui_base.bus_vehicle_order bo
left join anrui_scm.scm_apply_inbound si on bo.purchaseRequisitionSid = si.vehicleOrderSid
where si.nodeState != '已办结'
and bo.isDelete <> 1
and LENGTH(offlineDate) > 0
and bo.sid in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
union all
select bo.platformNo as scount, bo.useOrgSid, bd.vehicleSid modelSid, bd.configSid modelConfigSid
from anrui_base.bus_vehicle_order bo
left join anrui_base.bus_vehicle_apply_detail bd on bd.sid = bo.purchaseApplyMediumModelSid
where LENGTH(offlineDate) < 1
and bo.sid in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)) as v
GROUP BY v.`useOrgSid`,
v.`modelSid`,
v.`modelConfigSid`
) AS s ON r.useOrgSid = s.useOrgSid
AND r.vehModelSid = s.modelSid
AND r.vehMConfigSid = s.modelConfigSid
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
from (
select bo.platformNo as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid
from anrui_base.bus_vehicle_order bo
left join anrui_scm.scm_apply_inbound si on bo.purchaseRequisitionSid = si.vehicleOrderSid
where si.nodeState != '已办结'
and bo.isDelete <> 1
and LENGTH(offlineDate) > 0
union all
select bo.platformNo as scount, bo.useOrgSid, bd.vehicleSid modelSid, bd.configSid modelConfigSid
from anrui_base.bus_vehicle_order bo
left join anrui_base.bus_vehicle_apply_detail bd on bd.sid = bo.purchaseApplyMediumModelSid
where LENGTH(offlineDate) < 1) as v
GROUP BY v.`useOrgSid`,
v.`modelSid`,
v.`modelConfigSid`
) AS s ON r.useOrgSid = s.useOrgSid
AND r.vehModelSid = s.modelSid
AND r.vehMConfigSid = s.modelConfigSid
SET r.`pcOrder_unreserve` = s.scount
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
from anrui_buscenter.bus_main_deposit bbm
left join anrui_buscenter.bus_deposit_vehicle bbv on bbv.billSid = bbm.sid
where bbm.createTime like concat('%', CURDATE(), '%')
GROUP BY `useOrgSid`,
`modelSid`,
`modelConfigSid`
) AS s ON r.useOrgSid = s.useOrgSid
AND r.vehModelSid = s.modelSid
AND r.vehMConfigSid = s.modelConfigSid
SET r.`simpleOrder_day` = s.scount
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
from anrui_buscenter.bus_main_deposit bbm
left join anrui_buscenter.bus_deposit_vehicle bbv on bbv.billSid = bbm.sid
where bbm.createTime like concat('%', DATE_FORMAT(CURDATE(), '%Y-%m'), '%')
GROUP BY `useOrgSid`,
`modelSid`,
`modelConfigSid`
) AS s ON r.useOrgSid = s.useOrgSid
AND r.vehModelSid = s.modelSid
AND r.vehMConfigSid = s.modelConfigSid
SET r.`simpleOrder_month` = s.scount
WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
Loading…
Cancel
Save