yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 6 months ago
parent
33d71e20c7 3d21583980
commit
06876ba23b
24 changed files with 890 additions and 286 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 104
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
  2. 20
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistribution.java
  3. 49
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDetailsVo.java
  4. 49
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDto.java
  5. 41
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFile.java
  6. 26
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java
  7. 45
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionVo.java
  8. 72
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVeh.java
  9. 73
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDetailsVo.java
  10. 73
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDto.java
  11. 71
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehQuery.java
  12. 73
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehVo.java
  13. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.java
  14. 32
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.xml
  15. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionRest.java
  16. 156
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java
  17. 63
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.java
  18. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.xml
  19. 49
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehRest.java
  20. 67
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehService.java
  21. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java
  22. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.xml
  23. 50
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileRest.java
  24. 25
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java

104
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
View File

@ -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`
<where>
${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)) &lt; 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`
<where>
${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)) &lt; 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`
<where>
${ew.sqlSegment}

20
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistribution.java
View File

@ -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(回款返利分配) <br/>
* File: ScmCollectionRebateDistribution.java <br/>
@ -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;
}

49
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDetailsVo.java
View File

@ -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<ScmCollectionRebateDistributionFile> urls = new ArrayList<>();
@ApiModelProperty("回款返利车辆列表")
private List<ScmCollectionRebateVehDetailsVo> scmCollectionRebateVehs; // 回款返利车辆列表
private List<ScmCollectionRebateDistributionVehDetailsVo> scmCollectionRebateVehs; // 回款返利车辆列表
}

49
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDto.java
View File

@ -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<ScmCollectionRebateDistributionFile> urls = new ArrayList<>();
@ApiModelProperty("回款返利车辆列表")
private List<ScmCollectionRebateVehDto> scmCollectionRebateVehs; // 回款返利车辆列表
private List<ScmCollectionRebateDistributionVehDto> scmCollectionRebateVehs; // 回款返利车辆列表
}

41
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFile.java
View File

@ -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;
}

26
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java
View File

@ -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;
}

45
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionVo.java
View File

@ -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(回款返利分配) <br/>
* File: ScmCollectionRebateDistributionVo.java <br/>
@ -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;
}

72
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVeh.java
View File

@ -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(回款返利分配车辆) <br/>
* File: ScmCollectionRebateDistributionVeh.java <br/>
* Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVeh <br/>
* Description: 回款返利分配车辆表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-10-24 13:58:59 <br/>
*
* @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; // 分配的回款返利
}

73
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDetailsVo.java
View File

@ -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(回款返利分配车辆) <br/>
* File: ScmCollectionRebateDistributionVehVo.java <br/>
* Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo <br/>
* Description: 回款返利分配车辆表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-10-24 13:58:59 <br/>
*
* @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; // 分配的回款返利
}

73
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDto.java
View File

@ -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(回款返利分配车辆) <br/>
* File: ScmCollectionRebateDistributionVehDto.java <br/>
* Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto <br/>
* Description: 回款返利分配车辆表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-10-24 13:58:59 <br/>
*
* @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; // 分配的回款返利
}

71
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehQuery.java
View File

@ -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(回款返利分配车辆) <br/>
* File: ScmCollectionRebateDistributionVehQuery.java <br/>
* Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehQuery <br/>
* Description: 回款返利分配车辆表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-10-24 13:58:59 <br/>
*
* @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; // 分配的回款返利
}

73
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehVo.java
View File

@ -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(回款返利分配车辆) <br/>
* File: ScmCollectionRebateDistributionVehVo.java <br/>
* Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo <br/>
* Description: 回款返利分配车辆表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-10-24 13:58:59 <br/>
*
* @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; // 分配的回款返利
}

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.java
View File

@ -54,16 +54,8 @@ import java.util.List;
@Mapper
public interface ScmCollectionRebateDistributionMapper extends BaseMapper<ScmCollectionRebateDistribution> {
//@Update("update scm_collection_rebate_distribution set name=#{msg} where id=#{id}")
//IPage<ScmCollectionRebateDistributionVo> voPage(IPage<ScmCollectionRebateDistribution> page, @Param(Constants.WRAPPER) QueryWrapper<ScmCollectionRebateDistribution> qw);
IPage<ScmCollectionRebateDistributionVo> selectPageVo(IPage<ScmCollectionRebateDistribution> page, @Param(Constants.WRAPPER) Wrapper<ScmCollectionRebateDistribution> qw);
List<ScmCollectionRebateDistributionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmCollectionRebateDistribution> qw);
@Select("select * from scm_collection_rebate_distribution")
List<ScmCollectionRebateDistributionVo> selectListVo();
@Select("select * from scm_collection_rebate_distribution where collRebateSid = #{sid}")
ScmCollectionRebateDistributionDetailsVo fetchByCollRebate(String sid);
}

32
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.xml
View File

@ -4,10 +4,32 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionVo">
SELECT * FROM scm_collection_rebate_distribution <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionVo">
SELECT * FROM scm_collection_rebate_distribution <where> ${ew.sqlSegment} </where>
SELECT
CASE
sd.state
WHEN 0
THEN '未审核'
WHEN 1
THEN '审核中'
WHEN 2
THEN '已审核'
WHEN 3
THEN '已退回'
END AS state,
sd.createOrgName,
sd.purchaseSystemName,
sd.brandName,
sd.subitDate,
sd.shareGinExaProportion,
sd.shareProportion,
sd.shareRebateTotal,
COUNT(sv.sid) AS num
FROM
scm_collection_rebate_distribution sd
LEFT JOIN scm_collection_rebate_distribution_veh sv
ON sd.sid = sv.mainSid
LEFT JOIN anrui_portal.sys_organization AS u
ON sd.useOrgSid = u.sid
<where> ${ew.sqlSegment} </where>
</select>
</mapper>

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionRest.java
View File

@ -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<ScmCollectionRebateDistributionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
return scmCollectionRebateDistributionService.fetchAllDetailsVoBySid(sid);
return scmCollectionRebateDistributionService.fetchDetailsVoBySid(sid);
}
}

156
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java
View File

@ -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<ScmCollectionRebateDistributionMapper, ScmCollectionRebateDistribution> {
@Autowired
private ScmCollectionRebateVehService scmCollectionRebateVehService;
private QueryWrapper<ScmCollectionRebateDistribution> createQueryWrapper(ScmCollectionRebateDistributionQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmCollectionRebateDistribution> qw = new QueryWrapper<>();
return qw;
}
private ScmCollectionRebateDistributionVehService scmCollectionRebateDistributionVehService;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private ScmFileService scmFileService;
@Autowired
FileUploadComponent fileUploadComponent;
public PagerVo<ScmCollectionRebateDistributionVo> listPageVo(PagerQuery<ScmCollectionRebateDistributionQuery> pq) {
ScmCollectionRebateDistributionQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebateDistribution> 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<String> 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<ScmCollectionRebateDistributionVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<ScmCollectionRebateDistributionVo> 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<ScmCollectionRebateDistribution> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateDistributionVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmCollectionRebateDistributionVo> p = PagerUtil.pageToVo(pagging, null);
@ -98,15 +147,23 @@ public class ScmCollectionRebateDistributionService extends MybatisBaseService<S
public ResultBean saveOrUpdateDto(ScmCollectionRebateDistributionDto dto){
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<ScmCollectionRebateVehDto> scmCollectionRebateVehs = dto.getScmCollectionRebateVehs();
List<ScmCollectionRebateDistributionFile> urls = dto.getUrls();
List<ScmCollectionRebateDistributionVehDto> 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<S
return rb.setMsg("该分配信息不存在");
}
this.updateByDto(dto);
scmCollectionRebateVehService.delByMainSid(scmCollectionRebateDistribution.getCollRebateSid());
scmCollectionRebateDistributionVehService.delByMainSid(dtoSid);
scmFileService.delByMainSid(dtoSid);
if (!scmCollectionRebateVehs.isEmpty()){
for (ScmCollectionRebateVehDto scmCollectionRebateVehDto : scmCollectionRebateVehs) {
scmCollectionRebateVehDto.setMainSid(scmCollectionRebateDistribution.getCollRebateSid());
scmCollectionRebateVehService.insertByDto(scmCollectionRebateVehDto);
for (ScmCollectionRebateDistributionVehDto scmCollectionRebateVehDto : scmCollectionRebateVehs) {
scmCollectionRebateVehDto.setMainSid(dtoSid);
scmCollectionRebateDistributionVehService.insertByDto(scmCollectionRebateVehDto);
}
}
for (ScmCollectionRebateDistributionFile url : urls) {
String filePath = url.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
ScmFile scmFile = new ScmFile();
scmFile.setFilePath(filePath);
scmFile.setLinkSid(dtoSid);
scmFileService.save(scmFile);
}
return rb.success().setMsg("修改成功");
}
@ -141,22 +206,21 @@ public class ScmCollectionRebateDistributionService extends MybatisBaseService<S
baseMapper.updateById(entity);
}
public ScmCollectionRebateDistributionDetailsVo fetchDetailsVoBySid(String sid){
public ResultBean<ScmCollectionRebateDistributionDetailsVo> fetchDetailsVoBySid(String sid){
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateDistribution entity = fetchBySid(sid);
ScmCollectionRebateDistributionDetailsVo vo = new ScmCollectionRebateDistributionDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public ResultBean<ScmCollectionRebateDistributionDetailsVo> fetchAllDetailsVoBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateDistributionDetailsVo scmCollectionRebateDistributionDetailsVo = fetchDetailsVoBySid(sid);
List<ScmCollectionRebateVehDetailsVo> scmCollectionRebateVehDetailsVos = scmCollectionRebateVehService.fetchByMainSid(sid);
scmCollectionRebateDistributionDetailsVo.setScmCollectionRebateVehs(scmCollectionRebateVehDetailsVos);
return rb.success().setData(scmCollectionRebateDistributionDetailsVo);
}
public ScmCollectionRebateDistributionDetailsVo fetchByCollRebate(String sid) {
return baseMapper.fetchByCollRebate(sid);
List<ScmCollectionRebateDistributionVehDetailsVo> scmCollectionRebateDistributionVehDetailsVos = scmCollectionRebateDistributionVehService.selByMainSid(sid);
vo.setScmCollectionRebateVehs(scmCollectionRebateDistributionVehDetailsVos);
List<ScmFileVo> scmFileVos = scmFileService.fetchByMainSid(sid);
List<ScmCollectionRebateDistributionFile> 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);
}
}

63
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.java
View File

@ -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(回款返利分配车辆) <br/>
* File: ScmCollectionRebateDistributionVehMapper.java <br/>
* Class: com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehMapper <br/>
* Description: 回款返利分配车辆表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-10-24 13:58:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface ScmCollectionRebateDistributionVehMapper extends BaseMapper<ScmCollectionRebateDistributionVeh> {
@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<ScmCollectionRebateDistributionVehDetailsVo> selByMainSid(String mainSid);
}

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.xml
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
</mapper>

49
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehRest.java
View File

@ -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(回款返利分配车辆) <br/>
* File: ScmCollectionRebateDistributionVehFeignFallback.java <br/>
* Class: com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehRest <br/>
* Description: 回款返利分配车辆表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-10-24 13:58:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "回款返利分配车辆表")
@RestController
@RequestMapping("v1/scmcollectionrebatedistributionveh")
public class ScmCollectionRebateDistributionVehRest{
}

67
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehService.java
View File

@ -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(回款返利分配车辆) <br/>
* File: ScmCollectionRebateDistributionVehService.java <br/>
* Class: com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehService <br/>
* Description: 回款返利分配车辆表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-10-24 13:58:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class ScmCollectionRebateDistributionVehService extends MybatisBaseService<ScmCollectionRebateDistributionVehMapper, ScmCollectionRebateDistributionVeh> {
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<ScmCollectionRebateDistributionVehDetailsVo> selByMainSid(String mainSid) {
return baseMapper.selByMainSid(mainSid);
}
}

10
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.java
View File

@ -55,16 +55,6 @@ import java.util.List;
@Mapper
public interface ScmFileMapper extends BaseMapper<ScmFile> {
//@Update("update scm_file set name=#{msg} where id=#{id}")
//IPage<ScmFileVo> voPage(IPage<ScmFile> page, @Param(Constants.WRAPPER) QueryWrapper<ScmFile> qw);
IPage<ScmFileVo> selectPageVo(IPage<ScmFile> page, @Param(Constants.WRAPPER) Wrapper<ScmFile> qw);
List<ScmFileVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmFile> qw);
@Select("select * from scm_file")
List<ScmFileVo> selectListVo();
@Select("select * from scm_file where linkSid = #{sid} and attachType = #{type}")
List<ScmFile> selectByLinkSid(@Param("sid") String sid, @Param("type") String type);

10
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileMapper.xml
View File

@ -3,14 +3,4 @@
<mapper namespace="com.yxt.anrui.scm.biz.scmfile.ScmFileMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmfile.ScmFileVo">
SELECT * FROM scm_file
<where>${ew.sqlSegment}</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmfile.ScmFileVo">
SELECT * FROM scm_file
<where>${ew.sqlSegment}</where>
</select>
</mapper>

50
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileRest.java
View File

@ -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<PagerVo<ScmFileVo>> listPage(@RequestBody PagerQuery<ScmFileQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmFileVo> 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<ScmFileDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
ScmFileDetailsVo vo = scmFileService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
@ApiOperation("根据linkSid和文件类型查询图片")
public ResultBean<List<ScmFile>> selectByLinkSid(String sid, String type) {
ResultBean rb = ResultBean.fireFail();
List<ScmFile> list = scmFileService.getByLinkSidAndType(sid, type);
return rb.success().setData(list);
}
}

25
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfile/ScmFileService.java
View File

@ -64,31 +64,6 @@ public class ScmFileService extends MybatisBaseService<ScmFileMapper, ScmFile> {
@Autowired
FileUploadComponent fileUploadComponent;
private QueryWrapper<ScmFile> createQueryWrapper(ScmFileQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmFile> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmFileVo> listPageVo(PagerQuery<ScmFileQuery> pq) {
ScmFileQuery query = pq.getParams();
QueryWrapper<ScmFile> qw = createQueryWrapper(query);
IPage<ScmFile> page = PagerUtil.queryToPage(pq);
IPage<ScmFileVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmFileVo> 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");

Write Preview
Loading…
Cancel
Save