zhuo
2025-04-21 af1ef97f554b67140773103a3e90bc95b80c5b54
inspect-server/src/main/resources/mapper/InsUnqualifiedRetestProductMapper.xml
@@ -57,7 +57,7 @@
    </resultMap>
       <sql id="getInsProducSql">
            ip.id          ip_id,
           ip.id          ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_class,
@@ -100,7 +100,9 @@
               ip.method_s,
               ip.tell,
               ip.dic,
               ip.cable_tag
               ip.sort,
               ip.cable_tag,
               ip.structure_item_parameter_id
       </sql>
    <select id="selectRetestProduct" resultType="com.ruoyi.inspect.pojo.InsUnqualifiedRetestProduct">
@@ -162,28 +164,30 @@
              select <include refid="getInsProducSql"/>
              from ins_unqualified_retest_product ip
              left join ins_unqualified_retest_result ipr on ip.id = ipr.retest_product_id
              where ins_sample_id = #{id}
              and state = 1
              and ip.son_laboratory = #{laboratory}
              and ins_fiber_id is null
              and ins_fibers_id is null
              and standard_method_list_id is not null
              and ip.cable_tag is null
              and ip.retest_tag = #{retestTag}
       </select>
       <select id="getInsProductUnqualifiedRetest5" resultMap="product">
           select <include refid="getInsProducSql"/>
           from ins_unqualified_retest_product ip
           left join ins_unqualified_retest_result ipr on ip.id = ipr.retest_product_id
           where ins_sample_id = #{id}
           and state = 1
           and ip.son_laboratory = #{laboratory}
           and ins_fiber_id is null
           and ins_fibers_id is null
           and standard_method_list_id is not null
           and ip.cable_tag = #{cableTag}
           /* 电缆配置标识 */
           <if test="cableTag == null or cableTag == ''">
               and ip.cable_tag is null
           </if>
           <if test="cableTag != null and cableTag != ''">
               and ip.cable_tag = #{cableTag}
           </if>
           /* 重复值标识 */
           <if test="repetitionTag == null or repetitionTag == ''">
               and ip.repetition_tag is null
           </if>
           <if test="repetitionTag != null and repetitionTag != ''">
               and ip.repetition_tag = #{repetitionTag}
           </if>
           and ip.retest_tag = #{retestTag}
           order by sort asc
       </select>
       <select id="getInsProductUnqualifiedRetest6" resultMap="product">
           select <include refid="getInsProducSql"/>
           from ins_unqualified_retest_product ip
@@ -196,5 +200,6 @@
           and standard_method_list_id is not null
           and ip.raw_material_tag = #{rawMaterialTag}
           and ip.retest_tag = #{retestTag}
           order by sort asc
       </select>
</mapper>