From f04c1a5a967679b9984926af72be8a3d3f26c2bb Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 25 七月 2023 15:44:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java
index 7c002bf..c7ed1f0 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java
@@ -1,15 +1,13 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.mapper.InspectionMaterialListMapper;
import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
import com.yuanchu.limslaboratory.mapper.PlanMapper;
import com.yuanchu.limslaboratory.mapper.ProductMapper;
-import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
-import com.yuanchu.limslaboratory.pojo.InspectionProductList;
-import com.yuanchu.limslaboratory.pojo.Plan;
-import com.yuanchu.limslaboratory.pojo.Product;
+import com.yuanchu.limslaboratory.pojo.*;
import com.yuanchu.limslaboratory.service.InspectionMaterialListService;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.yuanchu.limslaboratory.service.PlanService;
@@ -68,16 +66,30 @@
return judge>0&&judge2>0?inspectionMaterialList:null;
}
+ //鏍规嵁鏍峰搧id鍒犻櫎妫�楠屾牱鍝�
@Override
@Transactional(rollbackFor = Exception.class)
public boolean delInspectionMaterialListByInsId(int inspectionMaterialListId) {
+ //鍒犻櫎妫�楠屾牱鍝�
InspectionMaterialList list = new InspectionMaterialList();
list.setState(0);
list.setId(inspectionMaterialListId);
int judge1 = inspectionMaterialListMapper.updateById(list);
+ //鍒犻櫎鏍峰搧妫�楠岄」鐩�
UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
wrapper.eq("inspection_material_list_id", inspectionMaterialListId).set("state", 0);
int judge2 = inspectionProductListMapper.update(new InspectionProductList(), wrapper);
return judge1>0&&judge2>0;
}
+
+ //淇敼鏍峰搧淇℃伅
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateInspectionMaterialList( Integer inspectionMaterialListId,InspectionMaterialList inspectionMaterialList) {
+ LambdaUpdateWrapper<InspectionMaterialList> updateWrapper = new LambdaUpdateWrapper<>();
+ //鏍规嵁鏍峰搧id鏌ヨ
+ updateWrapper.eq(InspectionMaterialList::getId,inspectionMaterialListId);
+ int judge = inspectionMaterialListMapper.update(inspectionMaterialList, updateWrapper);
+ return judge>0;
+ }
}
--
Gitblit v1.9.3