From ee5f64ff15c79240681fc46b0201a293ccaf54ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 七月 2023 18:02:56 +0800
Subject: [PATCH] 检验模块
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 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 058dd0b..040aa26 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
@@ -3,22 +3,26 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yuanchu.limslaboratory.mapper.InspectionMaterialListMapper;
+import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
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.InspectionProductList;
import com.yuanchu.limslaboratory.pojo.Plan;
import com.yuanchu.limslaboratory.pojo.dto.InspectionDto;
+import com.yuanchu.limslaboratory.service.InspectionProductListService;
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.Date;
import java.util.List;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -36,18 +40,21 @@
@Resource
InspectionMaterialListMapper inspectionMaterialListMapper;
+ @Resource
+ InspectionProductListMapper inspectionProductListMapper;
+
//娣诲姞妫�楠岀敵璇峰崟
@Override
- public Inspection addInspection(String userName,int type) {
- Inspection inspection = new Inspection(type, 0,1,1, userName);
+ 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;
+ 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);
+ return inspectionMapper.selectAllInspection((pageSize - 1) * countSize, pageSize * countSize, state);
}
//浣滃簾鐢宠妫�楠屽崟
@@ -57,11 +64,18 @@
Inspection inspection = inspectionMapper.selectById(inspectionId);
inspection.setState(0);
int judge1 = inspectionMapper.updateById(inspection);
+ //妫�楠岃鍒掍綔搴�
+ UpdateWrapper<Plan> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("inspection_id", inspectionId).set("state", 0);
+ planMapper.update(new Plan(),updateWrapper );
//妫�楠屾牱鍝佷綔搴�(鏍规嵁鎶ユ鍗昳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;
+ UpdateWrapper<InspectionMaterialList> wrapper1 = new UpdateWrapper<>();
+ wrapper1.eq("inspection_id", inspectionId).set("state", 0);
+ int judge2 = inspectionMaterialListMapper.update(new InspectionMaterialList(), wrapper1);
+ return judge1 > 0 && judge2 > 0;
+ //妫�楠屾牱鍝佷腑鐨勬楠岄」鐩綔搴�
+ //鏌ュ嚭妫�楠屾牱鍝乮d
+
}
//鎻愪氦鐢宠妫�楠屽崟
@@ -72,8 +86,8 @@
inspection.setState(2);
int judge = inspectionMapper.updateById(inspection);
//璁″垝琛ㄦ柊澧�
- Plan plan = Plan.builder().inspectionId(inspectionId).state(1).build();
+ Plan plan = Plan.builder().inspectionId(inspectionId).state(1).userId(inspection.getInspectUserId()).createTime(new Date()).build();
planMapper.insert(plan);
- return judge>0;
+ return judge > 0;
}
}
--
Gitblit v1.9.3