From 032b976ab803a263e734dcdca3ceadaed48f1070 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:51:08 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-27下班合并代码
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 79 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 21 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 0f49d8c..ebfb650 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,23 +1,32 @@
package com.yuanchu.limslaboratory.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.time.LocalDateTime;
+import java.util.Date;
import java.util.List;
-import java.util.Map;
+
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -29,37 +38,65 @@
@Resource
private InspectionMapper inspectionMapper;
+ @Resource
+ private PlanMapper planMapper;
+
+ @Resource
+ InspectionMaterialListMapper inspectionMaterialListMapper;
+
+ @Resource
+ InspectionProductListService inspectionProductListService;
+
+ //娣诲姞妫�楠岀敵璇峰崟
@Override
- public Inspection addInspection(String userName,int type) {
- Inspection inspection = new Inspection(type, 0,1,1, userName);
- System.out.println(inspection);
+ public Inspection addInspection(String userName, int type) {
+ Inspection inspection = new Inspection(type, 0, 1, 1, userName);
int judge = inspectionMapper.insert(inspection);
- System.out.println(judge);
- 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);
}
+ //浣滃簾鐢宠妫�楠屽崟
@Override
- public boolean delInspectionByInsId(String inspectionId) {
- Inspection inspection = new Inspection();
+ public void delInspectionByInsId(String inspectionId) {
+ /*妫�楠屽崟浣滃簾*/
+ Inspection inspection = inspectionMapper.selectById(inspectionId);
inspection.setState(0);
- inspection.setId(inspectionId);
- int judge = inspectionMapper.updateById(inspection);
- return judge>0;
-
+ inspectionMapper.updateById(inspection);
+ /*妫�楠岃鍒掍綔搴�*/
+ UpdateWrapper<Plan> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("inspection_id", inspectionId).set("state", 0);
+ planMapper.update(new Plan(), updateWrapper);
+ /*妫�楠屾牱鍝佷綔搴�(鏍规嵁鎶ユ鍗昳d鍒犻櫎鏍峰搧淇℃伅)*/
+ UpdateWrapper<InspectionMaterialList> wrapper1 = new UpdateWrapper<>();
+ wrapper1.eq("inspection_id", inspectionId).set("state", 0);
+ inspectionMaterialListMapper.update(new InspectionMaterialList(), wrapper1);
+ /*妫�楠屾牱鍝佷腑鐨勬楠岄」鐩綔搴�*/
+ //鏌ュ嚭妫�楠屾牱鍝乮d
+ LambdaQueryWrapper<InspectionMaterialList> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(InspectionMaterialList::getInspectionId,inspectionId);
+ List<InspectionMaterialList> inspectionMaterialLists = inspectionMaterialListMapper.selectList(queryWrapper);
+ for (InspectionMaterialList inspectionMaterialList : inspectionMaterialLists) {
+ UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
+ wrapper.eq("inspection_material_list_id", inspectionMaterialList.getId()).set("state", 0);
+ inspectionProductListService.update(new InspectionProductList(), wrapper);
+ }
}
+ //鎻愪氦鐢宠妫�楠屽崟
@Override
- public boolean subInspectionByInsId(String inspectionId) {
- Inspection inspection = new Inspection();
+ public void subInspectionByInsId(String inspectionId) {
+ Inspection inspection = inspectionMapper.selectById(inspectionId);
+ //鐘舵�佹敼涓哄凡鎻愪氦2
inspection.setState(2);
- inspection.setId(inspectionId);
- inspection.setInspectStartTime(LocalDateTime.now());
- int judge = inspectionMapper.updateById(inspection);
- return judge>0;
+ inspectionMapper.updateById(inspection);
+ //璁″垝琛ㄦ柊澧�
+ Plan plan = Plan.builder().inspectionId(inspectionId).state(1).userId(inspection.getInspectUserId()).createTime(new Date()).build();
+ planMapper.insert(plan);
}
}
--
Gitblit v1.9.3