|
|
|
|
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
|
|
import com.klp.common.utils.StringUtils;
|
|
|
|
|
import com.klp.domain.bo.WmsMaterialCoilBo;
|
|
|
|
|
import com.klp.domain.vo.WmsMaterialCoilVo;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
import com.klp.crm.domain.bo.CrmSalesObjectionBo;
|
|
|
|
|
@@ -14,10 +16,12 @@ import com.klp.crm.domain.vo.CrmSalesObjectionVo;
|
|
|
|
|
import com.klp.crm.domain.CrmSalesObjection;
|
|
|
|
|
import com.klp.crm.mapper.CrmSalesObjectionMapper;
|
|
|
|
|
import com.klp.crm.service.ICrmSalesObjectionService;
|
|
|
|
|
import com.klp.service.IWmsMaterialCoilService;
|
|
|
|
|
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import java.util.Collection;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 销售异议管理Service业务层处理
|
|
|
|
|
@@ -30,13 +34,21 @@ import java.util.Collection;
|
|
|
|
|
public class CrmSalesObjectionServiceImpl implements ICrmSalesObjectionService {
|
|
|
|
|
|
|
|
|
|
private final CrmSalesObjectionMapper baseMapper;
|
|
|
|
|
private final IWmsMaterialCoilService wmsMaterialCoilService;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 查询销售异议管理
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public CrmSalesObjectionVo queryById(String objectionId){
|
|
|
|
|
return baseMapper.selectVoById(objectionId);
|
|
|
|
|
CrmSalesObjectionVo vo = baseMapper.selectVoById(objectionId);
|
|
|
|
|
if (vo != null && StringUtils.isNotBlank(vo.getCoilIds())) {
|
|
|
|
|
com.klp.domain.bo.WmsMaterialCoilBo coilBo = new com.klp.domain.bo.WmsMaterialCoilBo();
|
|
|
|
|
coilBo.setCoilIds(vo.getCoilIds());
|
|
|
|
|
List<com.klp.domain.vo.WmsMaterialCoilVo> coilList = wmsMaterialCoilService.queryList(coilBo);
|
|
|
|
|
vo.setCoilList(coilList);
|
|
|
|
|
}
|
|
|
|
|
return vo;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
@@ -46,6 +58,17 @@ public class CrmSalesObjectionServiceImpl implements ICrmSalesObjectionService {
|
|
|
|
|
public TableDataInfo<CrmSalesObjectionVo> queryPageList(CrmSalesObjectionBo bo, PageQuery pageQuery) {
|
|
|
|
|
LambdaQueryWrapper<CrmSalesObjection> lqw = buildQueryWrapper(bo);
|
|
|
|
|
Page<CrmSalesObjectionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
|
|
|
|
|
|
|
|
|
// 查询钢卷信息并填充到VO中
|
|
|
|
|
for (CrmSalesObjectionVo vo : result.getRecords()) {
|
|
|
|
|
if (StringUtils.isNotBlank(vo.getCoilIds())) {
|
|
|
|
|
WmsMaterialCoilBo coilBo = new WmsMaterialCoilBo();
|
|
|
|
|
coilBo.setCoilIds(vo.getCoilIds());
|
|
|
|
|
List<WmsMaterialCoilVo> coilList = wmsMaterialCoilService.queryList(coilBo);
|
|
|
|
|
vo.setCoilList(coilList);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TableDataInfo.build(result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -55,7 +78,19 @@ public class CrmSalesObjectionServiceImpl implements ICrmSalesObjectionService {
|
|
|
|
|
@Override
|
|
|
|
|
public List<CrmSalesObjectionVo> queryList(CrmSalesObjectionBo bo) {
|
|
|
|
|
LambdaQueryWrapper<CrmSalesObjection> lqw = buildQueryWrapper(bo);
|
|
|
|
|
return baseMapper.selectVoList(lqw);
|
|
|
|
|
List<CrmSalesObjectionVo> resultList = baseMapper.selectVoList(lqw);
|
|
|
|
|
|
|
|
|
|
// 查询钢卷信息并填充到VO中
|
|
|
|
|
for (CrmSalesObjectionVo vo : resultList) {
|
|
|
|
|
if (StringUtils.isNotBlank(vo.getCoilIds())) {
|
|
|
|
|
com.klp.domain.bo.WmsMaterialCoilBo coilBo = new com.klp.domain.bo.WmsMaterialCoilBo();
|
|
|
|
|
coilBo.setCoilIds(vo.getCoilIds());
|
|
|
|
|
List<com.klp.domain.vo.WmsMaterialCoilVo> coilList = wmsMaterialCoilService.queryList(coilBo);
|
|
|
|
|
vo.setCoilList(coilList);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return resultList;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private LambdaQueryWrapper<CrmSalesObjection> buildQueryWrapper(CrmSalesObjectionBo bo) {
|
|
|
|
|
@@ -75,6 +110,7 @@ public class CrmSalesObjectionServiceImpl implements ICrmSalesObjectionService {
|
|
|
|
|
lqw.eq(bo.getReturnDate() != null, CrmSalesObjection::getReturnDate, bo.getReturnDate());
|
|
|
|
|
lqw.like(StringUtils.isNotBlank(bo.getComplaintContent()), CrmSalesObjection::getComplaintContent, bo.getComplaintContent());
|
|
|
|
|
lqw.like(StringUtils.isNotBlank(bo.getCustomerDemand()), CrmSalesObjection::getCustomerDemand, bo.getCustomerDemand());
|
|
|
|
|
lqw.like(StringUtils.isNotBlank(bo.getCoilIds()), CrmSalesObjection::getCoilIds, bo.getCoilIds());
|
|
|
|
|
return lqw;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|