Merge remote-tracking branch 'origin/master'

xyc

2024-09-13 dea248c9da9f82e4032b6ab4a8ce0a6422a5c2cc

 modules/mainPart/src/main/resources/mapper/taskReliability/ReliabilityAssessDao.xml

@@ -15,4 +15,41 @@
          and a.product_id = ${productId}
        order by CREATE_DATE desc
    </select>
    <select id="getProductList"
            resultType="com.zt.life.modules.mainPart.taskReliability.model.ReliabilityAssess">
        SELECT
            a.NAME,
            a.id,
            a.pid,
            a.product_type as type,
            b.run_num,
            b.fail_num,
            b.run_times
        FROM
            product_model a
                LEFT JOIN assess_data b ON b.product_id = a.id
                AND b.is_delete = 0  AND b.item_id = ${itemId}
        WHERE
                a.is_delete = 0
                AND a.product_type &lt;&gt; 10
                AND a.ship_id = ${productId}
           OR a.id = ${productId}
        ORDER BY
            a.product_type,
            a.sort
    </select>
    <select id="getAssessId" resultType="java.lang.Long">
        SELECT
            id
        FROM
            assess_result
        WHERE
            is_delete = 0
          AND item_id = ${itemId}
          AND product_id = ${productId}
          AND task_id = ${taskId}
        ORDER BY
            UPDATE_DATE DESC
        LIMIT 1
    </select>
</mapper>