From 044f9bccc1a7c98e12585c4885d6a215d9685121 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 10 Oct 2024 09:10:44 +0800 Subject: [PATCH 1/4] 1 --- .../ScmSpecialRebateQuery.java | 2 + .../api/scmvehrebate/ScmVehRebateFeign.java | 2 +- .../ScmSpecialRebateMapper.java | 8 +-- .../ScmSpecialRebateMapper.xml | 18 ++++- .../ScmSpecialRebateService.java | 65 ++++--------------- .../ScmSpecialrebateCheckapplyMapper.xml | 2 +- ...ScmSpecialrebateCheckapplydetailMapper.xml | 6 +- .../biz/scmvehrebate/ScmVehRebateMapper.java | 5 +- .../biz/scmvehrebate/ScmVehRebateMapper.xml | 13 +++- .../biz/scmvehrebate/ScmVehRebateService.java | 3 +- 10 files changed, 46 insertions(+), 78 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java index 00bdba06c3..e902b5252c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java +++ b/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 sidList; // 专项返利sid diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java index 2402ca01af..b9e13c3f87 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java +++ b/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") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java index fb08fd9385..ae5de6e018 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java +++ b/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 { - //@Update("update scm_special_rebate set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from scm_special_rebate") - List selectListVo(); + IPage selectPageVoUpload(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); @Update("update scm_special_rebate set state = #{state} where sid = #{specialRebateSid}") void updateState(@Param("specialRebateSid") String specialRebateSid, @Param("state") Integer state); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml index e56f9ad0df..8726f73c72 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml @@ -5,18 +5,30 @@ - + SELECT *, + expectItureCost + expectTreatCost + expectSuppCost AS expectCost, + onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money + FROM scm_special_rebate ${ew.sqlSegment} + AND (( + onceCheckState = 1 + AND isAdjustment = '是' + ) + OR ( + onceCheckState = 0 + AND uploadDate IS NOT NULL + )) SELECT * FROM scm_specialrebate_checkapplydetail ${ew.sqlSegment} - + @@ -21,7 +21,7 @@ SUM(ssr.`uploadMoney`) uploadMoney, SUM(ssr.`stayDetermineMoney`) stayDetermineMoney, SUM(ssr.`adjustmentMoney`) adjustmentMoney, - SUM(ssr.`money`) money + SUM(ssr.onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost) AS money FROM scm_specialrebate_checkapplydetail ssc LEFT JOIN scm_special_rebate ssr ON ssr.`sid` = ssc.`specialRebateSid` @@ -40,7 +40,7 @@ SUM(ssr.`uploadMoney`) uploadMoney, SUM(ssr.`stayDetermineMoney`) stayDetermineMoney, SUM(ssr.`adjustmentMoney`) adjustmentMoney, - SUM(ssr.`money`) money + SUM(ssr.onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost) AS money FROM scm_specialrebate_checkapplydetail ssc LEFT JOIN scm_special_rebate ssr ON ssr.`sid` = ssc.`specialRebateSid` diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java index b93712750f..146c476dd8 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java +++ b/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 { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from scm_veh_rebate") - List selectListVo(); + IPage selectPageVoUpload(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); @Update("update scm_veh_rebate set state = #{state} where sid = #{sid}") void updateState(@Param("sid") String sid, @Param("state") Integer state); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml index bcfe161f17..4e561a203f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml @@ -10,11 +10,18 @@ - + SELECT *,sid vehRebateSid FROM scm_veh_rebate ${ew.sqlSegment} - + AND (( + onceCheckState = 1 + AND isAdjustment = '是' + ) + OR ( + onceCheckState = 0 + AND uploadDate IS NOT NULL + )) - - - - SELECT ssc.*, - SUM(ssr.`estimateRebate`) estimateRebate, - SUM(ssr.`uploadMoney`) uploadMoney, - SUM(ssr.`stayDetermineMoney`) stayDetermineMoney, - SUM(ssr.`adjustmentMoney`) adjustmentMoney, - SUM(ssr.onceItureCost + ssr.onceTreatCost + ssr.onceSuppCost + ssr.secondItureCost + ssr.secondTreatCost + ssr.secondSuppCost) AS 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` ${ew.sqlSegment} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java index 2d2b19c8d5..3e0fa22781 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java +++ b/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(专项返利)
- * File: ScmSpecialrebateCheckapplyFeignFallback.java
- * Class: com.yxt.anrui.scm.biz.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyRest
- * Description: 专项返利核对申请表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-09-09 09:14:10
- * - * @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 { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java index 218121e258..c07de248da 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java @@ -134,8 +134,8 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService= 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 page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); - List records = pagging.getRecords(); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java index 7a943538e8..d643acc9bd 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java +++ b/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; @@ -53,4 +54,7 @@ public interface ScmSpecialrebateCheckapplydetailMapper extends BaseMapper selByMainSid(String sid); + + @Select("select * from scm_specialrebate_checkapplydetail where specialRebateSid = #{specialRebateSid}") + ScmSpecialrebateCheckapplydetailVo fetchBySpecialRebateSid(String specialRebateSid); } \ 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 b8228f9865..92b2e4b441 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 @@ -9,39 +9,33 @@ \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java index 0d6c4365b4..1c8bd00a4b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java +++ b/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; @@ -123,4 +124,8 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService< public List selByMainSid(String sid) { return baseMapper.selByMainSid(sid); } + + public ScmSpecialrebateCheckapplydetailVo fetchBySpecialRebateSid(String specialRebateSid) { + return baseMapper.fetchBySpecialRebateSid(specialRebateSid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java index 3d78a28d34..915462c7be 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java +++ b/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 createQueryWrapper(ScmSpecialRebateWithQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -134,10 +139,13 @@ public class ScmSpecialRebateWithService extends MybatisBaseService 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); } 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 931f553c67..c34b9d36cc 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 @@ -103,13 +103,6 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService createQueryWrapper(ScmVehrebateCheckapplyQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - public PagerVo listPageVo(PagerQuery pq) { ScmVehrebateCheckapplyQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java index d6c2434fb2..43dcc30149 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java +++ b/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