package cn.shlanbao.qms.service.impl;
|
|
import cn.shlanbao.qms.domain.LbSensorRetest;
|
import cn.shlanbao.qms.domain.vo.LbRetestResultVo;
|
import cn.shlanbao.qms.domain.vo.LbSensorRetestVo;
|
import cn.shlanbao.qms.mapper.LbSensorRetestMapper;
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
import org.dromara.common.core.utils.MapstructUtils;
|
import org.dromara.common.core.utils.StringUtils;
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import lombok.RequiredArgsConstructor;
|
import org.springframework.beans.BeanUtils;
|
import org.springframework.stereotype.Service;
|
import cn.shlanbao.qms.domain.bo.LbSensorResultBo;
|
import cn.shlanbao.qms.domain.vo.LbSensorResultVo;
|
import cn.shlanbao.qms.domain.LbSensorResult;
|
import cn.shlanbao.qms.mapper.LbSensorResultMapper;
|
import cn.shlanbao.qms.service.ILbSensorResultService;
|
|
import java.util.*;
|
|
/**
|
* 批次明细Service业务层处理
|
*
|
* @author bsw
|
* @date 2024-12-27
|
*/
|
@RequiredArgsConstructor
|
@Service
|
public class LbSensorResultServiceImpl implements ILbSensorResultService {
|
|
private final LbSensorResultMapper baseMapper;
|
|
private final LbSensorRetestMapper retestBaseMapper;
|
|
/**
|
* 查询批次明细
|
*
|
* @param batchCode 主键
|
* @return 批次明细
|
*/
|
@Override
|
public LbSensorResultVo queryById(String batchCode){
|
return baseMapper.selectVoById(batchCode);
|
}
|
|
@Override
|
public TableDataInfo<LbSensorResultVo> queryPageList(LbSensorResultBo bo, PageQuery pageQuery) {
|
LambdaQueryWrapper<LbSensorResult> lqw = buildQueryWrapper(bo);
|
Page<LbSensorResultVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
List<LbSensorResultVo> records = result.getRecords();
|
|
|
queryReTest(records);
|
return TableDataInfo.build(result);
|
}
|
|
private void queryReTest(List<LbSensorResultVo> records) {
|
records.forEach(record -> {
|
// 创建子元素列表
|
List<LbSensorResultVo> children = new ArrayList<>();
|
List<LbSensorRetestVo> retestRecords = retestBaseMapper.selectRetestByBatchCodeAndTestNum(record.getBatchCode(), record.getTestNum());
|
retestRecords.forEach(retestRecord -> {
|
retestRecord.setBatchCode(retestRecord.getBatchCode()+"-"+retestRecord.getRetestNum());
|
//retestRecord.setTestNum(retestRecord.getRetestNum()); // 用retestNum代替testNum
|
LbSensorResultVo vo = new LbSensorResultVo();
|
// 将retestRecord的属性值拷贝到LbSensorResultVo
|
BeanUtils.copyProperties(retestRecord, vo);
|
children.add(vo);
|
});
|
record.setChildren(retestRecords);
|
});
|
}
|
|
/**
|
* 查询符合条件的批次明细列表
|
*
|
* @param bo 查询条件
|
* @return 批次明细列表
|
*/
|
@Override
|
public List<LbSensorResultVo> queryList(LbSensorResultBo bo) {
|
LambdaQueryWrapper<LbSensorResult> lqw = buildQueryWrapper(bo);
|
List<LbSensorResultVo> records = baseMapper.selectVoList(lqw);
|
|
// 查询复测数据并挂载到对应的原始数据下
|
queryReTest(records);
|
return records;
|
}
|
|
private LambdaQueryWrapper<LbSensorResult> buildQueryWrapper(LbSensorResultBo bo) {
|
Map<String, Object> params = bo.getParams();
|
LambdaQueryWrapper<LbSensorResult> lqw = Wrappers.lambdaQuery();
|
lqw.eq(StringUtils.isNotBlank(bo.getJudgeResult()), LbSensorResult::getJudgeResult, bo.getJudgeResult());
|
lqw.eq(StringUtils.isNotBlank(bo.getBatchCode()), LbSensorResult::getBatchCode, bo.getBatchCode());
|
lqw.eq(StringUtils.isNotBlank(bo.getTestNum()), LbSensorResult::getTestNum, bo.getTestNum());
|
lqw.eq(bo.getTotalCount() != null, LbSensorResult::getTotalCount, bo.getTotalCount());
|
lqw.eq(bo.getOkCount() != null, LbSensorResult::getOkCount, bo.getOkCount());
|
lqw.eq(bo.getNgCount() != null, LbSensorResult::getNgCount, bo.getNgCount());
|
lqw.orderByDesc(LbSensorResult::getTestNum);
|
return lqw;
|
}
|
|
/**
|
* 新增批次明细
|
*
|
* @param bo 批次明细
|
* @return 是否新增成功
|
*/
|
@Override
|
public Boolean insertByBo(LbSensorResultBo bo) {
|
LbSensorResult add = MapstructUtils.convert(bo, LbSensorResult.class);
|
validEntityBeforeSave(add);
|
boolean flag = baseMapper.insert(add) > 0;
|
if (flag) {
|
bo.setBatchCode(add.getBatchCode());
|
}
|
return flag;
|
}
|
|
/**
|
* 修改批次明细
|
*
|
* @param bo 批次明细
|
* @return 是否修改成功
|
*/
|
@Override
|
public Boolean updateByBo(LbSensorResultBo bo) {
|
LbSensorResult update = MapstructUtils.convert(bo, LbSensorResult.class);
|
validEntityBeforeSave(update);
|
return baseMapper.updateById(update) > 0;
|
}
|
|
/**
|
* 保存前的数据校验
|
*/
|
private void validEntityBeforeSave(LbSensorResult entity){
|
//TODO 做一些数据校验,如唯一约束
|
}
|
|
/**
|
* 校验并批量删除批次明细信息
|
*
|
* @param ids 待删除的主键集合
|
* @param isValid 是否进行有效性校验
|
* @return 是否删除成功
|
*/
|
@Override
|
public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
|
if(isValid){
|
//TODO 做一些业务上的校验,判断是否需要校验
|
}
|
return baseMapper.deleteByIds(ids) > 0;
|
}
|
}
|