Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-23 924d018e6e6f15effbd272cead5dff67cd3b93a5

 inspection-server/src/main/resources/mapper/InspectionProductMapper.xml

@@ -1,12 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.limslaboratory.mapper.InspectionProductMapper">
    <update id="upda">
        update lims_laboratory.inspection_product
        set test_state=null
        where id = #{id}
          and state = 1
    </update>


    <!--根据检验单id查询检验项目的检验结果-->
    <select id="getresult" resultType="java.lang.Integer">
@@ -37,4 +32,22 @@
        where state = 1
          and test_state is null
    </select>

    <!--获取检验项目,设备,检验开始时间,执行人,检验结束时间-->
    <select id="getResultNum" resultType="java.util.Map">
        select ip.name,
               equipment_name                      instrumentname,
               DATE_FORMAT(start_time, '%Y-%m-%d') startTime,
               user.name                           checkname,
               DATE_FORMAT(end_time, '%Y-%m-%d')   endTime
        from lims_laboratory.inspection_product ip
                 left join lims_laboratory.inspection_material on ip.inspection_material_id = inspection_material.id
                 left join lims_laboratory.inspection i on inspection_material.inspection_id = i.id
                 left join lims_laboratory.instrument on ip.instrument_id = instrument.id
                 left join lims_laboratory.user on ip.user_id = user.id
        where ip.state = 1
          and test_state is null
        order by start_time
        limit 4
    </select>
</mapper>