From e0e20362cadcd739be75960949b422b96e6481d7 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 29 八月 2023 17:51:46 +0800
Subject: [PATCH] 修改委托
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/LinkBasicInformationMapper.java | 4 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java | 5 ++
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 50 ++++++++++++++++++++++++-
sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkDetectionController.java | 8 ++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java | 2 +
user-server/src/main/resources/mapper/UserMapper.xml | 1
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/LinkBasicInformationVo.java | 25 ++++++++++++
8 files changed, 94 insertions(+), 3 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkDetectionController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkDetectionController.java
index 2bdaa5d..b13ba59 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkDetectionController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkDetectionController.java
@@ -122,4 +122,12 @@
public Result<?> isIfViewUUID(String viewId){
return Result.success("鏌ヨ鎴愬姛",linkBasicInformationService.isIfViewUUID(viewId));
}
+
+
+ @ApiOperation("鑾峰彇鏍峰搧淇℃伅浠ュ強濮旀墭淇℃伅")
+ @GetMapping("/getContractsSampleInfo")
+ public Result<?> getContractsSampleInfo(String viewId){
+ return Result.success(linkBasicInformationService.getContractsSampleInfo(viewId));
+ }
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/LinkBasicInformationMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/LinkBasicInformationMapper.java
index dfb1e46..cf34ec5 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/LinkBasicInformationMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/LinkBasicInformationMapper.java
@@ -5,6 +5,8 @@
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
+import com.yuanchu.limslaboratory.pojo.vo.LinkBasicInformationVo;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -28,4 +30,6 @@
List<Map<String, Object>> selectLinkAll();
+ LinkBasicInformation getLinkBasicInformation(@Param("uid")String uid);
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/LinkBasicInformationVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/LinkBasicInformationVo.java
new file mode 100644
index 0000000..7a81fe4
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/LinkBasicInformationVo.java
@@ -0,0 +1,25 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
+import com.yuanchu.limslaboratory.pojo.LinkDetection;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/29
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class LinkBasicInformationVo extends LinkBasicInformation implements Serializable{
+
+ /**
+ *鏍峰搧淇℃伅
+ */
+ private List<LinkDetection> detectionList;
+
+
+}
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..3488079 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,6 @@
Map<String, String> selectViewUUID();
boolean isIfViewUUID(String uuid);
+
+ LinkBasicInformation getContractsSampleInfo(String viewId);
}
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..9a86bfd 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
@@ -83,5 +83,10 @@
return uuid.equals(RedisUtil.get("viewId"));
}
+ @Override
+ public LinkBasicInformation getContractsSampleInfo(String viewId) {
+ return linkBasicInformationMapper.getLinkBasicInformation(viewId);
+ }
+
}
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 619b044..808e473 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -25,8 +25,8 @@
</select>
<select id="selectLinkAll" resultType="java.util.Map">
- SELECT d.id ,
- DATE_FORMAT(l.`inspection_time`, '%Y-%m-%d') formTime,
+ SELECT d.id,
+ DATE_FORMAT(l.`inspection_time`, '%Y-%m-%d') formTime,
l.`entrusted` supplier,
d.`sample_number` mcode,
d.`sample_name` name,
@@ -42,4 +42,50 @@
AND l.`state` = 1
and inspection_status = 1
</select>
+ <select id="getLinkBasicInformation" resultMap="getLinkBasicInformationMap">
+ SELECT lb.entrust_coding entrustCoding,
+ lb.contacts contacts,
+ lb.contact_number contactNumber,
+ lb.contact_address contactAddress,
+ lb.completion_deadline completionDeadline,
+ lb.inspection_time inspectionTime,
+ lb.sample_delivery_mode sampleDeliveryMode,
+ lb.sample_delivery_phone sampleDeliveryPhone,
+ lb.report_number reportNumber,
+ lb.entrust_remarks entrustRemarks,
+ lb.uid uid,
+ ld.id id,
+ ld.sample_number sampleNumber,
+ ld.sample_name sampleName,
+ ld.specifications_models specificationsModels,
+ ld.unit unit,
+ ld.samples_number samplesNumber,
+ ld.remarks remarks
+ FROM link_basic_information lb,
+ link_detection ld
+ WHERE lb.id = ld.link_basic_id
+ AND lb.uid = #{uid}
+ and lb.state = 1
+ AND ld.state = 1
+ </select>
+
+ <resultMap id="getLinkBasicInformationMap" type="com.yuanchu.limslaboratory.pojo.LinkBasicInformation">
+ <result property="entrustCoding" column="entrustCoding"/>
+ <result property="contacts" column="contacts"/>
+ <result property="contactNumber" column="contactNumber"/>
+ <result property="contactAddress" column="contactAddress"/>
+ <result property="uid" column="uid"/>
+ <result property="completionDeadline" column="completionDeadline"/>
+ <result property="inspectionTime" column="inspectionTime"/>
+ <result property="sampleDeliveryMode" column="sampleDeliveryMode"/>
+ <result property="sampleDeliveryPhone" column="sampleDeliveryPhone"/>
+ <collection property="linkDetectionList" ofType="LinkDetection">
+ <result property="id" column="id"/>
+ <result property="sampleNumber" column="sampleNumber"/>
+ <result property="specificationsModels" column="specificationsModels"/>
+ <result property="unit" column="unit"/>
+ <result property="samplesNumber" column="samplesNumber"/>
+ <result property="remarks" column="remarks"/>
+ </collection>
+ </resultMap>
</mapper>
diff --git a/sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java b/sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java
index 4c54f75..3a53c0d 100644
--- a/sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java
+++ b/sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java
@@ -100,7 +100,7 @@
//throw new AuthException("400","鏃犳潈闄�");
}
} else {
- throw new AuthException("401", "鐧婚檰杩囨湡");
+ throw new AuthException("401", "鐧婚檰杩囨湡!");
}
}
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index 6a87908..b89ebd9 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -43,5 +43,6 @@
select id, name
from lims_laboratory.user
where job_state!=0
+ and type=1
</select>
</mapper>
--
Gitblit v1.9.3