From 608fa275864c7cb4353e5e030e4a1304e56529ac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 九月 2023 13:12:05 +0800
Subject: [PATCH] 修改4.0 9.20
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 82273bf..cf52951 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,8 +1,11 @@
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;
+import com.yuanchu.mom.pojo.RawInsProduct;
import com.yuanchu.mom.pojo.dto.InspectionItemDto;
import com.yuanchu.mom.pojo.dto.UpdateInspectionItemDto;
import com.yuanchu.mom.service.DeviceService;
@@ -38,8 +41,8 @@
//鏂板鎸夐挳-->2銆佹煡璇㈡墍鏈夋楠岄」鐩�
@Override
- public List<InspectionItemDto> selectInspectionItem(Integer finishInspectId, Integer type) {
- return inspectionItemMapper.selectInspectionItem(finishInspectId,type);
+ public List<InspectionItemDto> selectInspectionItem(Integer id, Integer type) {
+ return inspectionItemMapper.selectInspectionItem(id,type);
}
@@ -49,6 +52,18 @@
//璇ュ伐鑹篿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) {
+ 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銆佹楠岄」鐩�-->澶卞幓鐒︾偣鍙戣捣璇ヨ姹�
@@ -68,6 +83,7 @@
} else {
inspectionItem.setResult(1);
}
+ inspectionItem.setUsername(username);
inspectionItemMapper.updateById(inspectionItem);
//杩斿洖妫�楠岄」鐩殑缁撹
return inspectionItem.getResult();
--
Gitblit v1.9.3