From 6db5272e2df8a27942f10c03d93183fc9b01e22a Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 04 九月 2023 18:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 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 23e7853..31bc55f 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,17 +1,19 @@
package com.yuanchu.mom.service.impl;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.RawInsProductMapper;
+import com.yuanchu.mom.mapper.RawInspectMapper;
import com.yuanchu.mom.pojo.RawInsProduct;
+import com.yuanchu.mom.pojo.RawInspect;
import com.yuanchu.mom.service.RawInsProductService;
-import com.yuanchu.mom.utils.MyUtil;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 鍘熸潗鏂欑敵璇峰崟涓殑椤圭洰鍒楄〃(RawInsProduct)琛ㄦ湇鍔″疄鐜扮被
@@ -25,21 +27,37 @@
@Resource
RawInsProductMapper rawInsProductMapper;
- //鏇存柊妫�楠岄」鐩�
+ @Resource
+ RawInspectMapper rawInspectMapper;
+
+ //鏇存柊妫�楠岄」鐩�(濉啓妫�楠屽��,妫�楠岃澶�)
@Override
- public void updaterawInsProduct(int userId, RawInsProduct rawInsProduct) {
+ public void updaterawInsProduct(int userId,Integer rpId ,String testValue,Integer devId) {
+ RawInsProduct rawInsProduct = rawInsProductMapper.selectById(rpId);
+ //璧嬪�艰澶�
+ rawInsProduct.setDeviceId(devId);
//璧嬪�兼楠屽憳id
rawInsProduct.setUserId(userId);
//鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�0
- String testValue = rawInsProduct.getTestValue();//妫�楠屽��
String required = rawInsProduct.getRequired();//鏍囧噯鍊�
String internal = rawInsProduct.getInternal();//鍐呮帶鍊�
- rawInsProduct.setTestState(checkValues(required, internal, testValue));
- //鏍规嵁妫�楠岄」鐩悕鍜屽叧鑱旂殑妫�楠屽崟id鏉ユ煡璇㈡楠岄」鐩殑鏁版嵁
- LambdaUpdateWrapper<RawInsProduct> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(RawInsProduct::getRawInspectId, rawInsProduct.getRawInspectId())
- .eq(RawInsProduct::getName, rawInsProduct.getName());
- rawInsProductMapper.update(rawInsProduct, updateWrapper);
+ rawInsProduct.setTestValue(testValue);
+ List<Integer> list = Arrays.stream(testValue.split(",")).map(s -> {
+ int values = checkValues(required, internal, s);
+ return values;
+ }).collect(Collectors.toList());
+ if (list.contains(0)) {
+ //濡傛灉鍏朵腑涓�涓楠屽�间笉鍚堟牸鍒欒椤圭洰妫�楠屼笉鍚堟牸
+ rawInsProduct.setTestState(0);
+ }else {
+ rawInsProduct.setTestState(1);
+ }
+ /*鏇存柊鍘熸潗鏂欐楠岄」鐩〃*/
+ rawInsProductMapper.updateById(rawInsProduct);
+ /*鏇存柊鍘熸潗鏂欐楠屽崟*/
+ RawInspect rawInspect = new RawInspect();
+ rawInspect.setId(rawInsProduct.getRawInspectId());
+ rawInspectMapper.updateById(rawInspect);
}
/*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
--
Gitblit v1.9.3