第一次改动(检验任务与样品关联,附件与样品关联,报告与样品关联)

zss

2024-11-21 9f19d3a24f8474bf6f9eb9401888c44b34b381e6

 inspect-server/src/main/resources/mapper/InsReportMapper.xml

@@ -3,47 +3,46 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.InsReportMapper">

    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsReport">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
            <result property="url" column="url" jdbcType="VARCHAR"/>
            <result property="urlS" column="url_s" jdbcType="VARCHAR"/>
            <result property="isRatify" column="is_ratify" jdbcType="INTEGER"/>
            <result property="isExamine" column="is_examine" jdbcType="INTEGER"/>
            <result property="ratifyUserId" column="ratify_user_id" jdbcType="INTEGER"/>
            <result property="examineUserId" column="examine_user_id" jdbcType="INTEGER"/>
            <result property="createUser" column="create_user" jdbcType="INTEGER"/>
            <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <id property="id" column="id" jdbcType="INTEGER"/>
        <result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
        <result property="insSampleId" column="ins_sample_id" jdbcType="INTEGER"/>
        <result property="url" column="url" jdbcType="VARCHAR"/>
        <result property="urlS" column="url_s" jdbcType="VARCHAR"/>
        <result property="isRatify" column="is_ratify" jdbcType="INTEGER"/>
        <result property="isExamine" column="is_examine" jdbcType="INTEGER"/>
        <result property="ratifyUserId" column="ratify_user_id" jdbcType="INTEGER"/>
        <result property="examineUserId" column="examine_user_id" jdbcType="INTEGER"/>
        <result property="createUser" column="create_user" jdbcType="INTEGER"/>
        <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <select id="pageInsReport" resultType="com.yuanchu.mom.dto.ReportPageDto">
        select *
        from (
        select
        ir.*,io.entrust_code,u.name write_user_name,u1.name ratify_user,u2.name examine_user,io.laboratory,l.id labId
        ir.*,io.entrust_code,sample_code,u.name write_user_name,u1.name ratify_user,u2.name
        examine_user,io.laboratory,l.id labId
        from ins_report ir
        left join ins_order io on io.id = ir.ins_order_id
        left join ins_sample isa on isa.id = ir.ins_sample_id
        left join user u on u.id = ir.write_user_id
        left join user u1 on u1.id = ir.ratify_user_id
        left join user u2 on u2.id = ir.examine_user_id
        left join laboratory l on io.laboratory=laboratory_name
        where 1=1
        <if test="laboratory!=null and laboratory!=''">
           and  laboratory=#{laboratory}
        </if>
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>
    <select id="getLaboratoryByName" resultType="java.lang.String">
        select s.address from seal s
        left join laboratory l on s.lab_id = l.id
        select s.address
        from seal s
                 left join laboratory l on s.lab_id = l.id
        where l.laboratory_name = #{name}
        and s.type = '报告类型'
          and s.type = '报告类型'
        order by s.create_time desc
        limit 1
    </select>