From 0a62550520293dacf31c4cf0dd58735db066e2dd Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:29:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
index ee9070c..058dd0b 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
@@ -29,17 +29,18 @@
@Resource
private InspectionMapper inspectionMapper;
+
@Resource
private PlanMapper planMapper;
+
@Resource
InspectionMaterialListMapper inspectionMaterialListMapper;
+ //娣诲姞妫�楠岀敵璇峰崟
@Override
public Inspection addInspection(String userName,int type) {
Inspection inspection = new Inspection(type, 0,1,1, userName);
- System.out.println(inspection);
int judge = inspectionMapper.insert(inspection);
- System.out.println(judge);
return judge>0?inspection:null;
}
@@ -56,7 +57,7 @@
Inspection inspection = inspectionMapper.selectById(inspectionId);
inspection.setState(0);
int judge1 = inspectionMapper.updateById(inspection);
- //妫�楠屾牱鍝佷綔搴�
+ //妫�楠屾牱鍝佷綔搴�(鏍规嵁鎶ユ鍗昳d鍒犻櫎鏍峰搧淇℃伅)
UpdateWrapper<InspectionMaterialList> wrapper = new UpdateWrapper<>();
wrapper.eq("inspection_id", inspectionId).set("state", 0);
int judge2 = inspectionMaterialListMapper.update(new InspectionMaterialList(),wrapper);
--
Gitblit v1.9.3