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

dy

2025-04-16 df20214207804ba2fffc601f20284b26e800ffef

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

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

@@ -25,7 +25,7 @@
    </resultMap>

    <sql id="selectApsPlateProcessStatVo">
        select id, work_order_no, process_name, num, route_process_number, current_process_number, production_quantity, standard_time, process_total_time, process_plan_end_day, compute_plan_end_day, design_times, batch_number, create_by, del_flag from aps_plate_process_stat
        select id, work_order_no, process_name, num, route_process_number, current_process_number, production_quantity, standard_time, process_total_time, process_plan_end_day,process_plan_start_day, order_plan_end_day, design_times, batch_number, create_by, del_flag from aps_plate_process_stat
    </sql>

    <select id="selectApsPlateProcessStatList" parameterType="ApsPlateProcessStat" resultMap="ApsPlateProcessStatResult">
@@ -65,6 +65,7 @@
            <if test="processTotalTime != null">process_total_time,</if>
            <if test="processPlanEndDay != null">process_plan_end_day,</if>
            <if test="processPlanStartDay != null">process_plan_start_day,</if>
            <if test="processPlanStartDay != null">process_plan_start_day,</if>
            <if test="designTimes != null">design_times,</if>
            <if test="batchNumber != null">batch_number,</if>
            <if test="createBy != null">create_by,</if>