liding
2025-04-30 fbde0b947b4641081b558302ea77d88c902c4cd1
inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -78,6 +78,7 @@
        <result property="radius" column="radius"/>
        <result property="cableTag" column="cable_tag"/>
        <result property="structureItemParameterId" column="structure_item_parameter_id"/>
        <result property="checkUserId" column="check_user_id"/>
        <collection property="insProductResult" resultMap="insProductResult"/>
    </resultMap>
@@ -87,6 +88,8 @@
        <result property="comValue" column="com_value" jdbcType="VARCHAR"/>
        <result property="equipValue" column="equip_value" jdbcType="VARCHAR"/>
        <result property="equipName" column="equip_name" jdbcType="VARBINARY"/>
        <result property="testStartTime" column="test_start_time" jdbcType="VARBINARY"/>
        <result property="testEndTime" column="test_end_time" jdbcType="VARBINARY"/>
    </resultMap>
    <resultMap id="sampleVo" type="com.ruoyi.inspect.vo.SampleVo">
@@ -159,14 +162,19 @@
               ip.dic,
               ip.sort,
               ip.cable_tag,
               ip.structure_item_parameter_id
               ip.structure_item_parameter_id,
               ip.check_user_id,
               ip.radius,
               ipr.test_start_time,
               ipr.test_end_time
    </sql>
    <select id="findInsSampleAndOrder" resultType="com.ruoyi.inspect.vo.InsOrderPlanVO">
        select * from(
        select * from(
        SELECT a.*,ios.ins_state,ios.verify_tell,verify_user
        SELECT a.*,ios.ins_state,ios.verify_tell,verify_user,
               (select name from  user where user.id = verify_user) AS check_name
        FROM
        (
        SELECT
@@ -518,6 +526,7 @@
        select <include refid="getInsProducSql"/>
        from ins_product ip
                 left join ins_product_result ipr on ip.id = ipr.ins_product_id
        left join user ur ON ip.check_user_id = ur.id
        where ins_sample_id = #{id}
          and state = 1
          and ip.son_laboratory = #{laboratory}