diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java index f9f4cc9d6f..56dc83c139 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java @@ -61,63 +61,63 @@ public class ScmVehRebateVo implements Vo { @ApiModelProperty("状态") private String state; // 状态 private String vehRebateSid; // 单车返利sid - @ApiModelProperty("品牌sid") + @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @ApiModelProperty("车型sid") + @ApiModelProperty("车型sid") private String vehModelSid; // 车型sid - @ApiModelProperty("车型名称") + @ApiModelProperty("车型名称") private String vehModelName; // 车型名称 - @ApiModelProperty("车辆sid") + @ApiModelProperty("车辆sid") private String vehSid; // 车辆sid - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("厂家结算价") + @ApiModelProperty("厂家结算价") private String manufactorSettlementPrice; // 厂家结算价 - @ApiModelProperty("运费") + @ApiModelProperty("运费") private String freight; // 运费 - @ApiModelProperty("返利类型key") + @ApiModelProperty("返利类型key") private String rebateTypeKey; // 返利类型key - @ApiModelProperty("返利类型value") + @ApiModelProperty("返利类型value") private String rebateTypeValue; // 返利类型value - @ApiModelProperty("返利名称") + @ApiModelProperty("返利名称") private String rebateName; // 返利名称 - @ApiModelProperty("计算标准") + @ApiModelProperty("计算标准") private String calculationStandard; // 计算标准 - @ApiModelProperty("预计返利") + @ApiModelProperty("预计返利") private String estimateRebate; // 预计返利 - @ApiModelProperty("所属年月") + @ApiModelProperty("所属年月") private String palceGenDate; // 所属年月 - @ApiModelProperty("预提日期") + @ApiModelProperty("预提日期") private String withholdingDate; // 预提日期 - @ApiModelProperty("上传日期") + @ApiModelProperty("上传日期") private String uploadDate; // 上传日期 - @ApiModelProperty("上传金额") + @ApiModelProperty("上传金额") private String uploadMoney; // 上传金额 - @ApiModelProperty("二次上传日期") + @ApiModelProperty("二次上传日期") private String secondaryUploadDate; // 二次上传日期 - @ApiModelProperty("二次上传金额") + @ApiModelProperty("二次上传金额") private String secondaryUploadMoney; // 二次上传金额 - @ApiModelProperty("待确定金额") + @ApiModelProperty("待确定金额") private String stayDetermineMoney; // 待确定金额 - @ApiModelProperty("是否调整") + @ApiModelProperty("是否调整") private String isAdjustment; // 是否调整 - @ApiModelProperty("调整金额") + @ApiModelProperty("调整金额") private String adjustmentMoney; // 调整金额 - @ApiModelProperty("调整说明") + @ApiModelProperty("调整说明") private String adjustmentRemarks; // 调整说明 - @ApiModelProperty("计算方式key") + @ApiModelProperty("计算方式key") private String calculationModeKey; // 计算方式key - @ApiModelProperty("计算方式Value") + @ApiModelProperty("计算方式Value") private String calculationModeValue; // 计算方式Value - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sidu - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 @ApiModelProperty("上传状态(0未上传、1已上传)") private String uploadState; // 上传状态 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapply.java index 11677d7fed..82c3ff66a6 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapply.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapply.java @@ -26,11 +26,14 @@ package com.yxt.anrui.scm.api.scmvehrebatecheckapply; 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: ScmVehrebateCheckapply.java
@@ -50,35 +53,36 @@ import lombok.Data; public class ScmVehrebateCheckapply extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("单据编号") + private String billNo; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; @ApiModelProperty("部门sid") private String deptSid; @ApiModelProperty("部门") private String deptName; - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 - @ApiModelProperty("核对申请标题") + @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 - @ApiModelProperty("创建人姓名") + @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 - @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 nodeState; // 流程状态 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("taskId") + @ApiModelProperty("taskId") private String taskId; // taskId @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java index acf6d4075f..a3393bef5b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java @@ -58,7 +58,9 @@ public class ScmVehrebateCheckapplyDetailsVo implements Vo { private String sid; // sid - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("单据编号") + private String billNo; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("创建日期") private Date createTime; @ApiModelProperty("备注") @@ -67,10 +69,6 @@ public class ScmVehrebateCheckapplyDetailsVo implements Vo { private String deptSid; @ApiModelProperty("部门") private String deptName; - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 @ApiModelProperty("创建人sid") @@ -97,7 +95,7 @@ public class ScmVehrebateCheckapplyDetailsVo implements Vo { private String taskId; // taskId @ApiModelProperty("组织全路径") private String orgPath; - @ApiModelProperty("本月核对本月已上传单车返利信息") + @ApiModelProperty("本月核对本月已上传单车返利信息") private List scmWhenVehrebateCheckapplydetailDetails; // 本月核对本月已上传单车返利信息 @ApiModelProperty("本月核对往月已上传单车返利信息") private List scmLastVehrebateCheckapplydetailDetails; // 本月核对往月已上传单车返利信息 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDto.java index dd090234fc..8ab3b859fc 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDto.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.api.scmvehrebatecheckapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto; import com.yxt.common.core.dto.Dto; @@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -54,6 +56,8 @@ public class ScmVehrebateCheckapplyDto implements Dto { private String sid; // sid + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("创建人sid") private String createBySid; // 创建人sid @ApiModelProperty("备注") @@ -62,31 +66,27 @@ public class ScmVehrebateCheckapplyDto implements Dto { private String deptSid; @ApiModelProperty("部门") private String deptName; - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 - @ApiModelProperty("核对申请标题") + @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 - @ApiModelProperty("创建人姓名") + @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 - @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 nodeState; // 流程状态 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("taskId") + @ApiModelProperty("taskId") private String taskId; // taskId @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java index b7252a10c8..19195180d6 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java @@ -75,12 +75,12 @@ public interface ScmVehrebateCheckapplyFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody ScmVehrebateCheckapplyDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyQuery.java index 28972101f0..35331d687b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyQuery.java @@ -49,18 +49,22 @@ import lombok.Data; @ApiModel(value = "单车返利核对申请表 查询条件", description = "单车返利核对申请表 查询条件") public class ScmVehrebateCheckapplyQuery implements Query { - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("部门") + private String deptName; + @ApiModelProperty("创建人") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("核对申请标题") - private String checkApply; // 核对申请标题 - @ApiModelProperty("创建开始日期") - private String createStartTime; // 创建开始日期 - @ApiModelProperty("创建结束日期") - private String createEndTime; // 创建结束日期 - @ApiModelProperty("流程定义的id") - private String procDefId; // 流程定义的id - @ApiModelProperty("流程实例的sid") - private String procInstId; // 流程实例的sid + private String checkApply; + @ApiModelProperty("创建日期") + private String createStartTime; + private String createEndTime; + @ApiModelProperty("办结日期") + private String finishTimeStart; + private String finishTimeEnd; private String userSid; private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyVo.java index 492e747a04..a817fe4f07 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyVo.java @@ -54,33 +54,38 @@ public class ScmVehrebateCheckapplyVo implements Vo { private String sid; // sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 - @ApiModelProperty("核对申请标题") - private String checkApply; // 核对申请标题 - @ApiModelProperty("创建人姓名") - private String createByName; // 创建人姓名 - @ApiModelProperty("创建日期") + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("分公司") + private String createOrgName; + @ApiModelProperty("部门") + private String deptName; + @ApiModelProperty("创建人姓名") + private String createByName; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date createTime; // 创建日期 - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建日期") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; + @ApiModelProperty("核对申请标题") + private String checkApply; @ApiModelProperty("预计返利") - private String estimateRebate; // 预计返利 + private String estimateRebate; @ApiModelProperty("其中预提费用") private String withholdCost; @ApiModelProperty("上传金额") - private String uploadMoney; // 上传金额 + private String uploadMoney; @ApiModelProperty("待确定金额") - private String stayDetermineMoney; // 待确定金额 + private String stayDetermineMoney; @ApiModelProperty("费用") - private String money; // 费用 + private String money; @ApiModelProperty("调整金额") - private String adjustmentMoney; // 调整金额 - @ApiModelProperty("流程状态") - private String nodeState; // 流程状态 - @ApiModelProperty("流程定义的id") - private String procDefId; // 流程定义的id - @ApiModelProperty("流程实例的sid") - private String procInstId; // 流程实例的sid + private String adjustmentMoney; + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("流程实例的sid") + private String procInstId; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetail.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetail.java index 047e9feeea..c70169b6cd 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetail.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetail.java @@ -139,4 +139,8 @@ public class ScmVehrebateCheckapplydetail extends BaseEntity { private BigDecimal secondSuppCost; @ApiModelProperty("二次抵顶费用说明") private String secondSuppRemark; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统") + private String purchaseSystemName; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java index 4dd5aeac73..3c40f3afaa 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java @@ -79,10 +79,14 @@ public class ScmVehrebateCheckapplydetailDetailsVo implements Vo { private String fyAdjustmentMoney; @ApiModelProperty("费用") private String money; // 费用 - @ApiModelProperty("单车返利sid") + @ApiModelProperty("单车返利sid") private String vehRebateSid; // 单车返利sid - @ApiModelProperty("核对申请sid") + @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid + @ApiModelProperty("品牌名称") + private String brandName; + @ApiModelProperty("采购系统") + private String purchaseSystemName; @ApiModelProperty("单车返利sid") private List vehRebateSids; // 单车返利sid } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDto.java index 62529cbab4..bde0ab798d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDto.java @@ -139,5 +139,9 @@ public class ScmVehrebateCheckapplydetailDto implements Dto { private BigDecimal secondSuppCost; @ApiModelProperty("二次抵顶费用说明") private String secondSuppRemark; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统") + private String purchaseSystemName; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java index 13204f19eb..5deb560301 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java @@ -82,6 +82,8 @@ public class ScmVehrebateCheckapplydetailVo implements Vo { private String calculationStandard; // 计算标准 @ApiModelProperty("预计返利") private String estimateRebate; // 预计返利 + @ApiModelProperty("其中预提费用") + private String withholdCost; @ApiModelProperty("所属年月") private String palceGenDate; // 所属年月 @ApiModelProperty("预提日期") @@ -139,4 +141,8 @@ public class ScmVehrebateCheckapplydetailVo implements Vo { @ApiModelProperty("二次抵顶费用说明") private String secondSuppRemark; private String money; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统") + private String purchaseSystemName; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApply.java index f5718949f5..23fbc5966a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApply.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApply.java @@ -59,21 +59,17 @@ public class ScmVehRebateWithApply extends BaseEntity { private String deptSid; @ApiModelProperty("部门") private String deptName; - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 - @ApiModelProperty("预提申请") + @ApiModelProperty("预提申请") private String withApply; // 预提申请 - @ApiModelProperty("创建人姓名") + @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 - @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("流程定义的id") private String procDefId; @@ -87,7 +83,7 @@ public class ScmVehRebateWithApply extends BaseEntity { private String taskId; @ApiModelProperty("组织全路径") private String orgPath; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("办结日期") private Date finishTime; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java index 5fe879ec25..1202e71281 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java @@ -70,21 +70,17 @@ public class ScmVehRebateWithApplyDetailsVo implements Vo { private String deptSid; @ApiModelProperty("部门") private String deptName; - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 - @ApiModelProperty("预提申请") + @ApiModelProperty("预提申请") private String withApply; // 预提申请 - @ApiModelProperty("创建人姓名") + @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 - @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("流程定义的id") private String procDefId; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java index 46d3da6f98..6bd26d08a5 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java @@ -62,10 +62,6 @@ public class ScmVehRebateWithApplyDto implements Dto { private String deptSid; @ApiModelProperty("部门") private String deptName; - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 @ApiModelProperty("预提申请") private String withApply; // 预提申请 @ApiModelProperty("创建人sid") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml index b1720258cf..179c8db23f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml @@ -14,26 +14,26 @@ resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo"> SELECT scc.rebateTypeValue, COUNT(*) num, - SUM(scc.`estimateRebate`) estimateRebate, - GROUP_CONCAT(scc.`collectionRebateSid`) collectionRebateSid, - SUM(scc.`uploadMoney`) uploadMoney, - SUM(scc.`adjustmentMoney`) adjustmentMoney + SUM(scc.estimateRebate) estimateRebate, + GROUP_CONCAT(scc.collectionRebateSid) collectionRebateSid, + SUM(scc.uploadMoney) uploadMoney, + SUM(scc.adjustmentMoney) adjustmentMoney FROM scm_collectionrebate_checkapplydetail scc - WHERE scc.`mainSid` = #{sid} - GROUP BY scc.`rebateTypeKey` + WHERE scc.mainSid = #{sid} + GROUP BY scc.rebateTypeKey,scc.brandSid,scc.purchaseSystemSid SELECT ROUND( - SUM(sd.`uploadMoney`) / SUM(sd.collectionMoney), + SUM(sd.uploadMoney) / SUM(sd.collectionMoney), 2 ) * 100 AS num FROM scm_collectionrebate_checkapplydetail sd LEFT JOIN scm_collectionrebate_checkapply sc - ON sd.`mainSid` = sc.`sid` - WHERE sc.`createOrgSid` = #{createOrgSid} - AND sd.`purchaseSystemSid` = #{purchaseSystemSid} - AND sc.`nodeState` = '已办结' + ON sd.mainSid = sc.sid + WHERE sc.createOrgSid = #{createOrgSid} + AND sd.purchaseSystemSid = #{purchaseSystemSid} + AND sc.nodeState = '已办结' \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml index 5d01cf9852..1bd531a148 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml @@ -14,13 +14,13 @@ + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java index bcd1cb3bf5..cf18234c70 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java @@ -26,11 +26,13 @@ package com.yxt.anrui.scm.biz.scmvehrebatecheckapply; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusOrderAndVehInfo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; @@ -164,8 +166,17 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(createEndTime), "date_format (svc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); + String finishTimeStart = query.getFinishTimeStart(); + String finishTimeEnd = query.getFinishTimeEnd(); + qw.apply(StringUtils.isNotBlank(finishTimeStart), "date_format (svc.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(finishTimeEnd), "date_format (svc.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')" + ); qw.groupBy("svc.sid"); qw.orderByDesc("svc.createTime"); IPage page = PagerUtil.queryToPage(pq); @@ -191,6 +207,18 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService { - //@Update("update scm_vehrebate_checkapplydetail 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); @@ -73,7 +70,7 @@ public interface ScmVehrebateCheckapplydetailMapper extends BaseMapper fetchLastDetailsVoBySid(String sid); - @Select("select * from scm_vehrebate_checkapplydetail where mainSid = #{sid}") + @Select("select *,expectTreatCost + expectSuppCost as withholdCost from scm_vehrebate_checkapplydetail where mainSid = #{sid}") List selByMainSid(String mainSid); @Select("select * from scm_vehrebate_checkapplydetail where mainSid = #{mainSid}") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml index 20fad0cb80..701495de02 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml @@ -21,39 +21,43 @@ \ No newline at end of file