Merge remote-tracking branch 'origin/dev' into dev

dy

2025-04-16 df20214207804ba2fffc601f20284b26e800ffef

 aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml

@@ -160,9 +160,12 @@
            work_order_type as workOrderType,
            classification,
        sum(total_weld_seam) as total
        FROM   aps_weld_seam
        FROM   aps_weld_seam where del_flag='0'
        GROUP BY produce_year, produce_month,   production_base,  work_order_type, classification
    </select>
    <update id="removeLastBatch" parameterType="String">
        update  aps_weld_seam set del_flag='1'    where  del_flag='0'
    </update>

    <select id="weldSeamEcharts" parameterType="java.util.List" resultType="map">

@@ -180,6 +183,7 @@
            LEFT JOIN sys_dict_data classification ON seam.classification = classification.dict_value
            AND classification.dict_type = 'aps_weld_classification'
            <where>
                seam.del_flag = '0'
                <if test="produceYears != null "> and produce_year in
                    <foreach item="produceYear" collection="produceYears" open="(" separator="," close=")">
                        #{produceYear}