Merge dev_New_pro into dev_山西_晋和园_pro

gongchunyi

2026-05-28 10b88a7ff17caf92f3d4e8a550c1085a70c2517a

 src/main/resources/mapper/production/ProductionOperationTaskMapper.xml

@@ -71,7 +71,7 @@
                and pot.work_order_no like concat('%', #{c.workOrderNo}, '%')
            </if>
        </where>
        order by pot.id desc
        order by pot.production_order_id desc, poro.drag_sort
    </select>

    <select id="selectTaskStatisticsByDate" resultType="com.ruoyi.home.dto.ProductionTaskStatisticsDto">
@@ -123,9 +123,9 @@
            <if test="endDateTime != null">
                and ppo.create_time &lt;= #{endDateTime}
            </if>
            <if test="userId != null">
                and ppm.create_user = #{userId}
            </if>
<!--            <if test="userId != null">-->
<!--                and ppm.create_user = #{userId}-->
<!--            </if>-->
            <if test="processIds != null and processIds.size() > 0">
                and poro.technology_operation_id in
                <foreach collection="processIds" item="id" open="(" separator="," close=")">