package com.ruoyi.basic.service.impl;
|
|
import com.alibaba.fastjson.JSON;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.toolkit.*;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.ruoyi.common.exception.base.BaseException;
|
import com.ruoyi.common.utils.SecurityUtils;
|
import com.ruoyi.basic.dto.CopyStandardProductListDto;
|
import com.ruoyi.basic.dto.InsSampleReceiveDto;
|
import com.ruoyi.basic.dto.ResetTreeDragDTO;
|
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
|
import com.ruoyi.basic.mapper.StandardProductListMapper;
|
import com.ruoyi.basic.mapper.StandardProductListSupplierAskMapper;
|
import com.ruoyi.basic.mapper.StandardTreeMapper;
|
import com.ruoyi.basic.pojo.StandardProductList;
|
import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
|
import com.ruoyi.basic.service.StandardProductListService;
|
import com.ruoyi.basic.utils.StandardTreePath;
|
import com.ruoyi.basic.utils.StandardTreePathParser;
|
import lombok.AllArgsConstructor;
|
import org.springframework.stereotype.Service;
|
import org.springframework.transaction.annotation.Transactional;
|
|
import java.math.BigDecimal;
|
import java.util.*;
|
import java.util.regex.Matcher;
|
import java.util.regex.Pattern;
|
import java.util.stream.Collectors;
|
|
/**
|
* @author Administrator
|
* @description 针对表【standard_product_list(标准树下的检验项目)】的数据库操作Service实现
|
* @createDate 2024-03-05 10:33:29
|
*/
|
@Service
|
@AllArgsConstructor
|
public class StandardProductListServiceImpl extends ServiceImpl<StandardProductListMapper, StandardProductList>
|
implements StandardProductListService {
|
|
private StandardProductListMapper standardProductListMapper;
|
|
private StandardTreeMapper standardTreeMapper;
|
|
private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
|
|
private StandardProductListSupplierAskMapper standardProductListSupplierAskMapper;
|
|
|
@Override
|
public int upStandardProductList(StandardProductList list) {
|
return standardProductListMapper.updateById(list);
|
}
|
|
|
@Override
|
public List<StandardProductList> selectStandardProductList(InsSampleReceiveDto insSample) {
|
if (insSample == null || insSample.getStandardMethodListId() == null) {
|
throw new BaseException("检验标准不能为空");
|
}
|
// 新疆新聚两级树优先按“行业 + 标准”规范路径查询；无法解析时保留历史五级逻辑。
|
boolean twoLevelOrder = false;
|
boolean isNoSample = false;
|
String model = insSample.getModel();
|
String modelNum = insSample.getModelNum();
|
List<StandardProductList> list = Collections.emptyList();
|
if (StringUtils.isNotBlank(insSample.getFactory())) {
|
try {
|
StandardTreePath path = StandardTreePathParser.parse(insSample.getFactory());
|
if (path.getStandard() != null) {
|
String canonicalTree = StandardTreePathParser.canonical(path.getIndustry(), path.getStandard());
|
list = standardProductListMapper.selectDetail2(
|
insSample.getStandardMethodListId(), 1, canonicalTree, insSample.getIsCableTag());
|
insSample.setLaboratory(path.getIndustry());
|
insSample.setSampleType(null);
|
insSample.setSample(path.getStandard());
|
insSample.setModel(null);
|
twoLevelOrder = true;
|
}
|
} catch (BaseException ignored) {
|
// 历史五级路径继续走原有兼容查询。
|
}
|
}
|
if (!twoLevelOrder) {
|
list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, model, insSample.getIsCableTag());
|
}
|
if (!twoLevelOrder && list.size() == 0) {
|
if (Objects.equals(insSample.getFactory(), "") || insSample.getFactory() == null) {
|
return null;
|
}
|
String[] split = insSample.getFactory().split(" - ");
|
split[3] = split[3].replace("- ", "");
|
String tree = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3] + " - null";
|
list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree, insSample.getIsCableTag());
|
if (list.size() == 0) {
|
String tree1 = split[0] + " - " + split[1] + " - " + split[2] + " - null - " + split[3];
|
list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree1, insSample.getIsCableTag());
|
|
// 只有对象的一层
|
if (list.size() == 0) {
|
String tree2 = split[0] + " - " + split[1] + " - " + split[2] + " - null - null";
|
list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree2, insSample.getIsCableTag());
|
// 样品直接赋值样品分类
|
list.forEach(standardProductList -> standardProductList.setSample(standardProductList.getSampleType()));
|
isNoSample = true;
|
}
|
}
|
}
|
if (!twoLevelOrder && !isNoSample) {
|
String[] split1 = insSample.getFactory().split(" - ");
|
//判断长度
|
if (split1.length > 4) {
|
if (ObjectUtils.isNotEmpty(split1[3])) {
|
list = list.stream().filter(list1 -> Objects.nonNull(list1.getSample()) && Objects.equals(list1.getSample(), split1[3])).collect(Collectors.toList());
|
} else if (split1[3].equals("")) {
|
list = list.stream().filter(list1 -> Objects.nonNull(list1.getSampleType()) && Objects.equals(list1.getSampleType(), split1[2])).collect(Collectors.toList());
|
}
|
}
|
}
|
final boolean currentTwoLevelOrder = twoLevelOrder;
|
list = list.stream().filter(a -> {
|
try {
|
if (a.getSection() != null && !Objects.equals(a.getSection(), "")) {
|
// 两级下单不再输入型号，不能因无法计算型号区间而丢弃整个检验项。
|
if (currentTwoLevelOrder && StringUtils.isBlank(modelNum)) {
|
return true;
|
}
|
List<String> sections = JSON.parseArray(a.getSection(), String.class);// 区间
|
List<String> cores = JSON.parseArray(a.getCores(), String.class); // 芯数
|
List<String> conductorMaterials = JSON.parseArray(a.getConductorMaterial(), String.class); // 导体材质
|
List<String> conductorTypes = JSON.parseArray(a.getConductorType(), String.class); // 导体类型
|
List<String> asks = JSON.parseArray(a.getAsk(), String.class);
|
List<String> tells = JSON.parseArray(a.getTell(), String.class);
|
boolean isIf;
|
for (int i = 0; i < sections.size(); i++) {
|
if (Objects.equals(a.getBsm(), "1")) {
|
return true;
|
} else {
|
if (sections.get(i).contains("&")) {
|
String[] split = sections.get(i).split("&");
|
isIf = getIsIf(split[0], modelNum, cores.get(i), conductorMaterials.get(i), conductorTypes.get(i), insSample)
|
&& getIsIf(split[1], modelNum, cores.get(i), conductorMaterials.get(i), conductorTypes.get(i), insSample);
|
} else {
|
isIf = getIsIf(sections.get(i), modelNum, cores.get(i), conductorMaterials.get(i), conductorTypes.get(i), insSample);
|
}
|
if (isIf) {
|
a.setSection(sections.get(i));
|
a.setAsk(asks.get(i));
|
a.setTell(tells.get(i));
|
return true;
|
}
|
}
|
}
|
return false;
|
}
|
} catch (Exception ignored) {
|
return false;
|
}
|
return true;
|
}).peek(standardProductList -> {
|
//判断是否是原材下单, 需要啊把颜色绑定到试样颜色的要求值上
|
if (StringUtils.isNotBlank(insSample.getPartNo())) {
|
// 判断是否有这个字段且是文本类型
|
if (StringUtils.isNotBlank(standardProductList.getInspectionItem())
|
&& standardProductList.getInspectionItem().contains("试样颜色")) {
|
Map<String, String> partColor = baseMapper.selectPartColor(insSample.getPartNo());
|
if (CollectionUtils.isNotEmpty(partColor)) {
|
if (StringUtils.isNotBlank(partColor.get("color"))) {
|
// 判断检验值是否为空和不等于 - 和 /
|
if (StringUtils.isBlank(standardProductList.getAsk()) || partColor.get("color").contains("本")) { // 没有ask直接复制
|
// 查询对象绑定表和产品绑定表
|
standardProductList.setAsk("=" + partColor.get("color")
|
+ (StringUtils.isBlank(partColor.get("color_code")) ? "" : "(" + partColor.get("color_code") + ")"));
|
standardProductList.setTell(partColor.get("color")
|
+ (StringUtils.isBlank(partColor.get("color_code")) ? "" : "(" + partColor.get("color_code") + ")"));
|
standardProductList.setInspectionValueType("2");
|
} else { // 拼接到要求描述前面
|
standardProductList.setTell(partColor.get("color")
|
+ (StringUtils.isBlank(partColor.get("color_code")) ? "" : "(" + partColor.get("color_code") + ")") + "@" + standardProductList.getTell());
|
}
|
}
|
}
|
}
|
}
|
})
|
.collect(Collectors.toList());
|
|
// 查询厂家是否有特殊要求值
|
if (insSample.getIfsInventoryId() != null) {
|
// 查询原材料厂家名称
|
String supplierName = ifsInventoryQuantityMapper.selectById(insSample.getIfsInventoryId())
|
.getSupplierName();
|
List<Long> collect = list.stream().map(StandardProductList::getId).collect(Collectors.toList());
|
if (CollectionUtils.isNotEmpty(collect)) {
|
List<StandardProductListSupplierAsk> supplierAsks = standardProductListSupplierAskMapper.selectList(Wrappers.<StandardProductListSupplierAsk>lambdaQuery()
|
.in(StandardProductListSupplierAsk::getProductListId, collect)
|
.eq(StandardProductListSupplierAsk::getSupplierName, supplierName));
|
|
// 判断有没有特殊值绑定
|
if (CollectionUtils.isNotEmpty(supplierAsks)) {
|
for (StandardProductList standardProductList : list) {
|
for (StandardProductListSupplierAsk supplierAsk : supplierAsks) {
|
if (standardProductList.getId().equals(supplierAsk.getProductListId())) {
|
// 重新赋值要求值和要求描述
|
standardProductList.setAsk(supplierAsk.getAsk());
|
standardProductList.setTell(supplierAsk.getTell());
|
}
|
}
|
}
|
}
|
}
|
}
|
|
return list;
|
}
|
|
/**
|
*
|
* @param str 判定公式
|
* @param model 型号
|
* @param standardCores 芯数
|
* @param conductorMaterial 导体材质
|
* @param conductorType 导体类型
|
* @param insSample
|
* @return
|
*/
|
private boolean getIsIf(String str, String model, String standardCores, String conductorMaterial, String conductorType,InsSampleReceiveDto insSample) {
|
Matcher matcher = Pattern.compile("\\d+(\\.\\d+)?").matcher(model);
|
String model2 = "";
|
while (matcher.find()) {
|
model2 += matcher.group();
|
break;
|
}
|
boolean flag = false;
|
if (str.contains("≥") || str.contains(">=")) {
|
String param = str.replace("≥", "").replace(">=", "");
|
flag = new BigDecimal(model2).compareTo(new BigDecimal(param)) > -1;
|
} else if (str.contains("≤") || str.contains("<=")) {
|
String param = str.replace("≤", "").replace("<=", "");
|
flag = new BigDecimal(model2).compareTo(new BigDecimal(param)) < 1;
|
} else if (str.contains(">") || str.contains("＞")) {
|
String param = str.replace(">", "").replace("＞", "");
|
flag = new BigDecimal(model2).compareTo(new BigDecimal(param)) > 0;
|
} else if (str.contains("<") || str.contains("＜")) {
|
String param = str.replace("<", "").replace("＜", "");
|
flag = new BigDecimal(model2).compareTo(new BigDecimal(param)) < 0;
|
} else if (str.contains("=")) {
|
String param = str.replace("=", "");
|
flag = new BigDecimal(model2).compareTo(new BigDecimal(param)) == 0;
|
}
|
if (flag) {
|
boolean coresMatch = true;
|
boolean conductorMaterialMatch = true;
|
boolean conductorTypeMatch = true;
|
|
// 判断是否有线芯数量
|
if (StringUtils.isNotBlank(standardCores)) {
|
if (StringUtils.isBlank(insSample.getCores()) || !standardCores.equals(insSample.getCores())) {
|
coresMatch = false;
|
}
|
}
|
|
// 判断是否有导体材质
|
if (StringUtils.isNotBlank(conductorMaterial)) {
|
if (StringUtils.isBlank(insSample.getConductorMaterial()) || !conductorMaterial.equals(insSample.getConductorMaterial())) {
|
conductorMaterialMatch = false;
|
}
|
}
|
|
// 判断是否有导体类型
|
if (StringUtils.isNotBlank(conductorType)) {
|
if (StringUtils.isBlank(insSample.getConductorType()) || !conductorType.equals(insSample.getConductorType())) {
|
conductorTypeMatch = false;
|
}
|
}
|
// 最终判断
|
flag = coresMatch && conductorMaterialMatch && conductorTypeMatch;
|
}
|
|
return flag;
|
}
|
|
@Override
|
@Transactional(rollbackFor = Exception.class)
|
public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page, String keyword) {
|
if (id == null) {
|
throw new BaseException("检验标准不能为空");
|
}
|
StandardTreePath path = StandardTreePathParser.parse(tree);
|
if (path.getStandard() == null) {
|
throw new BaseException("请选择标准节点");
|
}
|
String canonicalTree = StandardTreePathParser.canonical(path.getIndustry(), path.getStandard());
|
List<StandardProductList> generated = standardTreeMapper.selectStandardProductListByIndustry(
|
path.getIndustry(), path.getStandard(), canonicalTree);
|
List<StandardProductList> saved = standardProductListMapper.selectList(
|
Wrappers.<StandardProductList>lambdaQuery()
|
.eq(StandardProductList::getStandardMethodListId, id)
|
.eq(StandardProductList::getTree, canonicalTree)
|
.orderByAsc(StandardProductList::getSort));
|
|
Map<Integer, StandardProductList> savedByParameterId = new HashMap<>();
|
for (StandardProductList item : saved) {
|
if (item.getStructureItemParameterId() != null) {
|
savedByParameterId.put(item.getStructureItemParameterId(), item);
|
}
|
}
|
Integer userId = SecurityUtils.getUserId().intValue();
|
for (StandardProductList item : generated) {
|
applySingleRadiusDefault(item);
|
StandardProductList old = savedByParameterId.get(item.getStructureItemParameterId());
|
if (old != null && sameInspectionItem(old, item)) {
|
mergeSavedConfiguration(old, item);
|
} else {
|
item.setId(IdWorker.getId());
|
item.setState(id == 0 ? 1 : 0);
|
}
|
item.setFactory(null);
|
item.setLaboratory(path.getIndustry());
|
item.setSampleType(null);
|
item.setSample(path.getStandard());
|
item.setModel(null);
|
item.setTree(canonicalTree);
|
item.setCreateUser(userId);
|
item.setUpdateUser(userId);
|
item.setStandardMethodListId(id);
|
}
|
|
standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaQuery()
|
.eq(StandardProductList::getStandardMethodListId, id)
|
.eq(StandardProductList::getTree, canonicalTree));
|
if (CollectionUtils.isNotEmpty(generated)) {
|
baseMapper.saveBatchProductLists(generated);
|
}
|
|
generated.sort((left, right) -> {
|
int leftSort = left.getSort() == null ? Integer.MAX_VALUE : left.getSort();
|
int rightSort = right.getSort() == null ? Integer.MAX_VALUE : right.getSort();
|
if (leftSort != rightSort) {
|
return Integer.compare(leftSort, rightSort);
|
}
|
return compareManHourGroup(left.getManHourGroup(), right.getManHourGroup());
|
});
|
|
String search = keyword == null ? "" : keyword.trim().toLowerCase(Locale.ROOT);
|
List<StandardProductList> filtered = generated.stream()
|
.filter(item -> search.isEmpty()
|
|| containsIgnoreCase(item.getInspectionItem(), search)
|
|| containsIgnoreCase(item.getInspectionItemSubclass(), search))
|
.collect(Collectors.toList());
|
int total = filtered.size();
|
int currentPage = page == null || page < 1 ? 1 : page;
|
int fromIndex = Math.min((currentPage - 1) * 100, total);
|
int toIndex = Math.min(fromIndex + 100, total);
|
|
Map<String, Object> map = new HashMap<>();
|
map.put("productList", new ArrayList<>(filtered.subList(fromIndex, toIndex)));
|
map.put("total", total);
|
return map;
|
}
|
|
private boolean sameInspectionItem(StandardProductList left, StandardProductList right) {
|
return Objects.equals(left.getInspectionItem(), right.getInspectionItem())
|
&& Objects.equals(defaultString(left.getInspectionItemSubclass()), defaultString(right.getInspectionItemSubclass()));
|
}
|
|
private void applySingleRadiusDefault(StandardProductList item) {
|
String radiusList = item.getRadiusList();
|
if (StringUtils.isBlank(radiusList) || "null".equals(radiusList) || "\"\"".equals(radiusList)) {
|
return;
|
}
|
try {
|
List<String> values = JSON.parseArray(radiusList, String.class);
|
if (values != null && values.size() == 1) {
|
item.setRadius(values.get(0));
|
}
|
} catch (Exception ignored) {
|
// 历史脏数据不影响检验项列表生成。
|
}
|
}
|
|
private void mergeSavedConfiguration(StandardProductList old, StandardProductList target) {
|
target.setId(old.getId());
|
target.setSort(old.getSort());
|
target.setState(old.getState() == null ? 0 : old.getState());
|
if (StringUtils.isNotBlank(old.getMethodS())) {
|
target.setMethodS(old.getMethodS());
|
target.setMethod(old.getMethodS());
|
}
|
if (StringUtils.isNotBlank(old.getRadius())) target.setRadius(old.getRadius());
|
if (StringUtils.isNotBlank(old.getRates())) target.setRates(old.getRates());
|
if (StringUtils.isNotBlank(old.getAsk())) target.setAsk(old.getAsk());
|
if (StringUtils.isNotBlank(old.getTell())) target.setTell(old.getTell());
|
if (StringUtils.isNotBlank(old.getPrice())) target.setPrice(old.getPrice());
|
if (StringUtils.isNotBlank(old.getManHour())) target.setManHour(old.getManHour());
|
if (StringUtils.isNotBlank(old.getSection())) target.setSection(old.getSection());
|
if (StringUtils.isNotBlank(old.getCores())) target.setCores(old.getCores());
|
if (StringUtils.isNotBlank(old.getConductorMaterial())) target.setConductorMaterial(old.getConductorMaterial());
|
if (StringUtils.isNotBlank(old.getConductorType())) target.setConductorType(old.getConductorType());
|
if (old.getTemplateId() != null) target.setTemplateId(old.getTemplateId());
|
}
|
|
private int compareManHourGroup(String left, String right) {
|
boolean leftEmpty = StringUtils.isBlank(left);
|
boolean rightEmpty = StringUtils.isBlank(right);
|
if (leftEmpty && rightEmpty) return 0;
|
if (leftEmpty) return 1;
|
if (rightEmpty) return -1;
|
return Integer.compare(extractNumber(left), extractNumber(right));
|
}
|
|
private boolean containsIgnoreCase(String value, String search) {
|
return value != null && value.toLowerCase(Locale.ROOT).contains(search);
|
}
|
|
private String defaultString(String value) {
|
return value == null ? "" : value;
|
}
|
|
private int extractNumber(String s) {
|
String number = s == null ? "" : s.replaceAll("\\D", "");
|
if (number.isEmpty()) {
|
return Integer.MAX_VALUE;
|
}
|
try {
|
return Integer.parseInt(number);
|
} catch (NumberFormatException ignored) {
|
return Integer.MAX_VALUE;
|
}
|
}
|
|
@Override
|
public IPage<StandardProductList> selectStandardProductByMethodId(Integer id, String tree, Integer page, String laboratory, String item, String items) {
|
IPage<StandardProductList> iPage = new Page<>();
|
iPage.setSize(100);
|
iPage.setCurrent(page);
|
return standardProductListMapper.standardProductListIPage(id, tree, iPage, laboratory, item, items);
|
}
|
|
@Override
|
public Map<String, List<?>> selectStandardProductEnumByMethodId(Integer id, String tree, String item) {
|
HashMap<String, List<?>> map = new HashMap<>();
|
map.put("item", standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
|
.eq(StandardProductList::getStandardMethodListId, id)
|
.like(StandardProductList::getTree, tree)
|
.select(StandardProductList::getInspectionItem)
|
.groupBy(StandardProductList::getInspectionItem)));
|
if (ObjectUtils.isNotEmpty(item)) {
|
map.put("items", standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
|
.eq(StandardProductList::getStandardMethodListId, id)
|
.eq(StandardProductList::getInspectionItem, item)
|
.like(StandardProductList::getTree, tree)
|
.select(StandardProductList::getInspectionItemSubclass)
|
.groupBy(StandardProductList::getInspectionItemSubclass)));
|
} else {
|
map.put("items", standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
|
.eq(StandardProductList::getStandardMethodListId, id)
|
.like(StandardProductList::getTree, tree)
|
.select(StandardProductList::getInspectionItemSubclass)
|
.groupBy(StandardProductList::getInspectionItemSubclass)));
|
}
|
return map;
|
}
|
|
/**
|
* 修改标准库区间
|
* @param list
|
* @return
|
*/
|
@Override
|
public boolean updateSection(StandardProductList list) {
|
standardProductListMapper.updateSection(list);
|
return true;
|
}
|
|
|
/**
|
* 标准库拖拽
|
* @param resetTreeDragDTO
|
*/
|
@Override
|
@Transactional(rollbackFor = Exception.class)
|
public void resetTreeDrag(ResetTreeDragDTO resetTreeDragDTO) {
|
Integer beginIndex = Integer.parseInt(resetTreeDragDTO.getBeginIndex());
|
Integer endIndex = Integer.parseInt(resetTreeDragDTO.getEndIndex());
|
Integer methodId = Integer.parseInt(resetTreeDragDTO.getMethodId());
|
Long productionId = Long.parseLong(resetTreeDragDTO.getProductionId());
|
// 判断是从上往下拖拽还是从下往上放拖拽
|
// 从上往下
|
if (beginIndex < endIndex) {
|
standardProductListMapper.updateSortUp(beginIndex,
|
endIndex,
|
methodId,
|
resetTreeDragDTO.getTree());
|
|
// 从下往上
|
} else if (beginIndex > endIndex){
|
standardProductListMapper.updateSortDown(beginIndex,
|
endIndex,
|
methodId,
|
resetTreeDragDTO.getTree());
|
} else {
|
return;
|
}
|
// 修改标准库项顺序
|
standardProductListMapper.update(null, Wrappers.<StandardProductList>lambdaUpdate()
|
.eq(StandardProductList::getId, productionId)
|
.set(StandardProductList::getSort, endIndex));
|
}
|
|
@Override
|
public void resetTreeDragBatch(List<StandardProductList> standardProductLists) {
|
this.updateBatchById(standardProductLists);
|
}
|
|
/**
|
* 检验项要求值对比
|
* @param copyDto
|
* @return
|
*/
|
@Override
|
public List<StandardProductList> copyStandardProductList(CopyStandardProductListDto copyDto) {
|
List<StandardProductList> productLists = new ArrayList<>();
|
|
// 对比检验项一样的填充要求值要求描述
|
for (StandardProductList oldProductList : copyDto.getOldStandardProductList()) {
|
String oldItemName = oldProductList.getInspectionItemClassEn()
|
+ oldProductList.getInspectionItem()
|
+ oldProductList.getInspectionItemSubclass();
|
for (StandardProductList newProductList : copyDto.getNewStandardProductList()) {
|
String newItemName = newProductList.getInspectionItemClassEn()
|
+ newProductList.getInspectionItem()
|
+ newProductList.getInspectionItemSubclass();
|
// 判断名称是否一样
|
if (oldItemName.equals(newItemName)) {
|
// 区间
|
oldProductList.setSection(newProductList.getSection());
|
// 芯数
|
oldProductList.setCores(newProductList.getCores());
|
// 要求值
|
oldProductList.setAsk(newProductList.getAsk());
|
// 要求描述
|
oldProductList.setTell(newProductList.getTell());
|
// 单价
|
oldProductList.setPrice(newProductList.getPrice());
|
// 工时分组
|
oldProductList.setManHour(newProductList.getManHour());
|
// 导体材质
|
oldProductList.setConductorMaterial(newProductList.getConductorMaterial());
|
// 导体类型
|
oldProductList.setConductorType(newProductList.getConductorType());
|
productLists.add(oldProductList);
|
}
|
}
|
}
|
return productLists;
|
}
|
|
/**
|
* 检验项复制对比一个
|
* @param dto
|
* @return
|
*/
|
@Override
|
public List<StandardProductList> copyStandardProductOne(CopyStandardProductListDto dto) {
|
if (CollectionUtils.isEmpty(dto.getNewStandardProductList()) && dto.getNewStandardProductList().size() == 1 &&
|
CollectionUtils.isEmpty(dto.getOldStandardProductList()) && dto.getOldStandardProductList().size() == 1) {
|
throw new BaseException("需要对比的检验项请选择一个");
|
}
|
StandardProductList newProductList = dto.getNewStandardProductList().get(0);
|
StandardProductList oldProductList = dto.getOldStandardProductList().get(0);
|
// 区间
|
oldProductList.setSection(newProductList.getSection());
|
// 芯数
|
oldProductList.setCores(newProductList.getCores());
|
// 要求值
|
oldProductList.setAsk(newProductList.getAsk());
|
// 要求描述
|
oldProductList.setTell(newProductList.getTell());
|
// 单价
|
oldProductList.setPrice(newProductList.getPrice());
|
// 工时分组
|
oldProductList.setManHour(newProductList.getManHour());
|
// 导体材质
|
oldProductList.setConductorMaterial(newProductList.getConductorMaterial());
|
// 导体类型
|
oldProductList.setConductorType(newProductList.getConductorType());
|
List<StandardProductList> productLists = new ArrayList<>();
|
productLists.add(oldProductList);
|
return productLists;
|
}
|
|
/**
|
* 检验项复制排序
|
* @param copyDto
|
* @return
|
*/
|
@Override
|
public boolean copyStandardProductSort(CopyStandardProductListDto copyDto) {
|
List<StandardProductList> productLists = new ArrayList<>();
|
|
// 对比检验项一样的填充要求值要求描述
|
for (StandardProductList oldProductList : copyDto.getOldStandardProductList()) {
|
String oldItemName = oldProductList.getInspectionItemClassEn()
|
+ oldProductList.getInspectionItem()
|
+ oldProductList.getInspectionItemSubclass();
|
for (StandardProductList newProductList : copyDto.getNewStandardProductList()) {
|
String newItemName = newProductList.getInspectionItemClassEn()
|
+ newProductList.getInspectionItem()
|
+ newProductList.getInspectionItemSubclass();
|
// 判断名称是否一样
|
if (oldItemName.equals(newItemName)) {
|
StandardProductList standardProductList = new StandardProductList();
|
standardProductList.setId(oldProductList.getId());
|
// 复制排序
|
standardProductList.setSort(newProductList.getSort());
|
productLists.add(standardProductList);
|
}
|
}
|
}
|
this.updateBatchById(productLists);
|
return false;
|
}
|
}
|
