diff --git a/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml index e883565..229ed4f 100644 --- a/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml +++ b/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml @@ -116,7 +116,8 @@ to_date(#{params.endEndTime}, 'yyyy-mm-dd') - order by oi.material_name, order_code desc + + order by oi.obj_id desc - select a.shut_reason_id, a.reason_code, a.device_id, a.shut_type_id, a.shut_reason, a.is_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time + select a.shut_reason_id, + a.reason_code, + a.device_id, + a.shut_type_id, + a.shut_reason, + a.is_flag, + nvl(df.freq, 0) as device_freq, + nvl(lf.freq, 0) as line_freq, + nvl(gf.freq, 0) as global_freq, + a.remark, + a.create_by, + a.create_time, + a.update_by, + a.update_time from dms_base_shut_reason a left join base_deviceledger b on a.device_id = b.OBJ_ID + left join ( + + + select r.shut_reason_id, + count(1) as freq + from dms_record_shut_down r + where r.machine_id = #{deviceId} + and r.shut_begin_time >= sysdate - 90 + and r.shut_reason_id is not null + and r.active_flag = 1 + group by r.shut_reason_id + + + select cast(null as number) as shut_reason_id, + 0 as freq + from dual + where 1 = 0 + + + ) df on df.shut_reason_id = a.shut_reason_id + left join ( + + + select r.shut_reason_id, + count(1) as freq + from dms_record_shut_down r + join base_deviceledger d + on d.obj_id = r.machine_id + join base_deviceledger current_device + on current_device.obj_id = #{deviceId} + where d.product_line_code = current_device.product_line_code + and r.shut_begin_time >= sysdate - 90 + and r.shut_reason_id is not null + and r.active_flag = 1 + group by r.shut_reason_id + + + select cast(null as number) as shut_reason_id, + 0 as freq + from dual + where 1 = 0 + + + ) lf on lf.shut_reason_id = a.shut_reason_id + left join ( + select r.shut_reason_id, + count(1) as freq + from dms_record_shut_down r + where r.shut_begin_time >= sysdate - 180 + and r.shut_reason_id is not null + and r.active_flag = 1 + group by r.shut_reason_id + ) gf on gf.shut_reason_id = a.shut_reason_id and a.reason_code = #{reasonCode} and a.device_id = #{deviceId} @@ -34,6 +103,170 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.shut_reason = #{shutReason} and a.is_flag = #{isFlag} + + order by + + + nvl(df.freq, 0) desc, + nvl(lf.freq, 0) desc, + nvl(gf.freq, 0) desc, + + + nvl(gf.freq, 0) desc, + + + a.reason_code, + a.shut_reason_id + + + + + @@ -370,7 +372,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and is_flag = #{isFlag} and device_id = #{deviceId} - order by create_time desc + + order by repair_instance_id desc