Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-09 0c03b83cc8e26963275d9ef16ea476ecdc035a0d

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

@@ -160,9 +160,9 @@
        </if>
    </select>
    <select id="selectDeviceList" resultType="java.util.Map">
        select device_name,specification_model,factory_no,date_format(next_calibration_date, '%Y-%m-%d')
        latest_traceability from device
        where factory_no in
        select device_name,specification_model,management_number,DATE_ADD(date_format(last_calibration_date, '%Y-%m-%d'),INTERVAL calibration_date month) latest_traceability
        from device
        where device.management_number in
        <foreach collection="names" index="index" open="(" separator="," close=")" item="val">
            #{val}
        </foreach>
@@ -232,4 +232,8 @@
        </if>
        ) temp
    </select>
    <select id="getEnumLabelByValue" resultType="java.lang.String">
        select label from `center-lims`.enums
        where value = #{value}
    </select>
</mapper>