From 901bab9b8b1c3773a644bdc74f5eafd666591aeb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 17 九月 2026 13:37:24 +0800
Subject: [PATCH] feat: 1委托单 2下单详情 3检验任务 4检验任务复核 5检验任务详情 6标准维护 7检验单详情 8报告编制
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 403 ++++++++++++++++++++++++---------------------------------
1 files changed, 170 insertions(+), 233 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index b50d427..356fe9a 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -1,7 +1,6 @@
package com.ruoyi.basic.service.impl;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,7 +9,6 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.basic.dto.CopyStandardProductListDto;
import com.ruoyi.basic.dto.InsSampleReceiveDto;
-import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ResetTreeDragDTO;
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.mapper.StandardProductListMapper;
@@ -18,9 +16,9 @@
import com.ruoyi.basic.mapper.StandardTreeMapper;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
-import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.basic.service.StandardProductListService;
-import com.ruoyi.basic.service.StandardProductListService2;
+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;
@@ -45,8 +43,6 @@
private StandardTreeMapper standardTreeMapper;
- private StandardProductListService2 standardProductListService2;
-
private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
private StandardProductListSupplierAskMapper standardProductListSupplierAskMapper;
@@ -57,20 +53,39 @@
return standardProductListMapper.updateById(list);
}
- @Override
- public int delStandardProduct(JSONArray list) {
- return standardProductListMapper.deleteBatchIds(list);
- }
@Override
public List<StandardProductList> selectStandardProductList(InsSampleReceiveDto insSample) {
- // 鏄惁娌℃湁浜у搧
+ if (insSample == null || insSample.getStandardMethodListId() == null) {
+ throw new BaseException("妫�楠屾爣鍑嗕笉鑳戒负绌�");
+ }
+ // 鏂扮枂鏂拌仛涓ょ骇鏍戜紭鍏堟寜鈥滆涓� + 鏍囧噯鈥濊鑼冭矾寰勬煡璇紱鏃犳硶瑙ｆ瀽鏃朵繚鐣欏巻鍙蹭簲绾ч�昏緫銆�
+ boolean twoLevelOrder = false;
boolean isNoSample = false;
-// String[] models = insSample.getModel().split("-(?=[^-]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
String model = insSample.getModel();
String modelNum = insSample.getModelNum();
- List<StandardProductList> list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, model, insSample.getIsCableTag());
- if (list.size() == 0) {
+ 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;
}
@@ -92,8 +107,8 @@
}
}
}
- String[] split1 = insSample.getFactory().split(" - ");
- if (!isNoSample) {
+ if (!twoLevelOrder && !isNoSample) {
+ String[] split1 = insSample.getFactory().split(" - ");
//鍒ゆ柇闀垮害
if (split1.length > 4) {
if (ObjectUtils.isNotEmpty(split1[3])) {
@@ -103,9 +118,14 @@
}
}
}
+ 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); // 瀵间綋鏉愯川
@@ -139,7 +159,7 @@
}
return true;
}).peek(standardProductList -> {
- // todo: 鍒ゆ柇鏄惁鏄師鏉愪笅鍗�, 闇�瑕佸晩鎶婇鑹茬粦瀹氬埌璇曟牱棰滆壊鐨勮姹傚�间笂
+ //鍒ゆ柇鏄惁鏄師鏉愪笅鍗�, 闇�瑕佸晩鎶婇鑹茬粦瀹氬埌璇曟牱棰滆壊鐨勮姹傚�间笂
if (StringUtils.isNotBlank(insSample.getPartNo())) {
// 鍒ゆ柇鏄惁鏈夎繖涓瓧娈典笖鏄枃鏈被鍨�
if (StringUtils.isNotBlank(standardProductList.getInspectionItem())
@@ -263,234 +283,151 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
- String[] trees = tree.split(" - ");
- try {
- String tree1 = trees[2];
- } catch (Exception e) {
- throw new BaseException("鎿嶄綔澶揩,绯荤粺浼犲弬閿欒!!!!");
+ public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page, String keyword) {
+ if (id == null) {
+ throw new BaseException("妫�楠屾爣鍑嗕笉鑳戒负绌�");
}
- boolean isDrag = false;
- List<StandardProductList> list = new ArrayList<>();
- if (trees.length == 3) {
- List<StandardTree> treeList = new ArrayList<>();
- StandardTree standardTree = new StandardTree();
- standardTree.setFactory(trees[0]);
- standardTree.setLaboratory(trees[1]);
- standardTree.setSampleType(trees[2]);
- List<ProductDto> pList = standardTreeMapper.selectPList(trees[2]);
- if (pList.size() == 0 || pList.get(0) == null) {
- List<StandardTree> treeList1 = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]));
- if (treeList1.size() == 0) {
- treeList.add(standardTree);
- } else {
- treeList.addAll(treeList1);
- }
- } else {
- for (ProductDto p : pList) {
- standardTree.setSample(p.getName());
- List<StandardTree> treeList1 = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, p.getName()));
- if (treeList1.size() == 0) {
- treeList.add(JSON.parseObject(JSON.toJSONString(standardTree), StandardTree.class));
- } else {
- treeList.addAll(treeList1);
- }
- }
- }
- for (StandardTree standardTree2 : treeList) {
- String tree2 = trees[0] + " - " + trees[1] + " - " + trees[2] + " - " + standardTree2.getSample() + " - " + standardTree2.getModel();
- list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2, trees[1]));
- list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + standardTree2.getSample() + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2, trees[1]));
- }
- } else if (trees.length == 4) {
- // 鍒ゆ柇绗洓灞傛槸鍚︽湁鍨嬪彿
- Long count = standardProductListMapper.selectCount(Wrappers.<StandardProductList>lambdaQuery()
- .eq(StandardProductList::getStandardMethodListId, id)
- .isNull(StandardProductList::getModel)
- .like(StandardProductList::getTree, tree));
- if (count == 0) {
- isDrag = true;
- }
-
- isDrag = true;
- List<StandardTree> treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]));
- if (treeList.size() == 0) {
- StandardTree standardTree = new StandardTree();
- standardTree.setFactory(trees[0]);
- standardTree.setLaboratory(trees[1]);
- standardTree.setSampleType(trees[2]);
- standardTree.setSample(trees[3]);
- treeList.add(standardTree);
- }
- for (StandardTree standardTree : treeList) {
- String str = tree + " - " + standardTree.getModel();
- list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str, trees[1]));
- list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", standardTree.getSample(), standardTree.getModel(), str, trees[1]));
- }
- } else {
- isDrag = true;
- list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", trees[3].equals("null") ? null : trees[3], trees[4], tree, trees[1]));
- list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", trees[3].equals("null") ? null : trees[3], trees[4], tree, trees[1]));
+ StandardTreePath path = StandardTreePathParser.parse(tree);
+ if (path.getStandard() == null) {
+ throw new BaseException("璇烽�夋嫨鏍囧噯鑺傜偣");
}
- for (StandardProductList productList : list) {
- productList.setId(IdWorker.getId());
- }
- List<StandardProductList> standardProductLists;
-
- if (isDrag) {
- standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
- .eq(StandardProductList::getStandardMethodListId, id)
- .like(StandardProductList::getTree, tree)
- .orderByAsc(StandardProductList::getSort));
- // 鍒ゆ柇鏄惁鏈夋病鏈夊簭鍙风殑, 娌℃湁搴忓彿閲嶇疆
- boolean b = standardProductLists.stream().anyMatch(standardProductList -> standardProductList.getSort() == null);
- } else {
- standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
- .eq(StandardProductList::getStandardMethodListId, id)
- .like(StandardProductList::getTree, tree));
- }
-
- for (StandardProductList sp : standardProductLists) {
- for (StandardProductList pl : list) {
- // 鍒ゆ柇鏉′欢鏄惁鍙湁涓�涓�, 鏈変竴涓殑璇濋粯璁ょ涓�涓�
- String radiusList = pl.getRadiusList();
- if (StringUtils.isNotBlank(radiusList) && !radiusList.equals("null") && !radiusList.equals("\"\"")) {
- JSONArray jsonArray = JSON.parseArray(radiusList);
- List<String> radius = jsonArray.toJavaList(String.class);
- if (CollectionUtils.isNotEmpty(radius) && radius.size() == 1) {
- pl.setRadius(radius.get(0));
- }
- }
- if (Objects.equals(sp.getInspectionItem(), pl.getInspectionItem())
- && Objects.equals((sp.getInspectionItemSubclass() == null) ? "" : sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass() == null ? "" : pl.getInspectionItemSubclass())
-// && Objects.equals(sp.getSample(), pl.getSample())
- && Objects.equals(sp.getModel(), pl.getModel())
- && sp.getTree().indexOf(pl.getSample() == null ? "null" : pl.getSample()) > -1
- && Objects.equals(sp.getStructureItemParameterId(), pl.getStructureItemParameterId())) {
- pl.setId(sp.getId());
- // 娣诲姞鎺掑簭瀛楁
- pl.setSort(sp.getSort());
- if (sp.getState() != null && !sp.getState().equals("")) {
- pl.setState(sp.getState());
- } else {
- pl.setState(id == 0 ? 1 : 0);
- }
- if (sp.getMethodS() != null && !sp.getMethodS().equals("")) {
- pl.setMethod(sp.getMethodS());
- }
- if (sp.getRadius() != null && !sp.getRadius().equals("")) {
- pl.setRadius(sp.getRadius());
- }
- if (sp.getRates() != null && !sp.getRates().equals("")) {
- pl.setRates(sp.getRates());
- }
- if (sp.getAsk() != null && !sp.getAsk().equals("")) {
- pl.setAsk(sp.getAsk());
- }
- if (sp.getTell() != null && !sp.getTell().equals("")) {
- pl.setTell(sp.getTell());
- }
- if (sp.getPrice() != null && !sp.getPrice().equals("")) {
- pl.setPrice(sp.getPrice());
- }
- if (sp.getManHour() != null && !sp.getManHour().equals("")) {
- pl.setManHour(sp.getManHour());
- }
- if (sp.getSection() != null && !sp.getSection().equals("")) {
- pl.setSection(sp.getSection());
- }
- if (sp.getCores() != null && !sp.getCores().equals("")) {
- pl.setCores(sp.getCores());
- }
- if (sp.getConductorMaterial() != null && !sp.getConductorMaterial().equals("")) {
- pl.setConductorMaterial(sp.getConductorMaterial());
- }
- if (sp.getConductorType() != null && !sp.getConductorType().equals("")) {
- pl.setConductorType(sp.getConductorType());
- }
- if (sp.getTemplateId() != null && !sp.getTemplateId().equals("")) {
- pl.setTemplateId(sp.getTemplateId());
- }
- //鍥犱负杩樻湁涓骇鍝佸彨鑰愬紶绾垮す 鎺ョ画閲戝叿 ,杩欎袱涓」鐩殑鏁版嵁瀹屽叏涓�鏍�,鐗规畩澶勭悊
- if (sp.getTree() != null && !sp.getTree().equals("") && !pl.getTree().equals("涓ぉ绉戞妧妫�娴嬩腑蹇� - 鐢靛姏浜у搧瀹為獙瀹� - 閲戝叿 - 鑰愬紶绾垮す - null")) {
- pl.setTree(sp.getTree());
- }
- break;
- }
- }
- }
- if (page == 1) {
- Integer userId = SecurityUtils.getUserId().intValue();
-// CompletableFuture.supplyAsync(() -> {
- if (trees.length == 5) {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
+ 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, tree));
- } else {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
- .eq(StandardProductList::getStandardMethodListId, id)
- .like(StandardProductList::getTree, tree));
- }
+ .eq(StandardProductList::getTree, canonicalTree)
+ .orderByAsc(StandardProductList::getSort));
- try {
- standardProductListService2.saveBatch(list.stream().map(a -> {
- a.setFactory(trees[0]);
- a.setLaboratory(trees[1]);
- a.setSampleType(trees[2]);
- a.setCreateUser(userId);
- a.setUpdateUser(userId);
- a.setStandardMethodListId(id);
- return a;
- }).collect(Collectors.toList()));
- } catch (Exception e) {
- // 澶勭悊閲嶅 ID 鐨勮褰曪紝閲嶆柊鐢熸垚 ID 骞剁户缁皾璇曟彃鍏�
- for (StandardProductList productList : list) {
- productList.setId(IdWorker.getId());
- }
+ Map<Integer, StandardProductList> savedByParameterId = new HashMap<>();
+ for (StandardProductList item : saved) {
+ if (item.getStructureItemParameterId() != null) {
+ savedByParameterId.put(item.getStructureItemParameterId(), item);
}
-
}
- Map<String, Object> map = new HashMap<>();
- Collections.sort(list, (o1, o2) -> {
- String field1 = o1.getManHourGroup();
- String field2 = o2.getManHourGroup();
-
- boolean isEmpty1 = field1 == null || field1.isEmpty();
- boolean isEmpty2 = field2 == null || field2.isEmpty();
-
- if (isEmpty1 && isEmpty2) {
- return 0;
- } else if (isEmpty1) {
- return 1;
- } else if (isEmpty2) {
- return -1;
+ 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 {
- int num1 = extractNumber(field1);
- int num2 = extractNumber(field2);
- return Integer.compare(num1, num2);
+ 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());
});
- // 鎸夌収绱㈠紩鎺掑簭
- if (isDrag) {
- list.sort((o1, o2) -> (o1.getSort() == null ? 0 : o1.getSort())
- - (o2.getSort() == null ? 0 : o2.getSort()));
- }
- try {
- map.put("productList", list.subList((page - 1) * 300, page * 300));
- } catch (IndexOutOfBoundsException e) {
- map.put("productList", list.subList((page - 1) * 300, list.size()));
- }
- map.put("total", list.size());
+
+ 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 int extractNumber(String s) {
- // 浠庡瓧绗︿覆涓彁鍙栨暟瀛楃殑閫昏緫锛岃繖閲屽亣璁惧瓧娈电殑鏍煎紡鏄� "text<number>"
- String number = s;
- if (!s.matches("\\d+")) {
- number = s.replaceAll("\\D", "");
+ 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;
}
- return Integer.parseInt(number);
+ 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
@@ -574,7 +511,7 @@
@Override
public void resetTreeDragBatch(List<StandardProductList> standardProductLists) {
- standardProductListService2.updateBatchById(standardProductLists);
+ this.updateBatchById(standardProductLists);
}
/**
--
Gitblit v1.9.3