From 3547641f25634eec4b6dcf379080e92ed5025ee1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 21 六月 2024 14:21:52 +0800
Subject: [PATCH] 解决工时排序问题+考评bug调试
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 74 ++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 21 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index c740528..a14f013 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
+import com.yuanchu.mom.dto.ProductDto;
import com.yuanchu.mom.mapper.StandardProductListMapper;
import com.yuanchu.mom.mapper.StandardTreeMapper;
import com.yuanchu.mom.pojo.InsSample;
@@ -56,23 +57,20 @@
@Override
public List<StandardProductList> selectStandardProductList(InsSample insSample) {
String[] models = insSample.getModel().split("-(?=[^-]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
+ String[] factorys = insSample.getFactory().split(" - ");
+ //List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1).eq(StandardProductList::getModel, models[0]).eq(StandardProductList::getSampleType, factorys[2]));
List<StandardProductList> list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0]);
- /* List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
- .eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId())
- .eq(StandardProductList::getState, 1)
- .eq(StandardProductList::getModel, models[0])
- .apply("ORDER BY case when man_hour_group is NULL then 1 else 0 end, CAST(man_hour_group as UNSIGNED), man_hour_group REGEXP '^[0-9]', id asc "));*/
if (list.size() == 0) {
if (Objects.equals(insSample.getFactory(), "") || insSample.getFactory() == null) {
return null;
}
String[] split = insSample.getFactory().split(" - ");
list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3]);
- /*list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
+ /* list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
.eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId())
.eq(StandardProductList::getState, 1)
- .like(StandardProductList::getTree, split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3])
- .apply("ORDER BY case when man_hour_group is NULL then 1 else 0 end, CAST(man_hour_group as UNSIGNED), man_hour_group REGEXP '^[0-9]', id asc "));*/
+ .like(StandardProductList::getTree, split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3]));*/
+
}
list = list.stream().filter(a -> {
try {
@@ -143,17 +141,35 @@
String[] trees = tree.split(" - ");
List<StandardProductList> list = new ArrayList<>();
if (trees.length == 3) {
- List<StandardTree> treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]));
- if (treeList.size() == 0) {
- StandardTree standardTree = new StandardTree();
- standardTree.setFactory(trees[0]);
- standardTree.setLaboratory(trees[1]);
- standardTree.setSampleType(trees[2]);
- treeList.add(standardTree);
+ 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 standardTree : treeList) {
- String str = tree + " - " + standardTree.getSample() + " - " + standardTree.getModel();
- list.addAll(standardTreeMapper.selectStandardProductListByTree3("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str));
+ for (StandardTree standardTree2 : treeList) {
+// String str = tree + " - " + standardTree2.getSample() + " - " + standardTree2.getModel();
+// list.addAll(standardTreeMapper.selectStandardProductListByTree3("\"" + trees[2] + "\"", standardTree2.getSample(), standardTree2.getModel(), str));
+ list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree2.getSample(), standardTree2.getModel(), tree));
+ list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + standardTree2.getSample() + "\"", standardTree2.getSample(), standardTree2.getModel(), tree));
}
} else if (trees.length == 4) {
List<StandardTree> treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]));
@@ -162,7 +178,7 @@
standardTree.setFactory(trees[0]);
standardTree.setLaboratory(trees[1]);
standardTree.setSampleType(trees[2]);
- standardTree.setSample(trees[2]);
+ standardTree.setSample(trees[3]);
treeList.add(standardTree);
}
for (StandardTree standardTree : treeList) {
@@ -171,8 +187,8 @@
list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", standardTree.getSample(), standardTree.getModel(), str));
}
} else {
- list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", trees[3], trees[4], tree));
- list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", trees[3], trees[4], tree));
+ list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", trees[3].equals("null")?null:trees[3], trees[4], tree));
+ list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", trees[3].equals("null")?null:trees[3], trees[4], tree));
}
for (StandardProductList productList : list) {
productList.setId(IdWorker.getId());
@@ -182,6 +198,7 @@
for (StandardProductList pl : list) {
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())
&& Objects.equals(sp.getStructureItemParameterId(), pl.getStructureItemParameterId())) {
pl.setId(sp.getId());
@@ -241,6 +258,15 @@
});
}
Map<String, Object> map = new HashMap<>();
+ Collections.sort(list, (o1, o2) -> {
+ String field1 = o1.getManHourGroup();
+ String field2 = o2.getManHourGroup();
+
+ int num1 = extractNumber(field1);
+ int num2 = extractNumber(field2);
+
+ return Integer.compare(num1, num2);
+ });
try {
map.put("productList", list.subList((page - 1) * 50, page * 50));
} catch (IndexOutOfBoundsException e) {
@@ -250,6 +276,12 @@
return map;
}
+ private int extractNumber(String s) {
+ // 浠庡瓧绗︿覆涓彁鍙栨暟瀛楃殑閫昏緫锛岃繖閲屽亣璁惧瓧娈电殑鏍煎紡鏄� "text<number>"
+ String number = s.replaceAll("\\D", "");
+ return Integer.parseInt(number);
+ }
+
@Override
public IPage<StandardProductList> selectStandardProductByMethodId(Integer id, String tree, Integer page, String laboratory, String item, String items) {
IPage<StandardProductList> iPage = new Page<>();
--
Gitblit v1.9.3