From 6e580ee570df20392b5d187cab4a8e8b6882cb0f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 24 Oct 2024 15:13:53 +0800 Subject: [PATCH 1/2] 1 --- .../ScmCollectionRebateDistribution.java | 20 +-- ...CollectionRebateDistributionDetailsVo.java | 49 +++--- .../ScmCollectionRebateDistributionDto.java | 49 +++--- .../ScmCollectionRebateDistributionFile.java | 41 +++++ .../ScmCollectionRebateDistributionQuery.java | 26 +-- .../ScmCollectionRebateDistributionVo.java | 45 ++--- .../ScmCollectionRebateDistributionVeh.java | 72 ++++++++ ...lectionRebateDistributionVehDetailsVo.java | 73 ++++++++ ...ScmCollectionRebateDistributionVehDto.java | 73 ++++++++ ...mCollectionRebateDistributionVehQuery.java | 71 ++++++++ .../ScmCollectionRebateDistributionVehVo.java | 73 ++++++++ ...ScmCollectionRebateDistributionMapper.java | 8 - .../ScmCollectionRebateDistributionMapper.xml | 32 +++- .../ScmCollectionRebateDistributionRest.java | 4 +- ...cmCollectionRebateDistributionService.java | 156 ++++++++++++------ ...CollectionRebateDistributionVehMapper.java | 63 +++++++ ...mCollectionRebateDistributionVehMapper.xml | 6 + ...cmCollectionRebateDistributionVehRest.java | 49 ++++++ ...ollectionRebateDistributionVehService.java | 67 ++++++++ .../anrui/scm/biz/scmfile/ScmFileMapper.java | 10 -- .../anrui/scm/biz/scmfile/ScmFileMapper.xml | 10 -- .../anrui/scm/biz/scmfile/ScmFileRest.java | 50 +----- .../anrui/scm/biz/scmfile/ScmFileService.java | 25 --- 23 files changed, 829 insertions(+), 243 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFile.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVeh.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDetailsVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDto.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehQuery.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehVo.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.xml create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehRest.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehService.java diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistribution.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistribution.java index a702f3b183..edb1e21342 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistribution.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistribution.java @@ -26,11 +26,14 @@ package com.yxt.anrui.scm.api.scmcollectionrebatedistribution; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui-scm(回款返利分配)
* File: ScmCollectionRebateDistribution.java
@@ -50,24 +53,20 @@ import lombok.Data; public class ScmCollectionRebateDistribution extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @ApiModelProperty("预提申请") - private String withholdingApply; // 预提申请 - @ApiModelProperty("回款金额") - private String collectionMoney; // 回款金额 - @ApiModelProperty("预提返利") - private String estimateRebate; // 预提返利 @ApiModelProperty("分摊参考比例") private String shareGinExaProportion; // 分摊参考比例 @ApiModelProperty("分摊比例") private String shareProportion; // 分摊比例 @ApiModelProperty("分摊返利总额") private String shareRebateTotal; // 分摊返利总额 - @ApiModelProperty("本次返利余额") - private String thisRebateBalance; // 本次返利余额 @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("使用组织名称") @@ -78,6 +77,7 @@ public class ScmCollectionRebateDistribution extends BaseEntity { private String createOrgName; // 创建组织名称 @ApiModelProperty("分配状态") private String distributionState; // 分配状态 - @ApiModelProperty("回款返利sid") - private String collRebateSid; // 回款返利sid + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("提交日期") + private Date subitDate; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDetailsVo.java index aa0c956e47..c612204540 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDetailsVo.java @@ -26,6 +26,8 @@ package com.yxt.anrui.scm.api.scmcollectionrebatedistribution; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo; import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo; import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto; import com.yxt.common.core.vo.Vo; @@ -34,6 +36,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -55,36 +59,39 @@ public class ScmCollectionRebateDistributionDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("品牌sid") + @ApiModelProperty("创建人sid") + private String createBySid; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @ApiModelProperty("预提申请") - private String withholdingApply; // 预提申请 - @ApiModelProperty("回款金额") - private String collectionMoney; // 回款金额 - @ApiModelProperty("预提返利") - private String estimateRebate; // 预提返利 - @ApiModelProperty("分摊参考比例") + @ApiModelProperty("分摊参考比例") private String shareGinExaProportion; // 分摊参考比例 - @ApiModelProperty("分摊比例") + @ApiModelProperty("分摊比例") private String shareProportion; // 分摊比例 - @ApiModelProperty("分摊返利总额") + @ApiModelProperty("分摊返利总额") private String shareRebateTotal; // 分摊返利总额 - @ApiModelProperty("本次返利余额") - private String thisRebateBalance; // 本次返利余额 - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("分配状态") + @ApiModelProperty("分配状态") private String distributionState; // 分配状态 - @ApiModelProperty("回款返利sid") - private String collRebateSid; // 回款返利sid + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("提交日期") + private Date subitDate; + @ApiModelProperty("附件") + private List urls = new ArrayList<>(); @ApiModelProperty("回款返利车辆列表") - private List scmCollectionRebateVehs; // 回款返利车辆列表 + private List scmCollectionRebateVehs; // 回款返利车辆列表 } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDto.java index ea3073ca47..831a255aa1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDto.java @@ -26,6 +26,8 @@ package com.yxt.anrui.scm.api.scmcollectionrebatedistribution; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto; import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto; import com.yxt.common.core.dto.Dto; @@ -33,6 +35,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -54,36 +58,39 @@ public class ScmCollectionRebateDistributionDto implements Dto { private String sid; // sid - @ApiModelProperty("品牌sid") + @ApiModelProperty("创建人sid") + private String createBySid; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @ApiModelProperty("预提申请") - private String withholdingApply; // 预提申请 - @ApiModelProperty("回款金额") - private String collectionMoney; // 回款金额 - @ApiModelProperty("预提返利") - private String estimateRebate; // 预提返利 - @ApiModelProperty("分摊参考比例") + @ApiModelProperty("分摊参考比例") private String shareGinExaProportion; // 分摊参考比例 - @ApiModelProperty("分摊比例") + @ApiModelProperty("分摊比例") private String shareProportion; // 分摊比例 - @ApiModelProperty("分摊返利总额") + @ApiModelProperty("分摊返利总额") private String shareRebateTotal; // 分摊返利总额 - @ApiModelProperty("本次返利余额") - private String thisRebateBalance; // 本次返利余额 - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("分配状态") + @ApiModelProperty("分配状态") private String distributionState; // 分配状态 - @ApiModelProperty("回款返利sid") - private String collRebateSid; // 回款返利sid + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("提交日期") + private Date subitDate; + @ApiModelProperty("附件") + private List urls = new ArrayList<>(); @ApiModelProperty("回款返利车辆列表") - private List scmCollectionRebateVehs; // 回款返利车辆列表 + private List scmCollectionRebateVehs; // 回款返利车辆列表 } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFile.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFile.java new file mode 100644 index 0000000000..d4e5fe2c26 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFile.java @@ -0,0 +1,41 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistribution; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(value = "回款返利分配表 视图数据对象", description = "回款返利分配表 视图数据对象") +public class ScmCollectionRebateDistributionFile implements Vo { + + private String url; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java index c29f65be72..a2d04e4c57 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java @@ -49,14 +49,20 @@ import lombok.Data; @ApiModel(value = "回款返利分配表 查询条件", description = "回款返利分配表 查询条件") public class ScmCollectionRebateDistributionQuery implements Query { - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("预提标题") - private String withholdingApply; // 预提标题 - @ApiModelProperty("创建开始日期") - private String createStartTime; // 创建开始日期 - @ApiModelProperty("创建结束日期") - private String createEndTime; // 创建结束日期 - @ApiModelProperty("创建分公司sid") - private String createOrgSid; + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + @ApiModelProperty("品牌名称") + private String brandName; + @ApiModelProperty("状态") + private String state; + @ApiModelProperty("提交日期") + private String subitDateStart; + private String subitDateEnd; + + private String userSid; + private String orgPath; + private String menuUrl; + private String menuSid; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionVo.java index 8af722d86a..309e6a0456 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionVo.java @@ -26,12 +26,15 @@ package com.yxt.anrui.scm.api.scmcollectionrebatedistribution; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui-scm(回款返利分配)
* File: ScmCollectionRebateDistributionVo.java
@@ -51,35 +54,23 @@ public class ScmCollectionRebateDistributionVo implements Vo { private String sid; // sid - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") + @ApiModelProperty("状态") + private String state; + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @ApiModelProperty("预提申请") - private String withholdingApply; // 预提申请 - @ApiModelProperty("回款金额") - private String collectionMoney; // 回款金额 - @ApiModelProperty("预提返利") - private String estimateRebate; // 预提返利 - @ApiModelProperty("分摊参考比例") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("提交日期") + private Date subitDate; + @ApiModelProperty("分摊参考比例") private String shareGinExaProportion; // 分摊参考比例 - @ApiModelProperty("分摊比例") + @ApiModelProperty("分摊比例") private String shareProportion; // 分摊比例 - @ApiModelProperty("分摊返利总额") + @ApiModelProperty("分摊返利总额") private String shareRebateTotal; // 分摊返利总额 - @ApiModelProperty("本次返利余额") - private String thisRebateBalance; // 本次返利余额 - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") - private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("分配状态") - private String distributionState; // 分配状态 - @ApiModelProperty("回款返利sid") - private String collRebateSid; // 回款返利sid - + @ApiModelProperty("车辆台数") + private Integer num; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVeh.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVeh.java new file mode 100644 index 0000000000..cfbc6abcd7 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVeh.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利分配车辆)
+ * File: ScmCollectionRebateDistributionVeh.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVeh
+ * Description: 回款返利分配车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-24 13:58:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利分配车辆表", description = "回款返利分配车辆表") +@TableName("scm_collection_rebate_distribution_veh") +public class ScmCollectionRebateDistributionVeh extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("车型sid") + private String carModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String carModelName; // 车型名称 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("入库日期") + private String priceDate; // 入库日期 + @ApiModelProperty("销售日期") + private String salesDate; // 销售日期 + @ApiModelProperty("买断日期") + private String solidDate; // 买断日期 + @ApiModelProperty("回款返利分配sid") + private String mainSid; // 回款返利分配sid + @ApiModelProperty("分配的回款返利") + private String distributionCollectionRebate; // 分配的回款返利 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDetailsVo.java new file mode 100644 index 0000000000..74052d34a0 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDetailsVo.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利分配车辆)
+ * File: ScmCollectionRebateDistributionVehVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo
+ * Description: 回款返利分配车辆表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-24 13:58:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利分配车辆表 视图数据详情", description = "回款返利分配车辆表 视图数据详情") +public class ScmCollectionRebateDistributionVehDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("车型sid") + private String carModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String carModelName; // 车型名称 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("入库日期") + private String priceDate; // 入库日期 + @ApiModelProperty("销售日期") + private String salesDate; // 销售日期 + @ApiModelProperty("买断日期") + private String solidDate; // 买断日期 + @ApiModelProperty("回款返利分配sid") + private String mainSid; // 回款返利分配sid + @ApiModelProperty("分配的回款返利") + private String distributionCollectionRebate; // 分配的回款返利 + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDto.java new file mode 100644 index 0000000000..0a9cd87f84 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDto.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利分配车辆)
+ * File: ScmCollectionRebateDistributionVehDto.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto
+ * Description: 回款返利分配车辆表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-24 13:58:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利分配车辆表 数据传输对象", description = "回款返利分配车辆表 数据传输对象") +public class ScmCollectionRebateDistributionVehDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("车型sid") + private String carModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String carModelName; // 车型名称 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("入库日期") + private String priceDate; // 入库日期 + @ApiModelProperty("销售日期") + private String salesDate; // 销售日期 + @ApiModelProperty("买断日期") + private String solidDate; // 买断日期 + @ApiModelProperty("回款返利分配sid") + private String mainSid; // 回款返利分配sid + @ApiModelProperty("分配的回款返利") + private String distributionCollectionRebate; // 分配的回款返利 + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehQuery.java new file mode 100644 index 0000000000..ec163f5fb3 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehQuery.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利分配车辆)
+ * File: ScmCollectionRebateDistributionVehQuery.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehQuery
+ * Description: 回款返利分配车辆表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-24 13:58:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利分配车辆表 查询条件", description = "回款返利分配车辆表 查询条件") +public class ScmCollectionRebateDistributionVehQuery implements Query { + + @ApiModelProperty("车型sid") + private String carModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String carModelName; // 车型名称 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("入库日期") + private String priceDate; // 入库日期 + @ApiModelProperty("销售日期") + private String salesDate; // 销售日期 + @ApiModelProperty("买断日期") + private String solidDate; // 买断日期 + @ApiModelProperty("回款返利分配sid") + private String mainSid; // 回款返利分配sid + @ApiModelProperty("分配的回款返利") + private String distributionCollectionRebate; // 分配的回款返利 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehVo.java new file mode 100644 index 0000000000..1dcf49c821 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehVo.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利分配车辆)
+ * File: ScmCollectionRebateDistributionVehVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo
+ * Description: 回款返利分配车辆表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-24 13:58:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利分配车辆表 视图数据对象", description = "回款返利分配车辆表 视图数据对象") +public class ScmCollectionRebateDistributionVehVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("车型sid") + private String carModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String carModelName; // 车型名称 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("入库日期") + private String priceDate; // 入库日期 + @ApiModelProperty("销售日期") + private String salesDate; // 销售日期 + @ApiModelProperty("买断日期") + private String solidDate; // 买断日期 + @ApiModelProperty("回款返利分配sid") + private String mainSid; // 回款返利分配sid + @ApiModelProperty("分配的回款返利") + private String distributionCollectionRebate; // 分配的回款返利 + +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.java index b5f7769715..d3fd4d46bf 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.java @@ -54,16 +54,8 @@ import java.util.List; @Mapper public interface ScmCollectionRebateDistributionMapper extends BaseMapper { - //@Update("update scm_collection_rebate_distribution set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from scm_collection_rebate_distribution") - List selectListVo(); - @Select("select * from scm_collection_rebate_distribution where collRebateSid = #{sid}") ScmCollectionRebateDistributionDetailsVo fetchByCollRebate(String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.xml index a5ba8f7664..d5052b7f98 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.xml @@ -4,10 +4,32 @@ - - \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionRest.java index 051a188875..25bc7edbce 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionRest.java @@ -55,7 +55,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebate * @since 1.0 */ @Api(tags = "回款返利分配表") -@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatedistribution.ScmCollectionRebateDistributionRest") +@RestController @RequestMapping("v1/scmcollectionrebatedistribution") public class ScmCollectionRebateDistributionRest implements ScmCollectionRebateDistributionFeign { @@ -91,6 +91,6 @@ public class ScmCollectionRebateDistributionRest implements ScmCollectionRebateD @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - return scmCollectionRebateDistributionService.fetchAllDetailsVoBySid(sid); + return scmCollectionRebateDistributionService.fetchDetailsVoBySid(sid); } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java index 0a2254f0f0..353e70696f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java @@ -28,24 +28,32 @@ package com.yxt.anrui.scm.biz.scmcollectionrebatedistribution; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.common.enums.DictCommonEnum; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.*; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto; import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo; import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo; +import com.yxt.anrui.scm.api.scmfile.ScmFile; +import com.yxt.anrui.scm.api.scmfile.ScmFileVo; +import com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehService; import com.yxt.anrui.scm.biz.scmcollectionrebateveh.ScmCollectionRebateVehService; +import com.yxt.anrui.scm.biz.scmfile.ScmFileService; +import com.yxt.common.base.config.component.FileUploadComponent; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistribution; -import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionQuery; -import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionVo; -import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionDetailsVo; -import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -65,30 +73,71 @@ import java.util.List; public class ScmCollectionRebateDistributionService extends MybatisBaseService { @Autowired - private ScmCollectionRebateVehService scmCollectionRebateVehService; - - private QueryWrapper createQueryWrapper(ScmCollectionRebateDistributionQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } + private ScmCollectionRebateDistributionVehService scmCollectionRebateDistributionVehService; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private ScmFileService scmFileService; + @Autowired + FileUploadComponent fileUploadComponent; public PagerVo listPageVo(PagerQuery pq) { ScmCollectionRebateDistributionQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("createOrgSid",query.getCreateOrgSid()); - if (StringUtils.isNotBlank(query.getBrandSid())){ - qw.eq("brandSid",query.getBrandSid()); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("u.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("u.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("u.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("u.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("sd.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } } - String createStartTime = query.getCreateStartTime(); - String createEndTime = query.getCreateEndTime(); - qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" - ); - if (StringUtils.isNotBlank(query.getWithholdingApply())){ - qw.like("withholdingApply",query.getWithholdingApply()); + if (StringUtils.isNotBlank(query.getCreateOrgName())){ + qw.like("sd.createOrgName",query.getCreateOrgName()); + } + if (StringUtils.isNotBlank(query.getPurchaseSystemName())){ + qw.like("sd.purchaseSystemName",query.getPurchaseSystemName()); + } + if (StringUtils.isNotBlank(query.getBrandName())){ + qw.like("sd.brandName",query.getBrandName()); } + String subitDateStart = query.getSubitDateStart(); + String subitDateEnd = query.getSubitDateEnd(); + qw.apply(StringUtils.isNotBlank(subitDateStart), "date_format (sd.subitDate,'%Y-%m-%d') >= date_format('" + subitDateStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(subitDateEnd), "date_format (sd.subitDate,'%Y-%m-%d') <= date_format('" + subitDateEnd + "','%Y-%m-%d')" + ); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -98,15 +147,23 @@ public class ScmCollectionRebateDistributionService extends MybatisBaseService scmCollectionRebateVehs = dto.getScmCollectionRebateVehs(); + List urls = dto.getUrls(); + List scmCollectionRebateVehs = dto.getScmCollectionRebateVehs(); if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); + String sid = this.insertByDto(dto); if (!scmCollectionRebateVehs.isEmpty()){ - for (ScmCollectionRebateVehDto scmCollectionRebateVehDto : scmCollectionRebateVehs) { - scmCollectionRebateVehDto.setMainSid(dto.getCollRebateSid()); - scmCollectionRebateVehService.insertByDto(scmCollectionRebateVehDto); + for (ScmCollectionRebateDistributionVehDto scmCollectionRebateVehDto : scmCollectionRebateVehs) { + scmCollectionRebateVehDto.setMainSid(sid); + scmCollectionRebateDistributionVehService.insertByDto(scmCollectionRebateVehDto); } } + for (ScmCollectionRebateDistributionFile url : urls) { + String filePath = url.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); + ScmFile scmFile = new ScmFile(); + scmFile.setFilePath(filePath); + scmFile.setLinkSid(sid); + scmFileService.save(scmFile); + } return rb.success().setMsg("添加成功"); } ScmCollectionRebateDistribution scmCollectionRebateDistribution = fetchBySid(dtoSid); @@ -114,13 +171,21 @@ public class ScmCollectionRebateDistributionService extends MybatisBaseService fetchDetailsVoBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); ScmCollectionRebateDistribution entity = fetchBySid(sid); ScmCollectionRebateDistributionDetailsVo vo = new ScmCollectionRebateDistributionDetailsVo(); BeanUtil.copyProperties(entity, vo); - return vo; - } - - public ResultBean fetchAllDetailsVoBySid(String sid) { - ResultBean rb = ResultBean.fireFail(); - ScmCollectionRebateDistributionDetailsVo scmCollectionRebateDistributionDetailsVo = fetchDetailsVoBySid(sid); - List scmCollectionRebateVehDetailsVos = scmCollectionRebateVehService.fetchByMainSid(sid); - scmCollectionRebateDistributionDetailsVo.setScmCollectionRebateVehs(scmCollectionRebateVehDetailsVos); - return rb.success().setData(scmCollectionRebateDistributionDetailsVo); - } - - public ScmCollectionRebateDistributionDetailsVo fetchByCollRebate(String sid) { - return baseMapper.fetchByCollRebate(sid); + List scmCollectionRebateDistributionVehDetailsVos = scmCollectionRebateDistributionVehService.selByMainSid(sid); + vo.setScmCollectionRebateVehs(scmCollectionRebateDistributionVehDetailsVos); + List scmFileVos = scmFileService.fetchByMainSid(sid); + List urls = new ArrayList<>(); + for (ScmFileVo scmFileVo : scmFileVos) { + ScmCollectionRebateDistributionFile scmCollectionRebateDistributionFile = new ScmCollectionRebateDistributionFile(); + scmCollectionRebateDistributionFile.setUrl(fileUploadComponent.getUrlPrefix() + scmFileVo.getFilePath()); + urls.add(scmCollectionRebateDistributionFile); + } + vo.setUrls(urls); + return rb.success().setData(vo); } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.java new file mode 100644 index 0000000000..7f39765204 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVeh; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利分配车辆)
+ * File: ScmCollectionRebateDistributionVehMapper.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehMapper
+ * Description: 回款返利分配车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-24 13:58:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmCollectionRebateDistributionVehMapper extends BaseMapper { + + @Delete("delete from scm_collection_rebate_distribution_veh where mainSid = #{dtoSid}") + void delByMainSid(String dtoSid); + + @Select("select * from scm_collection_rebate_distribution_veh where mainSid = #{mainSid}") + List selByMainSid(String mainSid); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.xml new file mode 100644 index 0000000000..2abf470628 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehRest.java new file mode 100644 index 0000000000..a70e23e381 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehRest.java @@ -0,0 +1,49 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.*; + +/** + * Project: anrui-scm(回款返利分配车辆)
+ * File: ScmCollectionRebateDistributionVehFeignFallback.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehRest
+ * Description: 回款返利分配车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-24 13:58:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利分配车辆表") +@RestController +@RequestMapping("v1/scmcollectionrebatedistributionveh") +public class ScmCollectionRebateDistributionVehRest{ + +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehService.java new file mode 100644 index 0000000000..76619a360b --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehService.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVeh; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利分配车辆)
+ * File: ScmCollectionRebateDistributionVehService.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehService
+ * Description: 回款返利分配车辆表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-24 13:58:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmCollectionRebateDistributionVehService extends MybatisBaseService { + + public void insertByDto(ScmCollectionRebateDistributionVehDto dto){ + ScmCollectionRebateDistributionVeh entity = new ScmCollectionRebateDistributionVeh(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } + + public List selByMainSid(String mainSid) { + return baseMapper.selByMainSid(mainSid); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java index a314a17f1e..d818803214 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java @@ -55,16 +55,6 @@ import java.util.List; @Mapper public interface ScmFileMapper extends BaseMapper { - //@Update("update scm_file set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from scm_file") - List selectListVo(); - @Select("select * from scm_file where linkSid = #{sid} and attachType = #{type}") List selectByLinkSid(@Param("sid") String sid, @Param("type") String type); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.xml index 63dc379d72..32651993bd 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.xml @@ -3,14 +3,4 @@ - - - - \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileRest.java index 7d0b871651..9a0fcd35d4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileRest.java @@ -51,54 +51,8 @@ import java.util.List; * @since 1.0 */ @Api(tags = "供应链附件表") -@RestController("scm.biz.scmfile.ScmFileRest") +@RestController @RequestMapping("v1/scmfile") -public class ScmFileRest implements ScmFileFeign { +public class ScmFileRest { - @Autowired - private ScmFileService scmFileService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = scmFileService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody ScmFileDto dto) { - ResultBean rb = ResultBean.fireFail(); - scmFileService.saveOrUpdateDto(dto); - return rb.success(); - } - - @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids) { - ResultBean rb = ResultBean.fireFail(); - scmFileService.delBySids(sids); - return rb.success(); - } - - @Override - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { - ResultBean rb = ResultBean.fireFail(); - ScmFileDetailsVo vo = scmFileService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - - @Override - @ApiOperation("根据linkSid和文件类型查询图片") - public ResultBean> selectByLinkSid(String sid, String type) { - ResultBean rb = ResultBean.fireFail(); - List list = scmFileService.getByLinkSidAndType(sid, type); - return rb.success().setData(list); - } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java index cad2e1c2f5..c14359a7cf 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java @@ -64,31 +64,6 @@ public class ScmFileService extends MybatisBaseService { @Autowired FileUploadComponent fileUploadComponent; - private QueryWrapper createQueryWrapper(ScmFileQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - ScmFileQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(ScmFileDto dto) { - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - public void insertByDto(ScmFileDto dto) { ScmFile entity = new ScmFile(); BeanUtil.copyProperties(dto, entity, "id", "sid"); From 03e2e1ab34f15301668d6b7b022da7f9882a9388 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 24 Oct 2024 15:33:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BA=94=E6=94=B6=E6=9C=AA=E6=94=B6=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...inUncollectedReceivablesDetailedMapper.xml | 104 ++++++++++-------- 1 file changed, 61 insertions(+), 43 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 019e1d2643..f465e5d4d5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -51,8 +51,8 @@ furd.customerName AS `customerName`, furd.customerSid, furd.useOrgSid, - COALESCE(SUM(df.dbalance), 0) AS realMoney, - cast((furd.`reveivableMoney` - COALESCE(SUM(df.dbalance), 0)) AS DECIMAL(10, 2)) AS currentReceivableMoney, + COALESCE (df.dbalance, 0 ) AS realMoney, + CAST((furd.`reveivableMoney` - COALESCE ( df.dbalance, 0 )) AS DECIMAL ( 10, 2 )) AS currentReceivableMoney, furd.reveivableMoney, furd.contractSid, if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) < 1, @@ -66,21 +66,27 @@ FROM fin_uncollected_receivables_detailed furd left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid LEFT JOIN ( - SELECT d.sid, - d.`receivablesSid`, - ( - d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS dbalance - FROM fin_selected_receivables_detailed d - LEFT JOIN ( - SELECT f.busSid, - f.thisUseMoney - FROM fin_funds_carried_forward_veh f - JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid - WHERE fa.`nodeState` != '终止' - ) f ON f.`busSid` = d.`sid` - WHERE d.`auditState` = 3 - or d.auditState = 1 - GROUP BY d.`sid` + SELECT + d.`receivablesSid`, + SUM(d.`subscriptionMoney` - COALESCE (f.`thisUseMoney`, 0 )) AS dbalance + FROM + fin_selected_receivables_detailed d + LEFT JOIN ( + SELECT + f.busSid, + SUM(f.thisUseMoney) AS thisUseMoney + FROM + fin_funds_carried_forward_veh f + JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid + WHERE + fa.`nodeState` != '终止' + GROUP BY f.`busSid` + ) f ON f.`busSid` = d.`sid` + WHERE + (d.`auditState` = 3 + OR d.auditState = 1) + GROUP BY + d.`receivablesSid` ) df ON df.receivablesSid = furd.`sid` ${ew.sqlSegment} @@ -97,8 +103,8 @@ furd.customerName AS `customerName`, furd.customerSid, furd.useOrgSid, - COALESCE(SUM(df.dbalance), 0) AS realMoney, - cast((furd.`reveivableMoney` - COALESCE(SUM(df.dbalance), 0)) AS DECIMAL(10, 2)) AS currentReceivableMoney, + COALESCE (df.dbalance, 0 ) AS realMoney, + CAST((furd.`reveivableMoney` - COALESCE ( df.dbalance, 0 )) AS DECIMAL ( 10, 2 )) AS currentReceivableMoney, furd.reveivableMoney, furd.contractSid, if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) < 1, @@ -115,21 +121,27 @@ LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bv.salesOrderSid LEFT JOIN anrui_riskcenter.loan_solutions lls ON lls.salesOrderSid = bo.sid LEFT JOIN ( - SELECT d.sid, + SELECT d.`receivablesSid`, - ( - d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS dbalance - FROM fin_selected_receivables_detailed d + SUM(d.`subscriptionMoney` - COALESCE (f.`thisUseMoney`, 0 )) AS dbalance + FROM + fin_selected_receivables_detailed d LEFT JOIN ( - SELECT f.busSid, - f.thisUseMoney - FROM fin_funds_carried_forward_veh f + SELECT + f.busSid, + SUM(f.thisUseMoney) AS thisUseMoney + FROM + fin_funds_carried_forward_veh f JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid - WHERE fa.`nodeState` != '终止' + WHERE + fa.`nodeState` != '终止' + GROUP BY f.`busSid` ) f ON f.`busSid` = d.`sid` - WHERE d.`auditState` = 3 - or d.auditState = 1 - GROUP BY d.`sid` + WHERE + (d.`auditState` = 3 + OR d.auditState = 1) + GROUP BY + d.`receivablesSid` ) df ON df.receivablesSid = furd.`sid` ${ew.sqlSegment} @@ -148,8 +160,8 @@ furd.customerName AS `customerName`, furd.customerSid, furd.useOrgSid, - COALESCE(SUM(df.dbalance), 0) AS realMoney, - cast((furd.`reveivableMoney` - COALESCE(SUM(df.dbalance), 0)) AS DECIMAL(10, 2)) AS currentReceivableMoney, + COALESCE (df.dbalance, 0 ) AS realMoney, + CAST((furd.`reveivableMoney` - COALESCE ( df.dbalance, 0 )) AS DECIMAL ( 10, 2 )) AS currentReceivableMoney, furd.reveivableMoney, furd.contractSid, if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) < 1, @@ -165,21 +177,27 @@ LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bv.salesOrderSid LEFT JOIN anrui_riskcenter.loan_solutions lls ON lls.salesOrderSid = bo.sid LEFT JOIN ( - SELECT d.sid, + SELECT d.`receivablesSid`, - ( - d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS dbalance - FROM fin_selected_receivables_detailed d + SUM(d.`subscriptionMoney` - COALESCE (f.`thisUseMoney`, 0 )) AS dbalance + FROM + fin_selected_receivables_detailed d LEFT JOIN ( - SELECT f.busSid, - f.thisUseMoney - FROM fin_funds_carried_forward_veh f + SELECT + f.busSid, + SUM(f.thisUseMoney) AS thisUseMoney + FROM + fin_funds_carried_forward_veh f JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid - WHERE fa.`nodeState` != '终止' + WHERE + fa.`nodeState` != '终止' + GROUP BY f.`busSid` ) f ON f.`busSid` = d.`sid` - WHERE d.`auditState` = 3 - or d.auditState = 1 - GROUP BY d.`sid` + WHERE + (d.`auditState` = 3 + OR d.auditState = 1) + GROUP BY + d.`receivablesSid` ) df ON df.receivablesSid = furd.`sid` ${ew.sqlSegment}