blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
于杰
2025-08-04 a00a32e331bbf32ebaf6850150977204d9de381a 
 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,8 @@


            and o.order_id regexp #{reportingWork.orderId}


        </if>


        <if test="reportingWork.processId != null and reportingWork.processId != ''">


            and rw.process_id regexp #{reportingWork.processId}




            and CONCAT(rw.process_id,'/',rwd.goup) LIKE CONCAT('%', #{reportingWork.processId}, '%')


        </if>


        <if test="reportingWork.order.project != null and reportingWork.order.project != ''">


            and o.project regexp #{reportingWork.order.project}