diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java index 2f6b5f8d..aad3406e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java @@ -268,8 +268,7 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { * 右上角 维修工单明细 */ public AjaxResult selectEquRepairWorkOrderDetail(EquRepairWorkOrderDetailVO equRepairWorkOrderDetailVO) { - List EquRepairWorkOrderDetailList = deviceInterfaceMapper.selectEquRepairWorkOrderDetail(equRepairWorkOrderDetailVO); - return success(EquRepairWorkOrderDetailList); + return success(deviceInterfaceMapper.selectEquRepairWorkOrderDetail(equRepairWorkOrderDetailVO)); } /** diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml index 1fd63345..cb024702 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml @@ -301,37 +301,13 @@ left join base_equipment be on erwo.equipment_code = be.equipment_code left join equ_team et on erwo.work_team = et.team_code + and erwo.del_flag = '0' and convert(char(10),erwo.create_time,120) = convert(char(10),getdate(),120) and month(erwo.create_time) = month(getdate()) and year(erwo.create_time) = year(getdate()) - and convert(char(10),erwo.create_time,120) = convert(char(10),#{createTime},120) - and erwo.result_inspect = #{resultInspect} - and erwo.order_id = #{orderId} - and erwo.work_code like concat('%', #{workCode}, '%') - and erwo.order_code like concat('%', #{orderCode}, '%') and erwo.equipment_code like concat('%',#{equipmentCode}, '%') - and erwo.work_fault_desc = #{workFaultDesc} - and CONVERT(date,work_plan_time) >= #{workPlanTimeStart} - and #{workPlanTimeEnd} >= CONVERT(date,erwo.work_plan_time) - and erwo.work_down_machine =#{workDownMachine} - and CONVERT(date,work_plan_down_time) >=#{workPlanDownTimeStart} - and #{workPlanDownTimeEnd} >=CONVERT(date,erwo.work_plan_down_time) - and erwo.work_person like concat('%', #{workPerson},'%') - and erwo.work_person_name like concat('%', #{workPersonName},'%') - and erwo.work_team like concat('%', #{workTeam}, '%') - and erwo.work_outsource = #{workOutsource} - and erwo.out_work_code like concat('%',#{outWorkCode}, '%') - and erwo.work_reason = #{workReason} - and erwo.work_start_time = #{workStartTime} - and erwo.work_end_time = #{workEndTime} - and erwo.work_cost_time = #{workCostTime} - and erwo.work_cost = #{workCost} + and be.equipment_name like concat('%',#{equipmentName}, '%') and erwo.work_status = #{workStatus} - and erwo.factory_code = #{factoryCode} - and erwo.work_handle = #{workHandle} - and erwo.order_relevance = #{orderRelevance} - - and erwo.del_flag = '0' ORDER BY erwo.create_time DESC