修改bug

Fixiaobai

2023-09-04 dd2554435b9ced61e2a6a06627145fca3bf2685b

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

@@ -9,9 +9,10 @@
        r.code reportCode,
        i.code inspectionCode,
        im.name materialName,
        r.conclusion ,
        r.status ,
        r.conclusion,
        r.status,
        r.approver approver,
        i.type,
        check_time,
        u.name
        from lims_laboratory.report r
@@ -35,10 +36,16 @@
    <resultMap id="report" type="map">
        <id property="rcode" column="rcode"/>
        <result property="name" column="name"/>
        <result property="num" column="num"/>
        <result property="specifications" column="specifications"/>
        <result property="supplier" column="supplier"/>
        <result property="insCode" column="ins_code"/>
        <result property="type" column="type"/>
        <result property="imCode" column="im_code"/>
        <result property="createTime" column="create_time"/>
        <result property="checkTime" column="check_time"/>
        <result property="inspectionStatus" column="inspection_status"/>
        <result property="notes" column="notes"/>
        <collection property="products" resultMap="products" javaType="java.util.List"/>
    </resultMap>

@@ -49,21 +56,42 @@
        <result property="required" column="required"/>
        <result property="testValue" column="test_value"/>
        <result property="testState" column="test_state"/>
        <result property="ipName" column="ipName"/>
    </resultMap>

    <select id="getReportContext" resultMap="report">
        SELECT r.`code` rcode,im.`name`,im.specifications,im.supplier,im.`code` im_code,i.`code` ins_code,i.type,ip.id,ip.`name` ip_name,ip.unit,ip.required,ip.test_value,ip.test_state
        FROM report r
                 LEFT JOIN inspection i
                           ON r.inspection_id = i.id
                 LEFT JOIN inspection_material im
                           ON im.inspection_id = i.id
                 LEFT JOIN inspection_product ip
                           ON ip.inspection_material_id = im.id
        WHERE ip.state != 0
          and im.state != 0
          and i.state != 0
          and r.`code` = #{code}
        SELECT
            r.`code` rcode,
            date_format( r.create_time, '%Y-%m-%d' ) create_time,
            date_format( r.check_time, '%Y-%m-%d' ) check_time,
            i.inspection_status,
            im.`name`,
            im.num,
            im.specifications,
            im.supplier,
            im.`code` im_code,
            i.`code` ins_code,
            i.type,
            ip.id,
            ip.`name` ip_name,
            im.form_time formTime,
            ip.unit,
            ip.required,
            ip.test_value,
            ip.test_state,
            u.`name` ipName,
            im.notes
        FROM
            report r
                LEFT JOIN inspection i ON r.inspection_id = i.id
                LEFT JOIN inspection_material im ON im.inspection_id = i.id
                LEFT JOIN inspection_product ip ON ip.inspection_material_id = im.id
                LEFT JOIN `user` u on ip.user_id =u.id
        WHERE
            ip.state != 0
   AND im.state != 0
   AND i.state != 0
   AND r.`code` = #{code}
    </select>

</mapper>