From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java | 61 ++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
index 39d235c..cfe7b55 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
@@ -1,5 +1,7 @@
package com.yuanchu.mom.service.impl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.mom.mapper.InspectionItemMapper;
import com.yuanchu.mom.mapper.TechniqueMapper;
import com.yuanchu.mom.pojo.InspectionItem;
@@ -45,23 +47,23 @@
//鏂板杩囩▼妫�楠屽崟-->閫夋嫨璁惧
- @Override
+ /*@Override
public List<Map<String, Object>> chooseDev(Integer technologyId, String father, String name) {
//璇ュ伐鑹篿d涓嬬敓浜у伐鑹烘渶鏂扮増鏈�
Integer ver = techniqueMapper.selectVerByTeId(technologyId).get(0);
return techniqueMapper.selDevByVerTecIdFaNam(technologyId, father, name, ver);
- }
+ }*/
//鏇存敼璁惧
@Override
public void updateDevByInsId(Integer id, Integer type, Integer devId) {
- InspectionItem inspectionItem = new InspectionItem();
- inspectionItem.setId(id);
- inspectionItem.setType(type);
- inspectionItem.setDeviceId(devId);
- inspectionItem.setInspectionValue(null);
- inspectionItem.setResult(null);
- inspectionItemMapper.updateById(inspectionItem);
+ LambdaUpdateWrapper<InspectionItem> updateWrapper = Wrappers.<InspectionItem>lambdaUpdate()
+ .eq(InspectionItem::getId, id)
+ .eq(InspectionItem::getType, type)
+ .set(InspectionItem::getDeviceId, devId)
+ .set(InspectionItem::getInspectionValue, null)
+ .set(InspectionItem::getResult, null);
+ inspectionItemMapper.update(new InspectionItem(), updateWrapper);
}
//鏂板鎸夐挳-->2銆佹楠岄」鐩�-->澶卞幓鐒︾偣鍙戣捣璇ヨ姹�
@@ -71,15 +73,27 @@
InspectionItem inspectionItem = inspectionItemMapper.selectById(updateInspectionItemDto.getInspectionItemId());
inspectionItem.setInspectionValue(updateInspectionItemDto.getInspectionValue());
inspectionItem.setDeviceId(updateInspectionItemDto.getDeviceId());
- List<Integer> list = Arrays.stream( updateInspectionItemDto.getInspectionValue().split(",")).map(s -> {
- int values = checkValues(inspectionItem.getRequired(), inspectionItem.getInternal(), s);
- return values;
- }).collect(Collectors.toList());
- if (list.contains(0)) {
- //濡傛灉鍏朵腑涓�涓楠屽�间笉鍚堟牸鍒欒椤圭洰妫�楠屼笉鍚堟牸
- inspectionItem.setResult(0);
- } else {
+ if (updateInspectionItemDto.getInspectionValue().equals("杩�")){
inspectionItem.setResult(1);
+ }else if (updateInspectionItemDto.getInspectionValue().equals("涓嶈繃")){
+ inspectionItem.setResult(0);
+ }else {
+ char req = inspectionItem.getRequired().charAt(0);
+ List<Integer> list = Arrays.stream(updateInspectionItemDto.getInspectionValue().split(",")).map(s -> {
+ int values=2;
+ if (req == '>' || req == '<' || req == '=') {
+ values = checkValues(inspectionItem.getRequired(), inspectionItem.getInternal(), s);
+ }else {
+ values = conValues(inspectionItem.getRequired(), inspectionItem.getInternal(), s);
+ }
+ return values;
+ }).collect(Collectors.toList());
+ if (list.contains(0)) {
+ //濡傛灉鍏朵腑涓�涓楠屽�间笉鍚堟牸鍒欒椤圭洰妫�楠屼笉鍚堟牸
+ inspectionItem.setResult(0);
+ } else {
+ inspectionItem.setResult(1);
+ }
}
inspectionItem.setUsername(username);
inspectionItemMapper.updateById(inspectionItem);
@@ -89,6 +103,19 @@
/*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
+ //濡傛灉鏄辩殑鎿嶄綔
+ 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) {
+ return 1;
+ }
+ return 0;
+ }
+ //濡傛灉鏄�> , < ,=鐨勬搷浣�
private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
boolean isControlValueSatisfied = isValueSatisfied(controlValueStr, detectionValueStr);
--
Gitblit v1.9.3