diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java index 8e108c191d..6d7245ad41 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.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.scmcollectionrebate.ScmCollectionRebate; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; @@ -65,5 +66,5 @@ public interface ScmCollectionrebateCheckapplydetailMapper extends BaseMapper selByMainSid(String s); - ScmCollectionRebate selByCollectionRebateSid(String collectionRebateSid); + List selByCollectionRebateSid(String mainSid); } \ No newline at end of file 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 b18584e814..b753a7a01a 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 @@ -36,11 +36,11 @@ GROUP BY scc.withholdingDate - select sa.createOrgName,sa.remarks,sd.* from scm_collectionrebate_checkapplydetail sd left join scm_collectionrebate_checkapply sa on sd.mainSid = sa.sid - where sd.collectionRebateSid = #{collectionRebateSid} + where sd.mainSid = #{mainSid} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java index 50fa214e51..c51d984705 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java @@ -110,16 +110,7 @@ public class ScmCollectionrebateCheckapplydetailService extends MybatisBaseServi public ResultBean> collectionRebateCheckDetails(String sid) { ResultBean rb = ResultBean.fireFail(); - List scmCollectionRebateDetailsVos = new ArrayList<>(); - String[] sids = sid.split(","); - for (String s : sids) { - ScmCollectionRebate scmCollectionRebate = baseMapper.selByCollectionRebateSid(s); - if (scmCollectionRebate != null){ - ScmCollectionRebateDetailsVo scmCollectionRebateDetailsVo = new ScmCollectionRebateDetailsVo(); - BeanUtil.copyProperties(scmCollectionRebate,scmCollectionRebateDetailsVo); - scmCollectionRebateDetailsVos.add(scmCollectionRebateDetailsVo); - } - } + List scmCollectionRebateDetailsVos = baseMapper.selByCollectionRebateSid(sid); return rb.success().setData(scmCollectionRebateDetailsVos); } 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 33742b4d13..6377ca2e39 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 @@ -56,5 +56,5 @@ public interface ScmSpecialrebateCheckapplydetailMapper extends BaseMapper selByMainSid(String sid); - ScmSpecialRebateDetailsVo fetchBySpecialRebateSid(String specialRebateSid); + List fetchBySpecialRebateSid(String mainSid); } \ 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 ac687072e3..c9c76b8d00 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 @@ -54,6 +54,6 @@ FROM scm_specialrebate_checkapplydetail sd LEFT JOIN scm_specialrebate_checkapply sc ON sd.mainSid = sc.sid - WHERE specialRebateSid = #{specialRebateSid} + WHERE sd.mainSid = #{mainSid} \ 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 92ce35bc09..88f4710f7e 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 @@ -63,82 +63,77 @@ import java.util.List; */ @Service public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(ScmSpecialrebateCheckapplydetailQuery 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) { - ScmSpecialrebateCheckapplydetailQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(ScmSpecialrebateCheckapplydetailDto dto){ + private QueryWrapper createQueryWrapper(ScmSpecialrebateCheckapplydetailQuery 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) { + ScmSpecialrebateCheckapplydetailQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmSpecialrebateCheckapplydetailDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(ScmSpecialrebateCheckapplydetailDto dto){ - ScmSpecialrebateCheckapplydetail entity = new ScmSpecialrebateCheckapplydetail(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(ScmSpecialrebateCheckapplydetailDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmSpecialrebateCheckapplydetailDto dto) { + ScmSpecialrebateCheckapplydetail entity = new ScmSpecialrebateCheckapplydetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmSpecialrebateCheckapplydetailDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - ScmSpecialrebateCheckapplydetail entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public ScmSpecialrebateCheckapplydetailDetailsVo fetchDetailsVoBySid(String sid){ - ScmSpecialrebateCheckapplydetail entity = fetchBySid(sid); - ScmSpecialrebateCheckapplydetailDetailsVo vo = new ScmSpecialrebateCheckapplydetailDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + ScmSpecialrebateCheckapplydetail entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmSpecialrebateCheckapplydetailDetailsVo fetchDetailsVoBySid(String sid) { + ScmSpecialrebateCheckapplydetail entity = fetchBySid(sid); + ScmSpecialrebateCheckapplydetailDetailsVo vo = new ScmSpecialrebateCheckapplydetailDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } - public void delByMainSid(String sid) { - baseMapper.delByMainSid(sid); - } + public void delByMainSid(String sid) { + baseMapper.delByMainSid(sid); + } - public List fetchWhenDetailsVoBySid(String sid) { - return baseMapper.fetchWhenDetailsVoBySid(sid); - } + public List fetchWhenDetailsVoBySid(String sid) { + return baseMapper.fetchWhenDetailsVoBySid(sid); + } - public List fetchLastDetailsVoBySid(String sid) { - return baseMapper.fetchLastDetailsVoBySid(sid); - } + public List fetchLastDetailsVoBySid(String sid) { + return baseMapper.fetchLastDetailsVoBySid(sid); + } public List selByMainSid(String sid) { - return baseMapper.selByMainSid(sid); + return baseMapper.selByMainSid(sid); } - public ResultBean> specialRebateCheckDetails(String sid) { - ResultBean rb = ResultBean.fireFail(); - List scmSpecialRebateDetailsVos = new ArrayList<>(); - String[] sids = sid.split(","); - for (String s : sids) { - ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = baseMapper.fetchBySpecialRebateSid(s); - if (scmSpecialRebateDetailsVo != null){ - scmSpecialRebateDetailsVo.setWithholdCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost())); - scmSpecialRebateDetailsVo.setMoney(scmSpecialRebateDetailsVo.getOnceItureCost().add(scmSpecialRebateDetailsVo.getOnceTreatCost()).add(scmSpecialRebateDetailsVo.getOnceSuppCost()).add(scmSpecialRebateDetailsVo.getSecondItureCost()).add(scmSpecialRebateDetailsVo.getSecondTreatCost()).add(scmSpecialRebateDetailsVo.getSecondSuppCost()).toString()); - scmSpecialRebateDetailsVos.add(scmSpecialRebateDetailsVo); - } - } - return rb.success().setData(scmSpecialRebateDetailsVos); - } + public ResultBean> specialRebateCheckDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + List scmSpecialRebateDetailsVos = baseMapper.fetchBySpecialRebateSid(sid); + for (ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo : scmSpecialRebateDetailsVos) { + scmSpecialRebateDetailsVo.setWithholdCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost())); + scmSpecialRebateDetailsVo.setMoney(scmSpecialRebateDetailsVo.getOnceItureCost().add(scmSpecialRebateDetailsVo.getOnceTreatCost()).add(scmSpecialRebateDetailsVo.getOnceSuppCost()).add(scmSpecialRebateDetailsVo.getSecondItureCost()).add(scmSpecialRebateDetailsVo.getSecondTreatCost()).add(scmSpecialRebateDetailsVo.getSecondSuppCost()).toString()); + } + return rb.success().setData(scmSpecialRebateDetailsVos); + } } \ No newline at end of file