Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 8 months ago
parent
commit
49f31a7cc4
  1. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java
  2. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java
  3. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java
  4. 10
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java
  5. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyQuery.java
  6. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java
  7. 77
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java
  8. 77
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java
  9. 77
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java
  10. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
  11. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java
  12. 18
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml
  13. 72
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
  14. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.java
  15. 16
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml
  16. 15
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
  17. 153
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
  18. 27
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java
  19. 40
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml
  20. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java
  21. 16
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java
  22. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java
  23. 13
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
  24. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
  25. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
  26. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java

@ -70,6 +70,8 @@ public class ScmSpecialRebateQuery implements Query {
private String createEndTime; // 创建结束日期
@ApiModelProperty("状态")
private String state;
@ApiModelProperty("一次核对状态")
private String onceCheckState;
@ApiModelProperty("专项返利sid")
private List<String> sidList; // 专项返利sid

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java

@ -50,6 +50,10 @@ import lombok.Data;
public class ScmSpecialrebateCheckapply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java

@ -58,6 +58,10 @@ public class ScmSpecialrebateCheckapplyDetailsVo implements Vo {
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ -92,4 +96,6 @@ public class ScmSpecialrebateCheckapplyDetailsVo implements Vo {
private List<ScmSpecialrebateCheckapplydetailDetailsVo> scmWhenSpecialrebateCheckapplydetailDetails; // 本月核对本月已上传专项返利信息
@ApiModelProperty("本月核对往月已上传专项返利信息")
private List<ScmSpecialrebateCheckapplydetailDetailsVo> scmLastSpecialrebateCheckapplydetailDetails; // 本月核对往月已上传专项返利信息
@ApiModelProperty("返利信息")
private List<ScmSpecialrebateCheckapplydetailVo> scmSpecialrebateCheckapplydetailDetails;
}

10
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java

@ -58,6 +58,10 @@ public class ScmSpecialrebateCheckapplyDto implements Dto {
private String createBySid; // 创建人sid
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ -86,8 +90,6 @@ public class ScmSpecialrebateCheckapplyDto implements Dto {
private String taskId; // taskId
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("本月核对本月已上传专项返利信息")
private List<ScmSpecialrebateCheckapplydetailDto> scmWhenSpecialrebateCheckapplydetailDetails; // 本月核对本月已上传专项返利信息
@ApiModelProperty("本月核对往月已上传专项返利信息")
private List<ScmSpecialrebateCheckapplydetailDto> scmLastSpecialrebateCheckapplydetailDetails; // 本月核对往月已上传专项返利信息
@ApiModelProperty("返利信息")
private List<ScmSpecialrebateCheckapplydetailDto> scmSpecialrebateCheckapplydetailDetails;
}

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyQuery.java

@ -49,8 +49,8 @@ import lombok.Data;
@ApiModel(value = "专项返利核对申请表 查询条件", description = "专项返利核对申请表 查询条件")
public class ScmSpecialrebateCheckapplyQuery implements Query {
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("分公司")
private String createOrgName;
@ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题
@ApiModelProperty("创建开始日期")

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java

@ -54,8 +54,8 @@ public class ScmSpecialrebateCheckapplyVo implements Vo {
private String sid; // sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题
@ApiModelProperty("创建人姓名")

77
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java

@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-scm(专项返利) <br/>
* File: ScmSpecialrebateCheckapplydetail.java <br/>
@ -55,4 +57,79 @@ public class ScmSpecialrebateCheckapplydetail extends BaseEntity {
@ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("返利类型key")
private String rebateTypeKey; // 返利类型key
@ApiModelProperty("返利类型value")
private String rebateTypeValue; // 返利类型value
@ApiModelProperty("返利名称")
private String rebateName; // 返利名称
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@ApiModelProperty("上传日期")
private String uploadDate; // 上传日期
@ApiModelProperty("上传金额")
private String uploadMoney; // 上传金额
@ApiModelProperty("二次上传日期")
private String secondaryUploadDate; // 二次上传日期
@ApiModelProperty("二次上传金额")
private String secondaryUploadMoney; // 二次上传金额
@ApiModelProperty("是否调整")
private String isAdjustment; // 是否调整
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
@ApiModelProperty("调整说明")
private String adjustmentRemarks; // 调整说明
@ApiModelProperty("调整状态")
private Integer adjustmentState;
@ApiModelProperty("计算方式key")
private String calculationModeKey; // 计算方式key
@ApiModelProperty("计算方式Value")
private String calculationModeValue; // 计算方式Value
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid;
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
@ApiModelProperty("所属年月")
private String palceGenDate;
@ApiModelProperty("一次核对状态")
private Integer onceCheckState;
@ApiModelProperty("待确定金额(动态)")
private String stayDetermineMoney;
@ApiModelProperty("待确定金额(常量)")
private String stayDetermineMoneyNew;
@ApiModelProperty("差异金额")
private BigDecimal diffAmount;
@ApiModelProperty("预计支出费用")
private BigDecimal expectItureCost;
@ApiModelProperty("预计待支付费用")
private BigDecimal expectTreatCost;
@ApiModelProperty("预计抵顶费用")
private BigDecimal expectSuppCost;
@ApiModelProperty("预计抵顶费用说明")
private String expectSuppRemark;
@ApiModelProperty("一次支出费用")
private BigDecimal onceItureCost;
@ApiModelProperty("一次待支付费用")
private BigDecimal onceTreatCost;
@ApiModelProperty("一次抵顶费用")
private BigDecimal onceSuppCost;
@ApiModelProperty("一次抵顶费用说明")
private String onceSuppRemark;
@ApiModelProperty("二次支出费用")
private BigDecimal secondItureCost;
@ApiModelProperty("二次待支付费用")
private BigDecimal secondTreatCost;
@ApiModelProperty("二次抵顶费用")
private BigDecimal secondSuppCost;
@ApiModelProperty("二次抵顶费用说明")
private String secondSuppRemark;
}

77
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java

@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
@ -54,8 +55,82 @@ public class ScmSpecialrebateCheckapplydetailDto implements Dto {
private String sid; // sid
@ApiModelProperty("专项返利sid")
private List<String> specialRebateSids; // 专项返利sid
private String specialRebateSids; // 专项返利sid
@ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("返利类型key")
private String rebateTypeKey; // 返利类型key
@ApiModelProperty("返利类型value")
private String rebateTypeValue; // 返利类型value
@ApiModelProperty("返利名称")
private String rebateName; // 返利名称
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@ApiModelProperty("上传日期")
private String uploadDate; // 上传日期
@ApiModelProperty("上传金额")
private String uploadMoney; // 上传金额
@ApiModelProperty("二次上传日期")
private String secondaryUploadDate; // 二次上传日期
@ApiModelProperty("二次上传金额")
private String secondaryUploadMoney; // 二次上传金额
@ApiModelProperty("是否调整")
private String isAdjustment; // 是否调整
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
@ApiModelProperty("调整说明")
private String adjustmentRemarks; // 调整说明
@ApiModelProperty("调整状态")
private Integer adjustmentState;
@ApiModelProperty("计算方式key")
private String calculationModeKey; // 计算方式key
@ApiModelProperty("计算方式Value")
private String calculationModeValue; // 计算方式Value
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid;
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
@ApiModelProperty("所属年月")
private String palceGenDate;
@ApiModelProperty("一次核对状态")
private Integer onceCheckState;
@ApiModelProperty("待确定金额(动态)")
private String stayDetermineMoney;
@ApiModelProperty("待确定金额(常量)")
private String stayDetermineMoneyNew;
@ApiModelProperty("差异金额")
private BigDecimal diffAmount;
@ApiModelProperty("预计支出费用")
private BigDecimal expectItureCost;
@ApiModelProperty("预计待支付费用")
private BigDecimal expectTreatCost;
@ApiModelProperty("预计抵顶费用")
private BigDecimal expectSuppCost;
@ApiModelProperty("预计抵顶费用说明")
private String expectSuppRemark;
@ApiModelProperty("一次支出费用")
private BigDecimal onceItureCost;
@ApiModelProperty("一次待支付费用")
private BigDecimal onceTreatCost;
@ApiModelProperty("一次抵顶费用")
private BigDecimal onceSuppCost;
@ApiModelProperty("一次抵顶费用说明")
private String onceSuppRemark;
@ApiModelProperty("二次支出费用")
private BigDecimal secondItureCost;
@ApiModelProperty("二次待支付费用")
private BigDecimal secondTreatCost;
@ApiModelProperty("二次抵顶费用")
private BigDecimal secondSuppCost;
@ApiModelProperty("二次抵顶费用说明")
private String secondSuppRemark;
}

77
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-scm(专项返利) <br/>
* File: ScmSpecialrebateCheckapplydetailVo.java <br/>
@ -56,4 +58,79 @@ public class ScmSpecialrebateCheckapplydetailVo implements Vo {
@ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("返利类型key")
private String rebateTypeKey; // 返利类型key
@ApiModelProperty("返利类型value")
private String rebateTypeValue; // 返利类型value
@ApiModelProperty("返利名称")
private String rebateName; // 返利名称
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@ApiModelProperty("上传日期")
private String uploadDate; // 上传日期
@ApiModelProperty("上传金额")
private String uploadMoney; // 上传金额
@ApiModelProperty("二次上传日期")
private String secondaryUploadDate; // 二次上传日期
@ApiModelProperty("二次上传金额")
private String secondaryUploadMoney; // 二次上传金额
@ApiModelProperty("是否调整")
private String isAdjustment; // 是否调整
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
@ApiModelProperty("调整说明")
private String adjustmentRemarks; // 调整说明
@ApiModelProperty("调整状态")
private Integer adjustmentState;
@ApiModelProperty("计算方式key")
private String calculationModeKey; // 计算方式key
@ApiModelProperty("计算方式Value")
private String calculationModeValue; // 计算方式Value
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid;
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
@ApiModelProperty("所属年月")
private String palceGenDate;
@ApiModelProperty("一次核对状态")
private Integer onceCheckState;
@ApiModelProperty("待确定金额(动态)")
private String stayDetermineMoney;
@ApiModelProperty("待确定金额(常量)")
private String stayDetermineMoneyNew;
@ApiModelProperty("差异金额")
private BigDecimal diffAmount;
@ApiModelProperty("预计支出费用")
private BigDecimal expectItureCost;
@ApiModelProperty("预计待支付费用")
private BigDecimal expectTreatCost;
@ApiModelProperty("预计抵顶费用")
private BigDecimal expectSuppCost;
@ApiModelProperty("预计抵顶费用说明")
private String expectSuppRemark;
@ApiModelProperty("一次支出费用")
private BigDecimal onceItureCost;
@ApiModelProperty("一次待支付费用")
private BigDecimal onceTreatCost;
@ApiModelProperty("一次抵顶费用")
private BigDecimal onceSuppCost;
@ApiModelProperty("一次抵顶费用说明")
private String onceSuppRemark;
@ApiModelProperty("二次支出费用")
private BigDecimal secondItureCost;
@ApiModelProperty("二次待支付费用")
private BigDecimal secondTreatCost;
@ApiModelProperty("二次抵顶费用")
private BigDecimal secondSuppCost;
@ApiModelProperty("二次抵顶费用说明")
private String secondSuppRemark;
private String money;
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java

@ -108,7 +108,7 @@ public interface ScmVehRebateFeign {
@ApiOperation("修改")
@PostMapping("/update")
@ResponseBody
public ResultBean update(@RequestBody ScmVehRebateVehDto dto);
public ResultBean update(@RequestBody ScmVehRebateVehDto dto);
@ApiOperation("调整")
@PostMapping("/adjustment")

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java

@ -54,15 +54,9 @@ import java.util.List;
@Mapper
public interface ScmSpecialRebateMapper extends BaseMapper<ScmSpecialRebate> {
//@Update("update scm_special_rebate set name=#{msg} where id=#{id}")
//IPage<ScmSpecialRebateVo> voPage(IPage<ScmSpecialRebate> page, @Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
IPage<ScmSpecialRebateVo> selectPageVo(IPage<ScmSpecialRebate> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialRebate> qw);
List<ScmSpecialRebateVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmSpecialRebate> qw);
@Select("select * from scm_special_rebate")
List<ScmSpecialRebateVo> selectListVo();
IPage<ScmSpecialRebateVo> selectPageVoUpload(IPage<ScmSpecialRebate> page,@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
@Update("update scm_special_rebate set state = #{state} where sid = #{specialRebateSid}")
void updateState(@Param("specialRebateSid") String specialRebateSid, @Param("state") Integer state);

18
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml

@ -5,18 +5,30 @@
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateVo">
SELECT *,
expectItureCost + expectTreatCost + expectSuppCost AS expectCost
expectItureCost + expectTreatCost + expectSuppCost AS expectCost,
onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money
FROM scm_special_rebate
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateVo">
SELECT * FROM scm_special_rebate
<select id="selectPageVoUpload" resultType="com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateVo">
SELECT *,
expectItureCost + expectTreatCost + expectSuppCost AS expectCost,
onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money
FROM scm_special_rebate
<where>
${ew.sqlSegment}
</where>
AND ((
onceCheckState = 1
AND isAdjustment = '是'
)
OR (
onceCheckState = 0
AND uploadDate IS NOT NULL
))
</select>
<select id="stayDisRebate" resultType="com.yxt.anrui.scm.api.scmspecialrebate.ScmStayDisRebateVo">

72
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@ -29,7 +29,6 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.sun.org.apache.regexp.internal.RE;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
@ -175,7 +174,8 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
if (i > 0) {
return rb.setMsg("返利信息已存在");
}
this.updateByDto(dto);
dto.setStayDetermineMoneyNew(dto.getStayDetermineMoney());
this.updateBySid(dto,dtoSid);
return rb.success();
}
@ -186,16 +186,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
baseMapper.insert(entity);
}
public void updateByDto(ScmSpecialRebateDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
ScmSpecialRebate entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public ScmSpecialRebateDetailsVo fetchDetailsVoBySid(String sid) {
ScmSpecialRebate entity = fetchBySid(sid);
ScmSpecialRebateDetailsVo vo = new ScmSpecialRebateDetailsVo();
@ -223,6 +213,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
if (StringUtils.isNotBlank(query.getRebateName())) {
qw.like("rebateName", query.getRebateName());
}
if (StringUtils.isNotBlank(query.getOnceCheckState())) {
qw.eq("onceCheckState", query.getOnceCheckState());
}
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')").
@ -281,6 +274,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
return p;
}
}
if (StringUtils.isNotBlank(query.getCreateOrgName())) {
qw.like("createOrgName", query.getCreateOrgName());
}
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("brandName", query.getBrandName());
}
@ -293,12 +289,17 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
if (StringUtils.isNotBlank(query.getRebateName())) {
qw.like("rebateName", query.getRebateName());
}
if (StringUtils.isNotBlank(query.getOnceCheckState())) {
qw.eq("onceCheckState", query.getOnceCheckState());
}
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')"
);
qw.eq("state", 2);
qw.eq("adjustmentState", 0);
qw.orderByDesc("createTime");
IPage<ScmSpecialRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmSpecialRebateVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmSpecialRebateVo record : pagging.getRecords()) {
@ -316,46 +317,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
public PagerVo<ScmSpecialRebateVo> checkApplyGetAlreadyUploadSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
ScmSpecialRebateQuery query = pq.getParams();
QueryWrapper<ScmSpecialRebate> qw = new QueryWrapper<>();
//========================================数据授权开始
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("orgPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("orgPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("orgPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("orgPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("createBySid", query.getUserSid());
} else {
PagerVo<ScmSpecialRebateVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<ScmSpecialRebateVo> p = new PagerVo<>();
return p;
}
}
qw.eq("createOrgSid", query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("brandName", query.getBrandName());
}
@ -373,13 +335,13 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
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')"
);
qw.eq("adjustmentState", 1);
qw.isNotNull("uploadDate");
qw.eq("adjustmentState", 0);
qw.eq("state", 2);
if (query.getSidList().size() > 0) {
qw.notIn("sid", query.getSidList());
}
IPage<ScmSpecialRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmSpecialRebateVo> pagging = baseMapper.selectPageVo(page, qw);
IPage<ScmSpecialRebateVo> pagging = baseMapper.selectPageVoUpload(page, qw);
PagerVo<ScmSpecialRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.java

@ -54,16 +54,8 @@ import java.util.Map;
@Mapper
public interface ScmSpecialrebateCheckapplyMapper extends BaseMapper<ScmSpecialrebateCheckapply> {
//@Update("update scm_specialrebate_checkapply set name=#{msg} where id=#{id}")
//IPage<ScmSpecialrebateCheckapplyVo> voPage(IPage<ScmSpecialrebateCheckapply> page, @Param(Constants.WRAPPER) QueryWrapper<ScmSpecialrebateCheckapply> qw);
IPage<ScmSpecialrebateCheckapplyVo> selectPageVo(IPage<ScmSpecialrebateCheckapply> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialrebateCheckapply> qw);
List<ScmSpecialrebateCheckapplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmSpecialrebateCheckapply> qw);
@Select("select * from scm_specialrebate_checkapply")
List<ScmSpecialrebateCheckapplyVo> selectListVo();
int selectBySid(String join);
int updateFlowFiled(Map<String, Object> beanToMap);

16
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml

@ -6,25 +6,19 @@
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo">
SELECT
ssc.*,
SUM(ssr.`estimateRebate`) estimateRebate,
SUM(ssr.`uploadMoney`) uploadMoney,
SUM(ssr.`stayDetermineMoney`) stayDetermineMoney,
SUM(ssr.`adjustmentMoney`) adjustmentMoney,
SUM(ssr.`money`) money
SUM(sscd.`estimateRebate`) estimateRebate,
SUM(sscd.`uploadMoney`) uploadMoney,
SUM(sscd.`stayDetermineMoney`) stayDetermineMoney,
SUM(sscd.`adjustmentMoney`) adjustmentMoney,
SUM(sscd.onceItureCost + sscd.onceTreatCost + sscd.onceSuppCost + sscd.secondItureCost + sscd.secondTreatCost + sscd.secondSuppCost) AS money
FROM
scm_specialrebate_checkapply ssc
LEFT JOIN scm_specialrebate_checkapplydetail sscd
ON ssc.`sid` = sscd.`mainSid`
LEFT JOIN scm_special_rebate ssr
ON ssr.`sid` = sscd.`specialRebateSid`
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo">
SELECT * FROM scm_specialrebate_checkapply <where> ${ew.sqlSegment} </where>
</select>
<select id="selectBySid" resultType="int">
SELECT COUNT(*)

15
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java

@ -48,21 +48,8 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapp
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDto;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyFeign;
/**
* Project: anrui-scm(专项返利) <br/>
* File: ScmSpecialrebateCheckapplyFeignFallback.java <br/>
* Class: com.yxt.anrui.scm.biz.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyRest <br/>
* Description: 专项返利核对申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-09 09:14:10 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "专项返利核对申请表")
@RestController("com.yxt.anrui.scm.biz.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyRest")
@RestController
@RequestMapping("v1/scmspecialrebatecheckapply")
public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckapplyFeign {

153
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@ -50,6 +50,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialReb
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService;
@ -68,22 +69,10 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapp
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
/**
* Project: anrui-scm(专项返利) <br/>
* File: ScmSpecialrebateCheckapplyService.java <br/>
* Class: com.yxt.anrui.scm.biz.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyService <br/>
* Description: 专项返利核对申请表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-09 09:14:10 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpecialrebateCheckapplyMapper, ScmSpecialrebateCheckapply> {
@ -102,13 +91,6 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
@Autowired
private FlowFeign flowFeign;
private QueryWrapper<ScmSpecialrebateCheckapply> createQueryWrapper(ScmSpecialrebateCheckapplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmSpecialrebateCheckapply> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmSpecialrebateCheckapplyVo> listPageVo(PagerQuery<ScmSpecialrebateCheckapplyQuery> pq) {
ScmSpecialrebateCheckapplyQuery query = pq.getParams();
QueryWrapper<ScmSpecialrebateCheckapply> qw = new QueryWrapper<>();
@ -152,8 +134,8 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
return p;
}
}
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("ssc.brandSid", query.getBrandSid());
if (StringUtils.isNotBlank(query.getCreateOrgName())) {
qw.like("ssc.createOrgName", query.getCreateOrgName());
}
if (StringUtils.isNotBlank(query.getCheckApply())) {
qw.like("ssc.checkApply", query.getCheckApply());
@ -163,16 +145,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (ssc.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (ssc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.groupBy("ssc.sid");
qw.orderByDesc("ssc.createTime");
IPage<ScmSpecialrebateCheckapply> page = PagerUtil.queryToPage(pq);
IPage<ScmSpecialrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw);
List<ScmSpecialrebateCheckapplyVo> records = pagging.getRecords();
for (ScmSpecialrebateCheckapplyVo record : records) {
record.setEstimateRebate(record.getEstimateRebate().substring(0, record.getEstimateRebate().lastIndexOf(".")));
record.setUploadMoney(record.getUploadMoney().substring(0, record.getUploadMoney().lastIndexOf(".")));
record.setStayDetermineMoney(record.getStayDetermineMoney().substring(0, record.getStayDetermineMoney().lastIndexOf(".")));
record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0, record.getAdjustmentMoney().lastIndexOf(".")));
record.setMoney(record.getMoney().substring(0, record.getMoney().lastIndexOf(".")));
}
PagerVo<ScmSpecialrebateCheckapplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
@ -180,32 +156,15 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
public ResultBean saveOrUpdateDto(ScmSpecialrebateCheckapplyDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<ScmSpecialrebateCheckapplydetailDto> scmWhenSpecialrebateCheckapplydetailDetails = dto.getScmWhenSpecialrebateCheckapplydetailDetails();
List<ScmSpecialrebateCheckapplydetailDto> scmLastSpecialrebateCheckapplydetailDetails = dto.getScmLastSpecialrebateCheckapplydetailDetails();
if (scmWhenSpecialrebateCheckapplydetailDetails.size() < 1 && scmLastSpecialrebateCheckapplydetailDetails.size() < 1) {
List<ScmSpecialrebateCheckapplydetailDto> scmSpecialrebateCheckapplydetailDetails = dto.getScmSpecialrebateCheckapplydetailDetails();
if (scmSpecialrebateCheckapplydetailDetails.size() == 0) {
return rb.setMsg("请选择已核对专项返利信息");
}
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto).getData();
if (scmWhenSpecialrebateCheckapplydetailDetails.size() > 0) {
for (ScmSpecialrebateCheckapplydetailDto scmSpecialrebateCheckapplydetail : scmWhenSpecialrebateCheckapplydetailDetails) {
for (String SpecialRebateSid : scmSpecialrebateCheckapplydetail.getSpecialRebateSids()) {
ScmSpecialrebateCheckapplydetail scmSpecialrebateCheckapplydetail1 = new ScmSpecialrebateCheckapplydetail();
scmSpecialrebateCheckapplydetail1.setSpecialRebateSid(SpecialRebateSid);
scmSpecialrebateCheckapplydetail1.setMainSid(sid);
scmSpecialrebateCheckapplydetailService.save(scmSpecialrebateCheckapplydetail1);
}
}
}
if (scmLastSpecialrebateCheckapplydetailDetails.size() > 0) {
for (ScmSpecialrebateCheckapplydetailDto scmSpecialrebateCheckapplydetail : scmLastSpecialrebateCheckapplydetailDetails) {
for (String SpecialRebateSid : scmSpecialrebateCheckapplydetail.getSpecialRebateSids()) {
ScmSpecialrebateCheckapplydetail scmSpecialrebateCheckapplydetail1 = new ScmSpecialrebateCheckapplydetail();
scmSpecialrebateCheckapplydetail1.setSpecialRebateSid(SpecialRebateSid);
scmSpecialrebateCheckapplydetail1.setMainSid(sid);
scmSpecialrebateCheckapplydetailService.save(scmSpecialrebateCheckapplydetail1);
}
}
for (ScmSpecialrebateCheckapplydetailDto scmSpecialrebateCheckapplydetailDto : scmSpecialrebateCheckapplydetailDetails) {
scmSpecialrebateCheckapplydetailDto.setMainSid(sid);
scmSpecialrebateCheckapplydetailService.insertByDto(scmSpecialrebateCheckapplydetailDto);
}
return rb.success().setMsg("添加成功").setData(sid);
}
@ -215,25 +174,9 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
}
this.updateByDto(dto);
scmSpecialrebateCheckapplydetailService.delByMainSid(dtoSid);
if (scmWhenSpecialrebateCheckapplydetailDetails.size() > 0) {
for (ScmSpecialrebateCheckapplydetailDto scmSpecialrebateCheckapplydetail : scmWhenSpecialrebateCheckapplydetailDetails) {
for (String SpecialRebateSid : scmSpecialrebateCheckapplydetail.getSpecialRebateSids()) {
ScmSpecialrebateCheckapplydetail scmSpecialrebateCheckapplydetail1 = new ScmSpecialrebateCheckapplydetail();
scmSpecialrebateCheckapplydetail1.setSpecialRebateSid(SpecialRebateSid);
scmSpecialrebateCheckapplydetail1.setMainSid(dtoSid);
scmSpecialrebateCheckapplydetailService.save(scmSpecialrebateCheckapplydetail1);
}
}
}
if (scmLastSpecialrebateCheckapplydetailDetails.size() > 0) {
for (ScmSpecialrebateCheckapplydetailDto scmSpecialrebateCheckapplydetail : scmLastSpecialrebateCheckapplydetailDetails) {
for (String SpecialRebateSid : scmSpecialrebateCheckapplydetail.getSpecialRebateSids()) {
ScmSpecialrebateCheckapplydetail scmSpecialrebateCheckapplydetail1 = new ScmSpecialrebateCheckapplydetail();
scmSpecialrebateCheckapplydetail1.setSpecialRebateSid(SpecialRebateSid);
scmSpecialrebateCheckapplydetail1.setMainSid(dtoSid);
scmSpecialrebateCheckapplydetailService.save(scmSpecialrebateCheckapplydetail1);
}
}
for (ScmSpecialrebateCheckapplydetailDto scmSpecialrebateCheckapplydetailDto : scmSpecialrebateCheckapplydetailDetails) {
scmSpecialrebateCheckapplydetailDto.setMainSid(dtoSid);
scmSpecialrebateCheckapplydetailService.insertByDto(scmSpecialrebateCheckapplydetailDto);
}
return rb.success().setMsg("修改成功").setData(dtoSid);
}
@ -268,11 +211,6 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
String SpecialRebateSid = scmWhenSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid();
String[] SpecialRebateSids = SpecialRebateSid.split(",");
scmWhenSpecialrebateCheckapplydetailDetailsVo.setSpecialRebateSids(Arrays.asList(SpecialRebateSids));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setWithRebate(scmWhenSpecialrebateCheckapplydetailDetailsVo.getWithRebate().substring(0, scmWhenSpecialrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setUploadMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0, scmWhenSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0, scmWhenSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0, scmWhenSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getMoney().substring(0, scmWhenSpecialrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
}
}
scmSpecialrebateCheckapplyDetailsVo.setScmWhenSpecialrebateCheckapplydetailDetails(scmWhenSpecialrebateCheckapplydetailDetailsVos);
@ -282,20 +220,35 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
String SpecialRebateSid = scmLastSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid();
String[] SpecialRebateSids = SpecialRebateSid.split(",");
scmLastSpecialrebateCheckapplydetailDetailsVo.setSpecialRebateSids(Arrays.asList(SpecialRebateSids));
scmLastSpecialrebateCheckapplydetailDetailsVo.setWithRebate(scmLastSpecialrebateCheckapplydetailDetailsVo.getWithRebate().substring(0, scmLastSpecialrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setUploadMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0, scmLastSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0, scmLastSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0, scmLastSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getMoney().substring(0, scmLastSpecialrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
String withholdingDate = scmLastSpecialrebateCheckapplydetailDetailsVo.getWithholdingDate();
Date parse = DateUtil.parse(withholdingDate);
int year = DateUtil.year(parse);
int month = DateUtil.month(parse) + 1;
String withholdingDateCopy = year + "年" + month + "月";
scmLastSpecialrebateCheckapplydetailDetailsVo.setWithholdingDateCopy(withholdingDateCopy);
}
}
scmSpecialrebateCheckapplyDetailsVo.setScmLastSpecialrebateCheckapplydetailDetails(scmLastSpecialrebateCheckapplydetailDetailsVos);
List<ScmSpecialrebateCheckapplydetailVo> scmSpecialrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(sid);
if (scmSpecialrebateCheckapplydetailVos.size() > 0) {
for (ScmSpecialrebateCheckapplydetailVo s : scmSpecialrebateCheckapplydetailVos) {
BigDecimal money = BigDecimal.ZERO;
if (null != s.getOnceItureCost()) {
money = money.add(s.getOnceItureCost());
}
if (null != s.getOnceTreatCost()) {
money = money.add(s.getOnceTreatCost());
}
if (null != s.getOnceSuppCost()) {
money = money.add(s.getOnceSuppCost());
}
if (null != s.getSecondItureCost()) {
money = money.add(s.getSecondItureCost());
}
if (null != s.getSecondTreatCost()) {
money = money.add(s.getSecondTreatCost());
}
if (null != s.getSecondSuppCost()) {
money = money.add(s.getSecondSuppCost());
}
s.setMoney(money.toString());
}
}
scmSpecialrebateCheckapplyDetailsVo.setScmSpecialrebateCheckapplydetailDetails(scmSpecialrebateCheckapplydetailVos);
return rb.success().setData(scmSpecialrebateCheckapplyDetailsVo);
}
@ -361,13 +314,13 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
//流程定义id
bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId());
//查询单车明细
List<ScmSpecialrebateCheckapplydetailDetailsVo> scmSpecialrebateCheckapplydetailDetailsVos = scmSpecialrebateCheckapplydetailService.selByMainSid(dto.getSid());
List<ScmSpecialrebateCheckapplydetailVo> scmSpecialrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(dto.getSid());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
for (ScmSpecialrebateCheckapplydetailDetailsVo scmSpecialrebateCheckapplydetailDetailsVo : scmSpecialrebateCheckapplydetailDetailsVos) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid(), 3);
for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 3);
}
return voResultBean;
}
@ -380,8 +333,8 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
bv.setTaskDefKey(scmSpecialrebateCheckapply.getNodeSid());
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
bv.setInstanceId(dto.getInstanceId());
for (ScmSpecialrebateCheckapplydetailDetailsVo scmSpecialrebateCheckapplydetailDetailsVo : scmSpecialrebateCheckapplydetailDetailsVos) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid(), 3);
for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 3);
}
return complete(bv);
}
@ -430,9 +383,9 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
List<ScmSpecialrebateCheckapplydetailDetailsVo> scmSpecialrebateCheckapplydetailDetailsVos = scmSpecialrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid());
for (ScmSpecialrebateCheckapplydetailDetailsVo scmSpecialrebateCheckapplydetailDetailsVo : scmSpecialrebateCheckapplydetailDetailsVos) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid(), 4);
List<ScmSpecialrebateCheckapplydetailVo> scmSpecialrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid());
for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 4);
}
}
return rb.success().setData(resultBean.getData());
@ -499,7 +452,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
}
ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(query.getBusinessSid());
String businessTaskId = scmSpecialrebateCheckapply.getTaskId();
List<ScmSpecialrebateCheckapplydetailDetailsVo> scmSpecialrebateCheckapplydetailDetailsVos = scmSpecialrebateCheckapplydetailService.selByMainSid(query.getBusinessSid());
List<ScmSpecialrebateCheckapplydetailVo> scmSpecialrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(query.getBusinessSid());
if (StringUtils.isNotBlank(businessTaskId)) {
if (query.getUserSid().equals(scmSpecialrebateCheckapply.getCreateBySid())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
@ -510,8 +463,8 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
for (ScmSpecialrebateCheckapplydetailDetailsVo scmSpecialrebateCheckapplydetailDetailsVo : scmSpecialrebateCheckapplydetailDetailsVos) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid(), 2);
for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 2);
}
return rb.success().setData(resultBean.getData());
} else {
@ -524,8 +477,8 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
for (ScmSpecialrebateCheckapplydetailDetailsVo scmSpecialrebateCheckapplydetailDetailsVo : scmSpecialrebateCheckapplydetailDetailsVos) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid(), 2);
for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 2);
}
return rb.success().setData(resultBean.getData());
}

27
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java

@ -30,6 +30,7 @@ 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.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -39,32 +40,11 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCh
import java.util.List;
/**
* Project: anrui-scm(专项返利) <br/>
* File: ScmSpecialrebateCheckapplydetailMapper.java <br/>
* Class: com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailMapper <br/>
* Description: 专项返利核对申请表_返利列表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-09 09:14:10 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface ScmSpecialrebateCheckapplydetailMapper extends BaseMapper<ScmSpecialrebateCheckapplydetail> {
//@Update("update scm_specialrebate_checkapplydetail set name=#{msg} where id=#{id}")
//IPage<ScmSpecialrebateCheckapplydetailVo> voPage(IPage<ScmSpecialrebateCheckapplydetail> page, @Param(Constants.WRAPPER) QueryWrapper<ScmSpecialrebateCheckapplydetail> qw);
IPage<ScmSpecialrebateCheckapplydetailVo> selectPageVo(IPage<ScmSpecialrebateCheckapplydetail> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialrebateCheckapplydetail> qw);
List<ScmSpecialrebateCheckapplydetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmSpecialrebateCheckapplydetail> qw);
@Select("select * from scm_specialrebate_checkapplydetail")
List<ScmSpecialrebateCheckapplydetailVo> selectListVo();
@Delete("delete from scm_specialrebate_checkapplydetail where mainSid = #{sid}")
void delByMainSid(String sid);
@ -73,5 +53,8 @@ public interface ScmSpecialrebateCheckapplydetailMapper extends BaseMapper<ScmSp
List<ScmSpecialrebateCheckapplydetailDetailsVo> fetchLastDetailsVoBySid(String sid);
@Select("select * from scm_specialrebate_checkapplydetail where mainSid = #{sid}")
List<ScmSpecialrebateCheckapplydetailDetailsVo> selByMainSid(String sid);
List<ScmSpecialrebateCheckapplydetailVo> selByMainSid(String sid);
@Select("select * from scm_specialrebate_checkapplydetail where specialRebateSid = #{specialRebateSid}")
ScmSpecialrebateCheckapplydetailVo fetchBySpecialRebateSid(String specialRebateSid);
}

40
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml

@ -6,46 +6,36 @@
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo">
SELECT * FROM scm_specialrebate_checkapplydetail <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo">
SELECT * FROM scm_specialrebate_checkapplydetail <where> ${ew.sqlSegment} </where>
</select>
<select id="fetchWhenDetailsVoBySid"
resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo">
SELECT ssr.rebateTypeKey,
ssr.`rebateTypeValue`,
SUM(ssr.`estimateRebate`) withRebate,
SELECT ssc.rebateTypeKey,
ssc.`rebateTypeValue`,
SUM(ssc.`estimateRebate`) withRebate,
COUNT(*) num,
GROUP_CONCAT(ssc.`specialRebateSid`) specialRebateSid,
SUM(ssr.`uploadMoney`) uploadMoney,
SUM(ssr.`stayDetermineMoney`) stayDetermineMoney,
SUM(ssr.`adjustmentMoney`) adjustmentMoney,
SUM(ssr.`money`) money
SUM(ssc.`uploadMoney`) uploadMoney,
SUM(ssc.`stayDetermineMoney`) stayDetermineMoney,
SUM(ssc.`adjustmentMoney`) adjustmentMoney,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost) AS money
FROM scm_specialrebate_checkapplydetail ssc
LEFT JOIN scm_special_rebate ssr
ON ssr.`sid` = ssc.`specialRebateSid`
WHERE ssc.`mainSid` = #{sid}
AND DATE_FORMAT(ssr.withholdingDate, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
GROUP BY ssr.`rebateTypeKey`
GROUP BY ssc.`rebateTypeKey`
</select>
<select id="fetchLastDetailsVoBySid"
resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo">
SELECT ssr.withholdingDate,
SUM(ssr.`estimateRebate`) withRebate,
SELECT ssc.withholdingDate,
SUM(ssc.`estimateRebate`) withRebate,
COUNT(*) withholdingAmount,
COUNT(*) uploadAmount,
GROUP_CONCAT(ssc.`specialRebateSid`) specialRebateSid,
SUM(ssr.`uploadMoney`) uploadMoney,
SUM(ssr.`stayDetermineMoney`) stayDetermineMoney,
SUM(ssr.`adjustmentMoney`) adjustmentMoney,
SUM(ssr.`money`) money
SUM(ssc.`uploadMoney`) uploadMoney,
SUM(ssc.`stayDetermineMoney`) stayDetermineMoney,
SUM(ssc.`adjustmentMoney`) adjustmentMoney,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost) AS money
FROM scm_specialrebate_checkapplydetail ssc
LEFT JOIN scm_special_rebate ssr
ON ssr.`sid` = ssc.`specialRebateSid`
WHERE ssc.`mainSid` = #{sid}
AND DATE_FORMAT(ssr.withholdingDate, '%Y%m') != DATE_FORMAT(CURDATE(), '%Y%m')
GROUP BY ssr.withholdingDate
GROUP BY ssc.withholdingDate
</select>
</mapper>

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java

@ -28,6 +28,7 @@ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail;
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.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -120,7 +121,11 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService<
return baseMapper.fetchLastDetailsVoBySid(sid);
}
public List<ScmSpecialrebateCheckapplydetailDetailsVo> selByMainSid(String sid) {
public List<ScmSpecialrebateCheckapplydetailVo> selByMainSid(String sid) {
return baseMapper.selByMainSid(sid);
}
public ScmSpecialrebateCheckapplydetailVo fetchBySpecialRebateSid(String specialRebateSid) {
return baseMapper.fetchBySpecialRebateSid(specialRebateSid);
}
}

16
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java

@ -30,7 +30,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebate;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService;
import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -68,6 +71,8 @@ public class ScmSpecialRebateWithService extends MybatisBaseService<ScmSpecialRe
@Autowired
private ScmSpecialRebateService scmSpecialRebateService;
@Autowired
private ScmSpecialrebateCheckapplydetailService scmSpecialrebateCheckapplydetailService;
private QueryWrapper<ScmSpecialRebateWith> createQueryWrapper(ScmSpecialRebateWithQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -134,10 +139,13 @@ public class ScmSpecialRebateWithService extends MybatisBaseService<ScmSpecialRe
List<ScmSpecialRebateDetailsVo> scmSpecialRebateDetailsVos = new ArrayList<>();
String[] sids = sid.split(",");
for (String s : sids) {
ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(s);
ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = new ScmSpecialRebateDetailsVo();
BeanUtil.copyProperties(scmSpecialRebate,scmSpecialRebateDetailsVo);
scmSpecialRebateDetailsVos.add(scmSpecialRebateDetailsVo);
ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo = scmSpecialrebateCheckapplydetailService.fetchBySpecialRebateSid(s);
if (scmSpecialrebateCheckapplydetailVo != null){
ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = new ScmSpecialRebateDetailsVo();
BeanUtil.copyProperties(scmSpecialrebateCheckapplydetailVo,scmSpecialRebateDetailsVo);
scmSpecialRebateDetailsVo.setMoney(scmSpecialrebateCheckapplydetailVo.getOnceItureCost().add(scmSpecialrebateCheckapplydetailVo.getOnceTreatCost()).add(scmSpecialrebateCheckapplydetailVo.getOnceSuppCost()).add(scmSpecialrebateCheckapplydetailVo.getSecondItureCost()).add(scmSpecialrebateCheckapplydetailVo.getSecondTreatCost()).add(scmSpecialrebateCheckapplydetailVo.getSecondSuppCost()).toString());
scmSpecialRebateDetailsVos.add(scmSpecialRebateDetailsVo);
}
}
return rb.success().setData(scmSpecialRebateDetailsVos);
}

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java

@ -59,10 +59,7 @@ public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
IPage<ScmVehRebateVo> selectPageVo(IPage<ScmVehRebate> page, @Param(Constants.WRAPPER) Wrapper<ScmVehRebate> qw);
List<ScmVehRebateVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehRebate> qw);
@Select("select * from scm_veh_rebate")
List<ScmVehRebateVo> selectListVo();
IPage<ScmVehRebateVo> selectPageVoUpload(IPage<ScmVehRebate> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehRebate> qw);
@Update("update scm_veh_rebate set state = #{state} where sid = #{sid}")
void updateState(@Param("sid") String sid, @Param("state") Integer state);

13
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml

@ -10,11 +10,18 @@
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
SELECT * FROM scm_veh_rebate
<select id="selectPageVoUpload" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
SELECT *,sid vehRebateSid FROM scm_veh_rebate
<where>
${ew.sqlSegment}
</where>
</where> AND ((
onceCheckState = 1
AND isAdjustment = '是'
)
OR (
onceCheckState = 0
AND uploadDate IS NOT NULL
))
</select>
<select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@ -459,12 +459,11 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
);
qw.eq("adjustmentState", 0);
qw.eq("state", 2);
qw.and(wrapper -> wrapper.eq("onceCheckState", 1).eq("isAdjustment", "是")).or(wrapper -> wrapper.eq("onceCheckState", 0).isNotNull("uploadDate"));
if (query.getSidList().size() > 0) {
qw.notIn("sid", query.getSidList());
}
IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVoUpload(page, qw);
for (ScmVehRebateVo record : pagging.getRecords()) {
//其中费用
record.setMoney(record.getOnceTreatCost().add(record.getOnceSuppCost()).add(record.getSecondTreatCost()).add(record.getSecondSuppCost()));

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@ -103,13 +103,6 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
@Autowired
private FlowFeign flowFeign;
private QueryWrapper<ScmVehrebateCheckapply> createQueryWrapper(ScmVehrebateCheckapplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmVehrebateCheckapply> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmVehrebateCheckapplyVo> listPageVo(PagerQuery<ScmVehrebateCheckapplyQuery> pq) {
ScmVehrebateCheckapplyQuery query = pq.getParams();
QueryWrapper<ScmVehrebateCheckapply> qw = new QueryWrapper<>();

10
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java

@ -149,10 +149,12 @@ public class ScmVehRebateWithService extends MybatisBaseService<ScmVehRebateWith
String[] sids = sid.split(",");
for (String s : sids) {
ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo = scmVehrebateCheckapplydetailService.selByVehRebteSid(s);
ScmVehRebateDetailsVo scmVehRebateDetailsVo = new ScmVehRebateDetailsVo();
BeanUtil.copyProperties(scmVehrebateCheckapplydetailVo,scmVehRebateDetailsVo);
scmVehRebateDetailsVo.setMoney(scmVehrebateCheckapplydetailVo.getOnceTreatCost().add(scmVehrebateCheckapplydetailVo.getOnceSuppCost()).add(scmVehrebateCheckapplydetailVo.getSecondTreatCost()).add(scmVehrebateCheckapplydetailVo.getSecondSuppCost()).toString());
scmVehRebateDetailsVos.add(scmVehRebateDetailsVo);
if (scmVehrebateCheckapplydetailVo != null){
ScmVehRebateDetailsVo scmVehRebateDetailsVo = new ScmVehRebateDetailsVo();
BeanUtil.copyProperties(scmVehrebateCheckapplydetailVo,scmVehRebateDetailsVo);
scmVehRebateDetailsVo.setMoney(scmVehrebateCheckapplydetailVo.getOnceTreatCost().add(scmVehrebateCheckapplydetailVo.getOnceSuppCost()).add(scmVehrebateCheckapplydetailVo.getSecondTreatCost()).add(scmVehrebateCheckapplydetailVo.getSecondSuppCost()).toString());
scmVehRebateDetailsVos.add(scmVehRebateDetailsVo);
}
}
return rb.success().setData(scmVehRebateDetailsVos);
}

Loading…
Cancel
Save