From 6236d3f2ade69cfea844b1cfdd7622909dd42026 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 29 八月 2023 17:54:22 +0800
Subject: [PATCH] 删除委托报检(样品)
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java | 10 ++++++++++
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 5 +++--
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java | 13 +++++++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkDetection.java | 2 +-
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java | 3 +++
5 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
index 76edbcc..ebe036d 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.annotation.AuthHandler;
+import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
@@ -69,4 +71,15 @@
return Result.success(map);
}
+ @ApiOperation("鍒犻櫎")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "濮旀墭鏍峰搧id", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/delLink")
+ @AuthHandler
+ public Result<?> delLink(Integer id){
+ linkBasicInformationService.delLink(id);
+ return Result.success("鍒犻櫎鎴愬姛!");
+ }
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkDetection.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkDetection.java
index 5345c81..832e4ca 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkDetection.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkDetection.java
@@ -60,7 +60,7 @@
@ApiModelProperty(value = "LinkBasicInformation瀵硅薄Id", hidden = true)
private Integer linkBasicId;
- @TableLogic(value = "1", delval = "0")
+
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
private Integer state;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java
index 3a4c2a5..522f85c 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java
@@ -36,4 +36,7 @@
Map<String, String> selectViewUUID();
boolean isIfViewUUID(String uuid);
+
+ //鏍规嵁濮旀墭鏍峰搧id鍒犻櫎
+ void delLink(Integer id);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
index d7dd0eb..65f283f 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.yuanchu.limslaboratory.mapper.LinkBasicInformationMapper;
+import com.yuanchu.limslaboratory.pojo.LinkDetection;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.service.LinkDetectionService;
@@ -83,5 +84,14 @@
return uuid.equals(RedisUtil.get("viewId"));
}
+ //鏍规嵁濮旀墭鏍峰搧鍒犻櫎
+ @Override
+ public void delLink(Integer id) {
+ LinkDetection linkDetection = new LinkDetection();
+ linkDetection.setId(id);
+ linkDetection.setState(0);
+ linkDetectionService.updateById(linkDetection);
+ }
+
}
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 619b044..36ec1c1 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -2,14 +2,15 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.LinkBasicInformationMapper">
<select id="getLinkBasicPage" resultType="map">
- SELECT l.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`,
+ SELECT d.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`,
d.`specifications_models`,
DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d') inspectionTime, DATE_FORMAT(l.`completion_deadline`,'%Y-%m-%d')
completionDeadline, l.`contacts`,
DATE_FORMAT(d.`date_survey`,'%Y-%m-%d') dateSurvey, d.`inspection_status`
FROM link_basic_information l, link_detection d
WHERE l.`id` = d.`link_basic_id`
- AND l.`state` = 1
+ AND d.`state` = 1
+ and l.`state` = 1
<if test="entrustCoding != null and entrustCoding != null">
AND l.`entrust_coding` like concat('%', #{entrustCoding}, '%')
</if>
--
Gitblit v1.9.3