Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2025-3-19 设备看板调整

Browse Source
master
元气满满 2 weeks ago
parent 1d14dbbff8
commit 271ff4005b
2 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File

3
op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java
Unescape Escape View File

@ -268,8 +268,7 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
* 右上角 维修工单明细
*/
public AjaxResult selectEquRepairWorkOrderDetail(EquRepairWorkOrderDetailVO equRepairWorkOrderDetailVO) {
List<EquRepairWorkOrderDetailVO> EquRepairWorkOrderDetailList = deviceInterfaceMapper.selectEquRepairWorkOrderDetail(equRepairWorkOrderDetailVO);
return success(EquRepairWorkOrderDetailList);
return success(deviceInterfaceMapper.selectEquRepairWorkOrderDetail(equRepairWorkOrderDetailVO));
}
/**

28
op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml
Unescape Escape View File

@ -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
<where>
and erwo.del_flag = '0'
<if test="timeDimension == 'dd' ">and convert(char(10),erwo.create_time,120) = convert(char(10),getdate(),120)</if>
<if test="timeDimension == 'mm' ">and month(erwo.create_time) = month(getdate())</if>
<if test="timeDimension == 'yyyy' ">and year(erwo.create_time) = year(getdate())</if>
<if test="createTime != null and createTime != null ">and convert(char(10),erwo.create_time,120) = convert(char(10),#{createTime},120)</if>
<if test="resultInspect != null and resultInspect != '' ">and erwo.result_inspect = #{resultInspect} </if>
<if test="orderId != null and orderId != ''">and erwo.order_id = #{orderId}</if>
<if test="workCode != null and workCode != ''">and erwo.work_code like concat('%', #{workCode}, '%')</if>
<if test="orderCode != null and orderCode != ''">and erwo.order_code like concat('%', #{orderCode}, '%')</if>
<if test="equipmentCode != null and equipmentCode != ''">and erwo.equipment_code like concat('%',#{equipmentCode}, '%')</if>
<if test="workFaultDesc != null and workFaultDesc != ''">and erwo.work_fault_desc = #{workFaultDesc}</if>
<if test="workPlanTimeStart != null ">and CONVERT(date,work_plan_time) >= #{workPlanTimeStart}</if>
<if test="workPlanTimeEnd != null ">and #{workPlanTimeEnd} >= CONVERT(date,erwo.work_plan_time)</if>
<if test="workDownMachine != null and workDownMachine != ''">and erwo.work_down_machine =#{workDownMachine}</if>
<if test="workPlanDownTimeStart != null ">and CONVERT(date,work_plan_down_time) >=#{workPlanDownTimeStart}</if>
<if test="workPlanDownTimeEnd != null ">and #{workPlanDownTimeEnd} >=CONVERT(date,erwo.work_plan_down_time)</if>
<if test="workPerson != null and workPerson != ''">and erwo.work_person like concat('%', #{workPerson},'%')</if>
<if test="workPersonName != null and workPersonName != ''">and erwo.work_person_name like concat('%', #{workPersonName},'%')</if>
<if test="workTeam != null and workTeam != ''">and erwo.work_team like concat('%', #{workTeam}, '%')</if>
<if test="workOutsource != null and workOutsource != ''">and erwo.work_outsource = #{workOutsource}</if>
<if test="outWorkCode != null and outWorkCode != ''">and erwo.out_work_code like concat('%',#{outWorkCode}, '%')</if>
<if test="workReason != null and workReason != ''">and erwo.work_reason = #{workReason}</if>
<if test="workStartTime != null ">and erwo.work_start_time = #{workStartTime}</if>
<if test="workEndTime != null ">and erwo.work_end_time = #{workEndTime}</if>
<if test="workCostTime != null ">and erwo.work_cost_time = #{workCostTime}</if>
<if test="workCost != null and workCost != ''">and erwo.work_cost = #{workCost}</if>
<if test="equipmentName != null and equipmentName != ''">and be.equipment_name like concat('%',#{equipmentName}, '%')</if>
<if test="workStatus != null and workStatus != ''">and erwo.work_status = #{workStatus}</if>
<if test="factoryCode != null and factoryCode != ''">and erwo.factory_code = #{factoryCode}</if>
<if test="workHandle != null and workHandle != ''">and erwo.work_handle = #{workHandle}</if>
<if test="orderRelevance != null and orderRelevance != ''">and erwo.order_relevance = #{orderRelevance}
</if>
and erwo.del_flag = '0'
</where>
ORDER BY erwo.create_time DESC
</select>

Write Preview
Loading…
Cancel
Save