From 21c22f67b526c446b9f12c2365ec9c0fcab8cec8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 22 八月 2023 17:51:09 +0800
Subject: [PATCH] 改动7.0

---
 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 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 444d70c..9187912 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
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.lang.Snowflake;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,6 +14,7 @@
 import com.yuanchu.limslaboratory.service.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -59,6 +59,7 @@
     @Resource
     UserMapper userMapper;
 
+
     /**
      * 鏌ヨ妫�楠岀敵璇峰崟鍒楄〃
      *
@@ -78,6 +79,7 @@
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Integer addInspect(Integer id, InspectionVo inspectionVo) {
         /*鏂板妫�楠岀敵璇疯〃*/
         Inspection inspection = Inspection.builder()
@@ -138,6 +140,7 @@
 
     //鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public InspectDetailVo selectInspectsListById(Integer id) {
         /*灏嗘楠屽崟鍩烘湰淇℃伅鏌ヨ鍑烘潵骞跺皝瑁呭埌RawInspectVo瀵硅薄涓�*/
         Inspection inspection = inspectionMapper.selectById(id);
@@ -181,19 +184,34 @@
         return inspectDetailVo;
     }
 
-    //鏇存柊妫�楠屽崟妫�楠岀粨鏋�
+    //浣滃簾妫�楠屽崟
     @Override
-    public boolean updateInspectsById(Integer id) {
-        //鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀姸鎬佸拰妫�楠岀粨璁�
-        InspectDetailVo inspectDetailVo = selectInspectsListById(id);
-        Inspection inspection = Inspection.builder()
-                .id(id)
-                .inspectionStatus(inspectDetailVo.getInspectionStatus())
-                .build();
+    @Transactional(rollbackFor = Exception.class)
+    public String delInspect(Integer id) {
+        /*浣滃簾妫�楠屽崟*/
+        Inspection inspection = new Inspection();
+        inspection.setId(id);
+        inspection.setState(0);
         inspectionMapper.updateById(inspection);
-        //鐢熸垚鎶ュ憡鍗�
-
-        return true;
+        /*浣滃簾妫�楠屾牱鍝�*/
+        InspectionMaterial inspectionMaterial = inspectionMaterialMapper.selectOne(Wrappers.<InspectionMaterial>query().eq("inspection_id", id));
+        inspectionMaterial.setState(0);
+        inspectionMaterialMapper.updateById(inspectionMaterial);
+        /*浣滃簾妫�楠岄」鐩�*/
+        inspectionProductMapper.updat(inspectionMaterial.getId());
+        return "浣滃簾鎴愬姛!";
     }
+
+    //淇濆瓨妫�楠岄」鐩矗浠讳汉
+    @Override
+    public String chooseUseProId(Integer id, Integer userProId) {
+        InspectionProduct inspectionProduct = new InspectionProduct();
+        inspectionProduct.setId(id);
+        inspectionProduct.setUserProId(userProId);
+        inspectionProductMapper.updateById(inspectionProduct);
+        return "淇濆瓨鎴愬姛!";
+    }
+
+
 }
 

--
Gitblit v1.9.3