From 826cfd6d1673337b1872632a84443537404917d4 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 21 五月 2024 09:21:11 +0800
Subject: [PATCH] 标准增家筛选
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 72 ++++++++++++++++++++++++-----------
inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java | 5 ++
inspect-server/src/main/resources/mapper/StandardProductListMapper.xml | 26 +++++++------
inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java | 3 +
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 14 +++++++
5 files changed, 85 insertions(+), 35 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
index 2cdcc88..52d84ba 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -109,6 +109,20 @@
return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
}
+ @ApiOperation(value = "鎵归噺缂栬緫鏌ヨ妫�楠岄」鐩�")
+ @PostMapping("/selectStandardProductByMethodId")
+ @ValueAuth
+ public Result selectStandardProductByMethodId(Integer id, String tree, Integer page,String laboratory,String item,String items){
+ return Result.success(standardProductListService.selectStandardProductByMethodId(id, tree, page, laboratory, item, items));
+ }
+
+ @ApiOperation(value = "鎵归噺缂栬緫鏌ヨ鎵�鏈夋楠岄」鐩拰妫�楠屽瓙椤规灇涓�")
+ @PostMapping("/selectStandardProductEnumByMethodId")
+ @ValueAuth
+ public Result selectStandardProductEnumByMethodId(Integer id, String tree){
+ return Result.success(standardProductListService.selectStandardProductEnumByMethodId(id, tree));
+ }
+
@ApiOperation(value = "鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇")
@GetMapping("/selectStandardMethodEnum")
@ValueAuth
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java
index 5247bc5..3d5d0bf 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yuanchu.mom.pojo.StandardProductList;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -11,6 +12,8 @@
*/
public interface StandardProductListMapper extends BaseMapper<StandardProductList> {
+ IPage<StandardProductList> standardProductListIPage(Integer id, String tree, IPage<StandardProductList> iPage, String laboratory, String item, String items);
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java
index 5539cd5..0825375 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.service;
import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.pojo.StandardProductList;
@@ -23,4 +24,8 @@
Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page);
+ IPage<StandardProductList> selectStandardProductByMethodId(Integer id, String tree, Integer page, String laboratory, String item, String items);
+
+ Map<String, List<?>> selectStandardProductEnumByMethodId(Integer id, String tree);
+
}
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 eda6b69..4fdd84c 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
@@ -2,7 +2,9 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.mapper.StandardProductListMapper;
@@ -55,7 +57,7 @@
public List<StandardProductList> selectStandardProductList(InsSample insSample) {
String[] models = insSample.getModel().split("-(?=[^-]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1).eq(StandardProductList::getModel, models[0]));
- if(list.size() == 0){
+ if (list.size() == 0) {
list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1));
}
list = list.stream().filter(a -> {
@@ -67,7 +69,7 @@
List<String> manHours = JSON.parseArray(a.getManHour(), String.class);
List<String> prices = JSON.parseArray(a.getPrice(), String.class);
boolean isIf = false;
- for (int i = 0;i<sections.size();i++){
+ for (int i = 0; i < sections.size(); i++) {
if (sections.get(i).contains("&")) {
String[] split = sections.get(i).split("&");
isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(split[0])) > -1 && new BigDecimal(models[1]).compareTo(new BigDecimal(split[1])) < 1;
@@ -87,7 +89,7 @@
String param = sections.get(i).replace("=", "");
isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) == 0;
}
- if(isIf) {
+ if (isIf) {
a.setSection(sections.get(i));
a.setAsk(asks.get(i));
a.setTell(tells.get(i));
@@ -112,7 +114,7 @@
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){
+ if (treeList.size() == 0) {
StandardTree standardTree = new StandardTree();
standardTree.setFactory(trees[0]);
standardTree.setLaboratory(trees[1]);
@@ -120,12 +122,12 @@
treeList.add(standardTree);
}
for (StandardTree standardTree : treeList) {
- String str = tree+" - "+standardTree.getSample()+" - "+standardTree.getModel();
+ String str = tree + " - " + standardTree.getSample() + " - " + standardTree.getModel();
list.addAll(standardTreeMapper.selectStandardProductListByTree3("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str));
}
- } else if (trees.length == 4){
+ } 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){
+ if (treeList.size() == 0) {
StandardTree standardTree = new StandardTree();
standardTree.setFactory(trees[0]);
standardTree.setLaboratory(trees[1]);
@@ -134,7 +136,7 @@
treeList.add(standardTree);
}
for (StandardTree standardTree : treeList) {
- String str = tree+" - "+standardTree.getModel();
+ 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));
}
@@ -146,42 +148,42 @@
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.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("")){
+ if (sp.getState() != null && !sp.getState().equals("")) {
pl.setState(sp.getState());
- }else{
- pl.setState(id==0?1:0);
+ } else {
+ pl.setState(id == 0 ? 1 : 0);
}
pl.setMethodS(sp.getMethodS());
- if(sp.getAsk()!=null&&!sp.getAsk().equals("")){
+ if (sp.getAsk() != null && !sp.getAsk().equals("")) {
pl.setAsk(sp.getAsk());
}
- if(sp.getTell()!=null&&!sp.getTell().equals("")){
+ if (sp.getTell() != null && !sp.getTell().equals("")) {
pl.setTell(sp.getTell());
}
- if(sp.getPrice()!=null&&!sp.getPrice().equals("")){
+ if (sp.getPrice() != null && !sp.getPrice().equals("")) {
pl.setPrice(sp.getPrice());
}
- if(sp.getManHour()!=null&&!sp.getManHour().equals("")){
+ if (sp.getManHour() != null && !sp.getManHour().equals("")) {
pl.setManHour(sp.getManHour());
}
- if(sp.getSection()!=null&&!sp.getSection().equals("")){
+ if (sp.getSection() != null && !sp.getSection().equals("")) {
pl.setSection(sp.getSection());
}
- if(sp.getTemplateId()!=null&&!sp.getTemplateId().equals("")){
+ if (sp.getTemplateId() != null && !sp.getTemplateId().equals("")) {
pl.setTemplateId(sp.getTemplateId());
}
break;
}
}
}
- if(page == 1){
+ if (page == 1) {
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
CompletableFuture.supplyAsync(() -> {
standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
- standardProductListService2.saveBatch(list.stream().map(a->{
+ standardProductListService2.saveBatch(list.stream().map(a -> {
a.setFactory(trees[0]);
a.setLaboratory(trees[1]);
a.setSampleType(trees[2]);
@@ -199,13 +201,37 @@
}
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("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;
}
+
+ @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) {
+ 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)));
+ return map;
+ }
}
diff --git a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
index dfdbe58..5735cfd 100644
--- a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -16,10 +16,8 @@
<result property="manHourGroup" column="man_hour_group" jdbcType="VARCHAR"/>
<result property="inspectionItemType" column="inspection_item_type" jdbcType="VARCHAR"/>
<result property="inspectionValueType" column="inspection_value_type" jdbcType="VARCHAR"/>
- <result property="deviceGroup" column="device_group" jdbcType="VARCHAR"/>
<result property="checkoutNumber" column="checkout_number" jdbcType="INTEGER"/>
<result property="section" column="section" jdbcType="VARCHAR"/>
- <result property="valueType" column="value_type" jdbcType="VARCHAR"/>
<result property="method" column="method" jdbcType="VARCHAR"/>
<result property="manDay" column="man_day" jdbcType="INTEGER"/>
<result property="bsm" column="bsm" jdbcType="VARCHAR"/>
@@ -31,14 +29,18 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <sql id="Base_Column_List">
- id,inspection_item,inspection_item_classify,
- inspection_item_subclass,laboratory,unit,
- price,man_hour,man_hour_group,
- inspection_item_type,inspection_value_type,device_group,
- checkout_number,section,value_type,
- method,man_day,bsm,
- ask,standard_method_list_id,create_user,
- update_user,create_time,update_time
- </sql>
+ <select id="standardProductListIPage" resultType="com.yuanchu.mom.pojo.StandardProductList">
+ select * from `center-lims`.standard_product_list
+ where standard_method_list_id = #{id}
+ and tree like concat('%',#{tree},'%')
+ <if test="laboratory != ''">
+ and son_laboratory = #{laboratory}
+ </if>
+ <if test="item != ''">
+ and inspection_item = #{item}
+ </if>
+ <if test="items != ''">
+ and inspection_item_subclass = #{items}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3