更新

chenlu

2025-08-04 dad17d6ef945ad3bebb6338f2562e2416ee410a0

更新

 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml

@@ -540,8 +540,8 @@

            left join sd.`order` as o on o.order_id=rw.order_id
        where rw.reviewed_state != 2
          and rw.reporting_work_time >= #{selectTime1}
    AND rw.reporting_work_time <  #{selectTime2}
          and date(rw.reporting_work_time) >= date(#{selectTime1})
    AND date(rw.reporting_work_time) <=  date(#{selectTime2})
          and position(#{orderId} in rw.order_id)
          and rw.reviewed_state!=-1
          and o.create_order>0
@@ -552,7 +552,7 @@
            and o.order_id regexp #{reportingWork.orderId}
        </if>
        <if test="reportingWork.processId != null and reportingWork.processId != ''">
            

            and CONCAT(rw.process_id,'/',rwd.goup) LIKE CONCAT('%', #{reportingWork.processId}, '%')
        </if>
        <if test="reportingWork.order.project != null and reportingWork.order.project != ''">