Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-01 ec826d21dbae7d8248f5c2e86c5898259e9b0d8c

 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml

@@ -254,4 +254,32 @@
            WHERE id = #{item.id}
        </foreach>
    </update>


    <select id="getNotFinishedWorkOrders" resultMap="GenWorkOrderMap">
        SELECT
            wo.id,
            wo.serial_number,
            wo.status,
            wo.work_order_no,
            GROUP_CONCAT(DISTINCT et.error_name SEPARATOR ',') AS error_names
        FROM
             t_work_order wo
                LEFT JOIN t_work_order_error_type et ON et.work_order_no = wo.work_order_no
        WHERE
            wo.status != 'AUDITING_SUCCESS'
            AND wo.deleted = 0
            AND wo.serial_number in <foreach collection="list" open="(" separator="," close=")" item="serialNumber">
                #{serialNumber}
            </foreach>
        GROUP BY
            wo.id, wo.serial_number, wo.status, wo.work_order_no
    </select>

    <resultMap id="GenWorkOrderMap" type="com.ycl.platform.domain.entity.WorkOrder">
        <id column="id" property="id"/>
        <result column="serial_number" property="serialNumber"/>
        <result column="status" property="status" typeHandler="com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler"/>
        <result column="error_names" property="errorType"/>
    </resultMap>
</mapper>