From 208bb2f289ce8a7b59f587a9f57e24c0fc8a0ba6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:48:40 +0800
Subject: [PATCH] MOM系统-9-24 加班
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
index 00de893..7d32d42 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.service.impl;
+import ch.qos.logback.core.joran.util.beans.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,16 +9,15 @@
import com.yuanchu.mom.mapper.RawInspectMapper;
import com.yuanchu.mom.pojo.RawInsProduct;
import com.yuanchu.mom.pojo.RawInspect;
+import com.yuanchu.mom.pojo.vo.RawInsProductVo;
import com.yuanchu.mom.service.RawInsProductService;
import com.yuanchu.mom.utils.MyUtil;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.sql.Wrapper;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -52,8 +52,14 @@
}else if (testValue.equals("涓嶈繃")){
rawInsProduct.setTestState(0);
}else {
+ char req = required.charAt(0);
List<Integer> list = Arrays.stream(testValue.split(",")).map(s -> {
- int values = checkValues(required, internal, s);
+ int values=2;
+ if (req == '>' || req == '<' || req == '=') {
+ values = checkValues(required, internal, s);
+ }else {
+ values = conValues(required, internal, s);
+ }
return values;
}).collect(Collectors.toList());
if (list.contains(0)) {
@@ -82,25 +88,42 @@
rawInsProductMapper.update(new RawInsProduct(), updateWrapper);
}
+ @Override
+ public void batchAddInsProduct(Integer id, List<RawInsProductVo> rawInsProducts) {
+ List<RawInsProduct> rawInsProductList = new ArrayList<>();
+ rawInsProducts.forEach(i -> {
+ RawInsProduct rawInsProduct1 = new RawInsProduct();
+ BeanUtils.copyProperties(i, rawInsProduct1);
+ rawInsProduct1.setRawInspectId(id);
+ rawInsProduct1.setState(1);
+ rawInsProductList.add(rawInsProduct1);
+ });
+ rawInsProductMapper.insertBatchSomeColumn(rawInsProductList);
+ }
+
/*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
- private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
+ //濡傛灉鏄辩殑鎿嶄綔
+ private int conValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
double standVar = Double.parseDouble(standardValueStr);
double controlVar = Double.parseDouble(controlValueStr);
double detecVar = Double.parseDouble(detectionValueStr);
double a = standVar + controlVar;
double b = standVar - controlVar;
- if (detecVar>=b && detecVar<=a){
+ if (detecVar >= b && detecVar <= a) {
return 1;
}
return 0;
- /*boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
+ }
+ //濡傛灉鏄�> , < ,=鐨勬搷浣�
+ private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
+ boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
boolean isControlValueSatisfied = isValueSatisfied(controlValueStr, detectionValueStr);
if (isStandardValueSatisfied && isControlValueSatisfied) {
return 1;
} else {
return 0;
- }*/
+ }
}
private boolean isValueSatisfied(String valueStr, String detectionValueStr) {
@@ -137,5 +160,6 @@
}
}
}
+
}
--
Gitblit v1.9.3