From a7a6a0c332f268010b4da0161cdee80acf9bc4ce Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 22 四月 2024 15:59:57 +0800
Subject: [PATCH] 2024-4-22 资源要求-人员明细-bug修改
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 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 db9964b..9c473db 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
@@ -1,22 +1,30 @@
package com.yuanchu.mom.service.impl;
+import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.service.StandardProductListService;
import com.yuanchu.mom.mapper.StandardProductListMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恠tandard_product_list(鏍囧噯鏍戜笅鐨勬楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2024-03-05 10:33:29
-*/
+ * @author Administrator
+ * @description 閽堝琛ㄣ�恠tandard_product_list(鏍囧噯鏍戜笅鐨勬楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2024-03-05 10:33:29
+ */
@Service
@AllArgsConstructor
public class StandardProductListServiceImpl extends ServiceImpl<StandardProductListMapper, StandardProductList>
- implements StandardProductListService{
+ implements StandardProductListService {
private StandardProductListMapper standardProductListMapper;
@@ -29,6 +37,45 @@
public int delStandardProduct(JSONArray list) {
return standardProductListMapper.deleteBatchIds(list);
}
+
+ @Override
+ public List<StandardProductList> selectStandardProductList(InsSample insSample) {
+ List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1));
+ list = list.stream().filter(a -> {
+ try {
+ if(a.getSection()!=null && !Objects.equals(a.getSection(), "")){
+ if (a.getSection().contains("~")) {
+ String[] split = a.getSection().split("~");
+ return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(split[0])) > -1 && new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(split[1])) < 1;
+ } else if (a.getSection().contains("鈮�") || a.getSection().contains(">=")) {
+ String param = a.getSection().replace("鈮�", "").replace(">=","");
+ return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) > -1;
+ } else if (a.getSection().contains("鈮�") || a.getSection().contains("<=")) {
+ String param = a.getSection().replace("鈮�", "").replace("<=","");
+ return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) < 1;
+ } else if (a.getSection().contains(">")) {
+ String param = a.getSection().replace(">", "");
+ return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) > 0;
+ } else if (a.getSection().contains("<")) {
+ String param = a.getSection().replace("<", "");
+ return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) < 0;
+ } else if (a.getSection().contains("=")) {
+ String param = a.getSection().replace("=", "");
+ return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) == 0;
+ }
+ }
+ } catch (Exception ignored) {
+ return false;
+ }
+ return true;
+ }).collect(Collectors.toList());
+ return list;
+ }
+
+ @Override
+ public List<StandardProductList> selectStandardProductListByMethodId(Integer id) {
+ return standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, id));
+ }
}
--
Gitblit v1.9.3