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> </project> 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>
@@ -35,7 +35,6 @@ <dependency> <groupId>cn.hutool</groupId> <artifactId>hutool-all</artifactId> <version>5.8.12</version> </dependency> </dependencies> </project> 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); 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} 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> 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) }) 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; 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") 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>
@@ -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> </mapper>
