From 92442dca5ac89b58daa7129428cc72dcf001fb39 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 24 七月 2024 15:22:47 +0800
Subject: [PATCH] 加班工时
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 197 +++++++++++++++----------------------------------
1 files changed, 60 insertions(+), 137 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 66ca4aa..d0c90bc 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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -57,17 +58,18 @@
@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]);
if (list.size() == 0) {
if (Objects.equals(insSample.getFactory(), "") || insSample.getFactory() == null) {
return null;
}
String[] split = insSample.getFactory().split(" - ");
- 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]));
+ String tree = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3] + " - null";
+ list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree);
+ if (list.size()==0){
+ String tree1 = split[0] + " - " + split[1] + " - " + split[2] + " - null - " + split[3] ;
+ list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree1);
+ }
}
list = list.stream().filter(a -> {
try {
@@ -135,114 +137,6 @@
@Override
public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
- /*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);
- }
- for (StandardTree standardTree : treeList) {
- String str = tree + " - " + standardTree.getSample() + " - " + standardTree.getModel();
- list.addAll(standardTreeMapper.selectStandardProductListByTree3("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str));
- }
- } 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]));
- if (treeList.size() == 0) {
- StandardTree standardTree = new StandardTree();
- standardTree.setFactory(trees[0]);
- standardTree.setLaboratory(trees[1]);
- standardTree.setSampleType(trees[2]);
- standardTree.setSample(trees[2]);
- treeList.add(standardTree);
- }
- for (StandardTree standardTree : treeList) {
- String str = tree + " - " + standardTree.getModel();
- list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str));
- 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));
- }
- for (StandardProductList productList : list) {
- productList.setId(IdWorker.getId());
- }
- List<StandardProductList> standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
- for (StandardProductList sp : standardProductLists) {
- 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.getModel(), pl.getModel())
- && Objects.equals(sp.getStructureItemParameterId(), pl.getStructureItemParameterId())) {
- pl.setId(sp.getId());
- if (sp.getState() != null && !sp.getState().equals("")) {
- pl.setState(sp.getState());
- } else {
- pl.setState(id == 0 ? 1 : 0);
- }
- pl.setMethodS(sp.getMethodS());
- 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.getTemplateId() != null && !sp.getTemplateId().equals("")) {
- pl.setTemplateId(sp.getTemplateId());
- }
- if(sp.getTree() != null && !sp.getTree().equals("")){
- pl.setTree(sp.getTree());
- }
- break;
- }
- }
- }
- if (page == 1) {
- Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
- CompletableFuture.supplyAsync(() -> {
- if(trees.length == 5){
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
- }else{
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
- }
- 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()));
- return null;
- }).thenAccept(res -> {
- }).exceptionally(e -> {
- e.printStackTrace();
- return null;
- });
- }
- Map<String, Object> map = new HashMap<>();
- try {
- map.put("productList", list.subList((page - 1) * 50, page * 50));
- } catch (IndexOutOfBoundsException e) {
- map.put("productList", list.subList((page - 1) * 50, list.size()));
- }
- map.put("total", list.size());
- return map;*/
String[] trees = tree.split(" - ");
List<StandardProductList> list = new ArrayList<>();
if (trees.length == 3) {
@@ -272,18 +166,8 @@
}
for (StandardTree standardTree2 : treeList) {
String tree2 = trees[0] + " - " + trees[1] + " - " + trees[2] + " - " + standardTree2.getSample() + " - " + standardTree2.getModel();
- /*if(standardTree2.getSample()!=null){
- tree2 += trees[0] + " - " + trees[1] + " - " + trees[2] + " - " + standardTree2.getSample();
- }
- if(standardTree2.getModel()!=null){
- if(standardTree2.getSample()!=null){
- tree2 += standardTree2.getModel();
- }else{
- tree2 += trees[0] + " - " + trees[1] + " - " + trees[2] + " - " + null + " - " + standardTree2.getModel();
- }
- }*/
- list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2));
- list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + standardTree2.getSample() + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2));
+ 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) {
List<StandardTree> treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]));
@@ -297,12 +181,12 @@
}
for (StandardTree standardTree : treeList) {
String str = tree + " - " + standardTree.getModel();
- list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str));
- list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", standardTree.getSample(), standardTree.getModel(), str));
+ 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 {
- 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));
+ 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]));
}
for (StandardProductList productList : list) {
productList.setId(IdWorker.getId());
@@ -314,7 +198,7 @@
&& 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
+ && sp.getTree().indexOf(pl.getSample() == null ? "null" : pl.getSample()) > -1
&& Objects.equals(sp.getStructureItemParameterId(), pl.getStructureItemParameterId())) {
pl.setId(sp.getId());
if (sp.getState() != null && !sp.getState().equals("")) {
@@ -351,6 +235,7 @@
if (page == 1) {
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
CompletableFuture.supplyAsync(() -> {
+ System.out.println("寮�濮嬪紑濮嬪紑濮嬪紑濮�!!!!!!!!!!");
if (trees.length == 5) {
standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
} else {
@@ -365,6 +250,7 @@
a.setStandardMethodListId(id);
return a;
}).collect(Collectors.toList()));
+ System.out.println("缁撴潫缁撴潫缁撴潫缁撴潫@@@@@@@@@@@@");
return null;
}).thenAccept(res -> {
}).exceptionally(e -> {
@@ -373,6 +259,25 @@
});
}
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;
+ } else {
+ 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) {
@@ -380,6 +285,15 @@
}
map.put("total", list.size());
return map;
+ }
+
+ private int extractNumber(String s) {
+ // 浠庡瓧绗︿覆涓彁鍙栨暟瀛楃殑閫昏緫锛岃繖閲屽亣璁惧瓧娈电殑鏍煎紡鏄� "text<number>"
+ String number = s;
+ if (!s.matches("\\d+")) {
+ number = s.replaceAll("\\D", "");
+ }
+ return Integer.parseInt(number);
}
@Override
@@ -391,18 +305,27 @@
}
@Override
- public Map<String, List<?>> selectStandardProductEnumByMethodId(Integer id, String tree) {
+ 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)));
- map.put("items", standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
- .eq(StandardProductList::getStandardMethodListId, id)
- .like(StandardProductList::getTree, tree)
- .select(StandardProductList::getInspectionItemSubclass)
- .groupBy(StandardProductList::getInspectionItemSubclass)));
+ 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;
}
}
--
Gitblit v1.9.3