From c127accdddb76d11847f41b5685f5ef5e9e988d7 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 三月 2024 09:14:42 +0800
Subject: [PATCH] 设备管理问题修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml | 202 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 149 insertions(+), 53 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
index e86c3f0..c12f8ec 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
@@ -76,7 +76,7 @@
t1.plan_end_time as planEndTime,
t1.actual_start_time as actualStartTime,
t1.actual_end_time as actualEndTime,
- t1.maintenance_user_id as maintenanceUserId,
+ t1.maintenance_date as maintenanceDate,
t9.item_text as assignModeName,
t1.create_by as createBy,
t1.create_time as createTime,
@@ -106,64 +106,84 @@
<if test="params.num != null and params.num != ''">
and t1.num like concat('%',#{params.num},'%')
</if>
+ <if test="params.equipmentNum != null and params.equipmentNum != ''">
+ and t3.num like concat('%',#{params.equipmentNum},'%')
+ </if>
+ <if test="params.useDepartId != null and params.useDepartId != ''">
+ and t3.use_id = #{params.useDepartId}
+ </if>
+ <if test="params.status != null and params.status != ''">
+ and t1.status = #{params.status}
+ </if>
+ <if test="params.confirmStatus != null and params.confirmStatus != ''">
+ and t1.confirm_status = #{params.confirmStatus}
+ </if>
+ <if test="params.teamId != null and params.teamId != ''">
+ and t3.team_id = #{params.teamId}
+ </if>
+ <if test="params.finishStartTime != null">
+ and t1.actual_end_time >= #{params.finishStartTime}
+ </if>
+ <if test="params.finishEndTime != null">
+ and t1.actual_end_time <= #{params.finishEndTime}
+ </if>
ORDER BY t1.create_time desc
</select>
<select id="getDailyMaintenanceOrder3List" parameterType="Map" resultType="Map">
SELECT
- t1.id,
- t1.status,
- t5.item_text as statusName,
- t1.num,
- t1.num as technologyStatusVerificationBill,
- t4.id as maintenanceCycleId,
- t4.maintenance_type as maintenanceType,
- t10.item_text as maintenanceTypeName,
- t4.cycle as maintenanceCycle,
- t4.name as maintenanceCycleName,
- t3.id as equipmentId,
- t3.num as equipmentNum,
- t3.name as equipmentName,
- t3.model as equipmentModel,
- t3.specification,
- t3.technology_status as technologyStatus,
- t3.precision_parameters as precisionParameters,
- t11.id as equipmentCategoryId,
- t11.name as equipmentCategoryName,
- t2.id as maintenanceStandardId,
- t2.num as maintenanceStandardNum,
- t2.assign_mode assignMode,
- t3.team_id teamId,
- t3.use_id as useId,
- t6.depart_name as departName,
- t7.name as teamName,
- DATEADD(DAY,-30,t1.plan_start_time) as yellowWarningTime,
- DATEADD(DAY,-7,t1.plan_start_time) as redWarningTime,
- CONVERT(varchar(100), GETDATE(), 20) AS currentDateTime,
- t1.plan_start_time as planStartTime,
- t1.plan_end_time as planEndTime,
- t1.actual_start_time as actualStartTime,
- t1.actual_end_time as actualEndTime,
- t1.maintenance_user_id as maintenanceUserId,
- t9.item_text as assignModeName,
- t1.create_by as createBy,
- t1.create_time as createTime,
- t1.remark,
- t1.description,
- t1.precision_inspection_status as precisionInspectionStatus,
- t1.stove_exempt_status as stoveExemptStatus,
- t1.inspect_user as inspectUser,
- t1.inspect_date as inspectDate,
- t12.item_text as checkStatusName,
- t1.not_pass_reason as notPassReason,
- t1.maintenance_order_uda5 as receipts,
- t13.num as receiptsNum,
- t14.item_text as receiptsName,
- t1.maintenance_order_uda4 as receipts2,
- t15.num as receiptsNum2,
- t16.item_text as receiptsName2
+ t1.id,
+ t1.status,
+ t5.item_text as statusName,
+ t1.num,
+ t1.num as technologyStatusVerificationBill,
+ t4.id as maintenanceCycleId,
+ t4.maintenance_type as maintenanceType,
+ t10.item_text as maintenanceTypeName,
+ t4.cycle as maintenanceCycle,
+ t4.name as maintenanceCycleName,
+ t3.id as equipmentId,
+ t3.num as equipmentNum,
+ t3.name as equipmentName,
+ t3.model as equipmentModel,
+ t3.specification,
+ t3.technology_status as technologyStatus,
+ t3.precision_parameters as precisionParameters,
+ t11.id as equipmentCategoryId,
+ t11.name as equipmentCategoryName,
+ t2.id as maintenanceStandardId,
+ t2.num as maintenanceStandardNum,
+ t2.assign_mode assignMode,
+ t3.team_id teamId,
+ t3.use_id as useId,
+ t6.depart_name as departName,
+ t7.name as teamName,
+ DATEADD(DAY,-30,t1.plan_start_time) as yellowWarningTime,
+ DATEADD(DAY,-7,t1.plan_start_time) as redWarningTime,
+ CONVERT(varchar(100), GETDATE(), 20) AS currentDateTime,
+ t1.plan_start_time as planStartTime,
+ t1.plan_end_time as planEndTime,
+ t1.actual_start_time as actualStartTime,
+ t1.actual_end_time as actualEndTime,
+ t9.item_text as assignModeName,
+ t1.create_by as createBy,
+ t1.create_time as createTime,
+ t1.remark,
+ t1.description,
+ t1.precision_inspection_status as precisionInspectionStatus,
+ t1.stove_exempt_status as stoveExemptStatus,
+ t1.inspect_user as inspectUser,
+ t1.inspect_date as inspectDate,
+ t12.item_text as checkStatusName,
+ t1.not_pass_reason as notPassReason,
+ t1.maintenance_order_uda5 as receipts,
+ t13.num as receiptsNum,
+ t14.item_text as receiptsName,
+ t1.maintenance_order_uda4 as receipts2,
+ t15.num as receiptsNum2,
+ t16.item_text as receiptsName2
FROM
- mom_eam_daily_maintenance_order t1
+ mom_eam_daily_maintenance_order t1
LEFT JOIN mom_eam_maintenance_standard t2 ON t1.maintenance_standard_id = t2.id
left join mom_eam_equipment t3 on t1.equipment_id = t3.id
left join mom_eam_equipment_category t11 on t3.equipment_category_id = t11.id
@@ -181,6 +201,24 @@
WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 and t4.del_flag = 0 and t4.maintenance_type =#{params.maintenanceType}
<if test="params.num != null and params.num != ''">
and t1.num like concat('%',#{params.num},'%')
+ </if>
+ <if test="params.equipmentNum != null and params.equipmentNum != ''">
+ and t3.num like concat('%',#{params.equipmentNum},'%')
+ </if>
+ <if test="params.useDepartId != null and params.useDepartId != ''">
+ and t3.use_id = #{params.useDepartId}
+ </if>
+ <if test="params.status != null and params.status != ''">
+ and t1.status = #{params.status}
+ </if>
+ <if test="params.teamId != null and params.teamId != ''">
+ and t3.team_id = #{params.teamId}
+ </if>
+ <if test="params.finishStartTime != null">
+ and t1.actual_end_time >= #{params.finishStartTime}
+ </if>
+ <if test="params.finishEndTime != null">
+ and t1.actual_end_time <= #{params.finishEndTime}
</if>
ORDER BY t1.create_time desc
</select>
@@ -213,4 +251,62 @@
and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
</if>
</select>
+
+ <select id="getRepairUser" parameterType="Map" resultType="map">
+ SELECT
+ tt.id,
+ t1.id AS maintenanceStandardDetailId,
+ t2.id AS maintenanceStandardId,
+ t1.location,
+ t1.photo,
+ t1.maintenance_project_id AS maintenanceProjectId,
+ case t1.maintenance_role when 'operator' then '鎿嶄綔浜哄憳淇濆吇鍐呭' else '缁翠慨浜哄憳淇濆吇鍐呭' end as maintenanceRole,
+ t3.num AS maintenanceProjectNum,
+ t3.name as maintenanceProjectName,
+ t3.standard,
+ t4.item_text AS maintenanceMethod,
+ t3.maintenance_tool AS maintenanceTool,
+ t3.working_hour_quota AS workingHourQuota,
+ tt.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1,
+ tt.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2
+ FROM
+ mom_eam_daily_maintenance_order_detail tt
+ LEFT JOIN mom_eam_maintenance_standard_detail t1 ON tt.maintenance_standard_detail_id = t1.id
+ LEFT JOIN mom_eam_maintenance_standard t2 ON tt.maintenance_standard_id = t2.id
+ LEFT JOIN mom_eam_maintenance_project t3 ON tt.maintenance_project_id = t3.id
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method
+ WHERE t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0' AND t2.type = 'daily' and t1.maintenance_role = 'maintenance'
+ <if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''">
+ and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
+ </if>
+ </select>
+
+ <select id="getOperationUser" parameterType="Map" resultType="map">
+ SELECT
+ tt.id,
+ t1.id AS maintenanceStandardDetailId,
+ t2.id AS maintenanceStandardId,
+ t1.location,
+ t1.photo,
+ t1.maintenance_project_id AS maintenanceProjectId,
+ case t1.maintenance_role when 'operator' then '鎿嶄綔浜哄憳淇濆吇鍐呭' else '缁翠慨浜哄憳淇濆吇鍐呭' end as maintenanceRole,
+ t3.num AS maintenanceProjectNum,
+ t3.name as maintenanceProjectName,
+ t3.standard,
+ t4.item_text AS maintenanceMethod,
+ t3.maintenance_tool AS maintenanceTool,
+ t3.working_hour_quota AS workingHourQuota,
+ tt.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1,
+ tt.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2
+ FROM
+ mom_eam_daily_maintenance_order_detail tt
+ LEFT JOIN mom_eam_maintenance_standard_detail t1 ON tt.maintenance_standard_detail_id = t1.id
+ LEFT JOIN mom_eam_maintenance_standard t2 ON tt.maintenance_standard_id = t2.id
+ LEFT JOIN mom_eam_maintenance_project t3 ON tt.maintenance_project_id = t3.id
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method
+ WHERE t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0' AND t2.type = 'daily' and t1.maintenance_role = 'operator'
+ <if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''">
+ and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3