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 | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 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 68a5caf..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
@@ -1,14 +1,20 @@
package com.yuanchu.limslaboratory.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.yuanchu.limslaboratory.mapper.InspectionMaterialListMapper;
+import com.yuanchu.limslaboratory.mapper.PlanMapper;
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.mapper.InspectionMapper;
+import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
+import com.yuanchu.limslaboratory.pojo.Plan;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionDto;
import com.yuanchu.limslaboratory.service.InspectionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
import java.util.List;
-import java.util.Map;
+
/**
* <p>
@@ -24,8 +30,50 @@
@Resource
private InspectionMapper inspectionMapper;
+ @Resource
+ private PlanMapper planMapper;
+
+ @Resource
+ InspectionMaterialListMapper inspectionMaterialListMapper;
+
+ //娣诲姞妫�楠岀敵璇峰崟
@Override
- public int addInspection(Inspection inspection) {
- return inspectionMapper.insert(inspection);
+ public Inspection addInspection(String userName,int type) {
+ Inspection inspection = new Inspection(type, 0,1,1, userName);
+ int judge = inspectionMapper.insert(inspection);
+ return judge>0?inspection:null;
+ }
+
+ //鏌ヨ鎵�鏈夋楠屽崟鍒楄〃
+ @Override
+ public List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state) {
+ return inspectionMapper.selectAllInspection((pageSize - 1) * countSize,pageSize * countSize, state);
+ }
+
+ //浣滃簾鐢宠妫�楠屽崟
+ @Override
+ public boolean delInspectionByInsId(String inspectionId) {
+ //妫�楠屽崟浣滃簾
+ 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);
+ return judge1>0&&judge2>0;
+ }
+
+ //鎻愪氦鐢宠妫�楠屽崟
+ @Override
+ public boolean subInspectionByInsId(String inspectionId) {
+ Inspection inspection = inspectionMapper.selectById(inspectionId);
+ //鐘舵�佹敼涓哄凡鎻愪氦2
+ inspection.setState(2);
+ int judge = inspectionMapper.updateById(inspection);
+ //璁″垝琛ㄦ柊澧�
+ Plan plan = Plan.builder().inspectionId(inspectionId).state(1).build();
+ planMapper.insert(plan);
+ return judge>0;
}
}
--
Gitblit v1.9.3