From f77a2eba10ce3f430d31a34790a8a1184c8069e6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 22 八月 2023 11:50:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 56 +++++++++++++++++++++++++-------------------------------
1 files changed, 25 insertions(+), 31 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 66bfb6e..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;
@@ -13,7 +12,6 @@
import com.yuanchu.limslaboratory.pojo.vo.InspectDetailVo;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.service.*;
-import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -61,8 +59,6 @@
@Resource
UserMapper userMapper;
- @Resource
- ReportMapper reportMapper;
/**
* 鏌ヨ妫�楠岀敵璇峰崟鍒楄〃
@@ -188,36 +184,34 @@
return inspectDetailVo;
}
- //鏇存柊妫�楠屽崟妫�楠岀粨鏋�
+ //浣滃簾妫�楠屽崟
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean updateInspectsById(Integer id) {
- //鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀姸鎬佸拰妫�楠岀粨璁�
- InspectDetailVo inspectDetailVo = selectInspectsListById(id);
- Inspection inspection = Inspection.builder()
- .id(id)
- .inspectionStatus(inspectDetailVo.getInspectionStatus())
- .build();
+ public String delInspect(Integer id) {
+ /*浣滃簾妫�楠屽崟*/
+ Inspection inspection = new Inspection();
+ inspection.setId(id);
+ inspection.setState(0);
inspectionMapper.updateById(inspection);
- //鐢熸垚鎶ュ憡鍗�
- Report report = new Report();
- //鐢熸垚鎶ュ憡鍗曞彿
- String code = MyUtil.getTimeSixNumberCode("BG","BG");
- //鑾峰彇妫�楠岀粨璁�
- String conclusion = "";
- Inspection inspection1 = inspectionMapper.selectById(id);
- if (inspection1.getInspectionStatus().equals(1)) {
- conclusion = "鍚堟牸";
- }else {
- conclusion = "涓嶅悎鏍�";
- }
- report.setCode(code);
- report.setStatus(0);
- report.setConclusion(conclusion);
- report.setInspectionId(id);
- reportMapper.insert(report);
-
- 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