From da30df12fc02f28a4b016c8c35a3b57e5c29fe35 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 22 八月 2023 13:56:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
framework/pom.xml | 2
standard-server/src/main/resources/mapper/ProductModelMapper.xml | 10 ++--
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 2
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java | 2
inspection-server/pom.xml | 1
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkDetectionServiceImpl.java | 1
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java | 2
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java | 1
standard-server/src/main/resources/mapper/MaterialMapper.xml | 33 +++++++---------
cnas-server/pom.xml | 8 ---
pom.xml | 7 +++
11 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/cnas-server/pom.xml b/cnas-server/pom.xml
index 7931358..3c31d3d 100644
--- a/cnas-server/pom.xml
+++ b/cnas-server/pom.xml
@@ -13,11 +13,6 @@
<artifactId>cnas-server</artifactId>
<packaging>jar</packaging>
- <properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
- </properties>
-
<dependencies>
<dependency>
<groupId>com.yunchu.limslaboratory</groupId>
@@ -27,7 +22,6 @@
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
- <version>5.8.12</version>
</dependency>
<!--搴曚笅鍥涗釜閮芥槸poi渚濊禆-->
<dependency>
@@ -78,4 +72,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/framework/pom.xml b/framework/pom.xml
index cfae3f2..ce4fbb6 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -42,10 +42,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
+
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
- <version>5.8.18</version>
</dependency>
</dependencies>
diff --git a/inspection-server/pom.xml b/inspection-server/pom.xml
index 8a07947..dfecb7c 100644
--- a/inspection-server/pom.xml
+++ b/inspection-server/pom.xml
@@ -35,7 +35,6 @@
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
- <version>5.8.12</version>
</dependency>
</dependencies>
</project>
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkDetectionServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkDetectionServiceImpl.java
index 87a1700..1bcd989 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkDetectionServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkDetectionServiceImpl.java
@@ -27,6 +27,7 @@
@Override
public void insertListData(Integer id, List<LinkDetection> linkDetectionList) {
for (LinkDetection linkDetection:linkDetectionList){
+ linkDetection.setInspectionStatus(2);
linkDetection.setLinkBasicId(id);
}
linkDetectionMapper.insertBatchSomeColumn(linkDetectionList);
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 456ca9e..2acf86f 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -17,7 +17,7 @@
AND d.`sample_name` like concat('%', #{sampleName}, '%')
</if>
<if test="entrusted != null and entrusted != null">
- AND l.`contacts` like concat('%', #{entrusted}, '%')
+ AND l.`entrusted` like concat('%', #{entrusted}, '%')
</if>
<if test="inspectionStatus != null and inspectionStatus != null">
AND d.`inspection_status` = #{inspectionStatus}
diff --git a/pom.xml b/pom.xml
index bc21e3d..2b54948 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
<feign-okhttp.version>11.0</feign-okhttp.version>
<shiro.version>1.5.3</shiro.version>
<commons.lang3>3.12.0</commons.lang3>
+ <hutool.version>5.8.18</hutool.version>
<!-- 鎵撳寘鍚庡鍑虹殑璺緞 -->
<package.path>${project.build.directory}/LIMS</package.path>
</properties>
@@ -89,6 +90,12 @@
</dependencies>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>${hutool.version}</version>
+ </dependency>
+
<!--log4j-->
<dependency>
<groupId>log4j</groupId>
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
index fc0c456..6ddf43e 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
@@ -59,7 +59,7 @@
return Result.fail("鍒犻櫎澶辫触锛�");
}
- @ApiOperation(value = "鏍囧噯搴�-->鐗╂枡-->渚ц竟鏍忓洓绾у睍寮�", tags = "猸愨瓙猸愬悗绔皟鏁�")
+ @ApiOperation(value = "鏍囧噯搴�-->鐗╂枡-->渚ц竟鏍忓洓绾у睍寮�")
@ApiImplicitParams(value = {
@ApiImplicitParam(value = "鍨嬪彿/鍨嬪彿鍚嶇О", name = "specificationName", dataTypeClass = String.class)
})
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java
index f5cf461..6eee650 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.dto.AddMaterialDto;
import com.yuanchu.limslaboratory.pojo.dto.ProductModelDto;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java
index e3f3a1d..e94e131 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java
@@ -39,7 +39,7 @@
@ApiModelProperty(value = "鐗╂枡鍚嶇О", example = "鐭冲ご", required = true)
private String name;
- @ApiModelProperty(value = "0锛氬師鏉愭枡锛�1锛氭垚鍝侊紱2锛氬崐鎴愬搧", example = "1")
+ @ApiModelProperty(value = "0锛氬師鏉愭枡锛�1锛氭垚鍝侊紱", example = "1")
private Integer type;
@TableLogic(value = "1", delval = "0")
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index 5f9c4bf..59e36a3 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -31,41 +31,38 @@
</select>
<resultMap id="OneLevelTreeMap" type="Map">
- <id property="id" column="materialId"/>
- <result property="name" column="materialName"/>
+ <id property="type" column="type"/>
<collection property="children" resultMap="TwoLevelTreeMap" javaType="List"/>
</resultMap>
<resultMap id="TwoLevelTreeMap" type="Map">
- <id property="id" column="standardId"/>
- <result property="name" column="standardName"/>
+ <id property="id" column="materialId"/>
+ <result property="name" column="materialName"/>
<collection property="children" resultMap="ThreeLevelTreeMap" javaType="List"/>
</resultMap>
<resultMap id="ThreeLevelTreeMap" type="Map">
- <id property="id" column="specificationsId"/>
- <result property="name" column="specificationsName"/>
+ <id property="id" column="standardId"/>
+ <result property="name" column="standardName"/>
<collection property="children" resultMap="FourLevelTreeMap" javaType="List"/>
</resultMap>
<resultMap id="FourLevelTreeMap" type="Map">
- <id property="id" column="productId"/>
- <result property="name" column="productName"/>
+ <id property="id" column="specificationsId"/>
+ <result property="name" column="specificationsName"/>
</resultMap>
<select id="FourTree" resultMap="OneLevelTreeMap">
- SELECT m.`id` materialId, m.`name` materialName, s.`id` standardId, s.`name` standardName,
- f.`id` specificationsId, f.`name` specificationsName, p.`id` productId, p.`name` productName
- FROM lims_laboratory.material m
- LEFT JOIN (SELECT s.`id`, s.`name`, s.`material_id` FROM lims_laboratory.standard s WHERE s.`state` = 1) s ON m.id =
- s.`material_id`
- LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id` FROM lims_laboratory.specifications f WHERE f.`state` = 1
+ SELECT m.`type`, m.`id` materialId, m.`name` materialName, s.id standardId, s.name standardName,
+ f.id specificationsId, f.name specificationsName
+ FROM material m
+ LEFT JOIN (SELECT s.`id`, s.`name`, s.`material_id` FROM standard s WHERE s.`state` = 1) s
+ ON s.material_id = m.`id`
+ LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id` FROM specifications f WHERE f.`state` = 1
<if test="specificationsName != null and specificationsName != ''">
AND f.`name` = #{specificationsName}
- </if>
- ) f ON s.`id` = f.`standard_id`
- LEFT JOIN (SELECT p.`id`, p.`name`, p.`specifications_id` FROM lims_laboratory.product p WHERE p.`state` = 1) p ON f.`id` =
- p.`specifications_id`
+ </if>) f
+ ON f.standard_id = s.id
WHERE m.`state` = 1
</select>
diff --git a/standard-server/src/main/resources/mapper/ProductModelMapper.xml b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
index 74f5a68..8488506 100644
--- a/standard-server/src/main/resources/mapper/ProductModelMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.limslaboratory.mapper.ProductModelMapper">
<resultMap id="selectproductModelMap" type="map">
- <id property="father" column="father"/>
+ <id property="name" column="father"/>
<collection property="children" resultMap="selectproductModelTowMap" javaType="List"/>
</resultMap>
@@ -35,9 +35,9 @@
</update>
<!--娣诲姞鏍囧噯閫夋嫨椤圭洰鍒嗙粍-->
<select id="selectfather" resultType="java.lang.String">
- select distinct father
- from lims_laboratory.product_model
- where state = 1
+ SELECT DISTINCT father
+ FROM lims_laboratory.product_model
+ WHERE state = 1
</select>
<!--鏌ヨ椤圭洰妯＄増鏍规嵁鏍峰搧鍚�-->
@@ -56,4 +56,4 @@
from lims_laboratory.product_model
where state = 1
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3