From 7a90b194a7d1a213d01c323fd90ef5afbdeb4ea7 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 10 六月 2025 16:21:02 +0800
Subject: [PATCH] 保养修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 216 insertions(+), 7 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 43d22bb..7ab68b1 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
@@ -9,6 +9,7 @@
t1.location,
t1.photo,
t1.maintenance_project_id as maintenanceProjectId,
+ t5.item_text as maintenanceRole,
t3.num as maintenanceProjectNum,
t3.name as maintenanceProjectName,
t3.standard,
@@ -19,6 +20,7 @@
LEFT JOIN mom_eam_maintenance_standard t2 ON t1.maintenance_standard_id = t2.id
LEFT JOIN mom_eam_maintenance_project t3 ON t1.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
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_role' ) t5 ON t5.item_value = t1.maintenance_role
where t1.del_flag = '0' and t2.del_flag = '0' and t3.del_flag = '0' and t2.type = 'daily'
<if test="maintenanceStandardId != null and maintenanceStandardId != ''">
and t2.id = #{maintenanceStandardId}
@@ -31,8 +33,8 @@
<select id="getMaintenanceCycleByStandardId" parameterType="Map" resultType="org.jeecg.modules.eam.model.MaintenanceCycleVo">
SELECT DISTINCT
t2.id AS value,
- concat( t2.CODE, '/', t2.name ) AS text,
- concat( t2.CODE, '/', t2.name ) AS title
+ t2.name AS text,
+ t2.name AS title
FROM
mom_eam_maintenance_standard_detail t1
LEFT JOIN mom_eam_maintenance_cycle t2 ON t1.maintenance_cycle_id = t2.id
@@ -49,7 +51,8 @@
t4.id as maintenanceCycleId,
t4.maintenance_type as maintenanceType,
t10.item_text as maintenanceTypeName,
- concat(t4.code, '/', t4.name) as maintenanceCycleName,
+ t4.cycle as maintenanceCycle,
+ t4.name as maintenanceCycleName,
t3.id as equipmentId,
t3.num as equipmentNum,
t3.name as equipmentName,
@@ -73,7 +76,110 @@
t1.plan_end_time as planEndTime,
t1.actual_start_time as actualStartTime,
t1.actual_end_time as actualEndTime,
- t8.realname as maintenanceUserName,
+ t1.maintenance_date as maintenanceDate,
+ t9.item_text as assignModeName,
+ t1.create_by as createBy,
+ t1.create_time as createTime,
+ t1.remark,
+ t1.description,
+ t1.confirm_status as confirmStatus,
+ t1.precision_inspection_status as precisionInspectionStatus,
+ t1.maintenance_order_uda3 as receipts,
+ t12.num as receiptsNum,
+ t13.item_text as receiptsName,
+ t14.item_text as confirmStatusName
+ FROM
+ 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
+ left join mom_eam_maintenance_cycle t4 on t1.maintenance_cycle_id = t4.id
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'daily_maintenance_order_status' ) t5 on t5.item_value = t1.status
+ left join sys_depart t6 on t3.use_id = t6.id
+ left join mom_base_team t7 on t7.id = t3.team_id
+ left join ( SELECT * FROM v_sys_dict WHERE dict_code = 'assign_mode' ) t9 on t9.item_value = t2.assign_mode
+ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_type') t10 on t10.item_value = t4.maintenance_type
+ left join sys_file_name t12 on t1.maintenance_order_uda3 = t12.id
+ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'sys_file_name') t13 on t13.item_value = t12.name
+ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'two_maintenance_devolution_status') t14 on t14.item_value = t1.confirm_status
+ 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.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>
+ <if test="params.workCenterIds != null">
+ and t3.work_center_id in
+ <foreach collection="params.workCenterIds" open="(" separator="," close=")" item="workCenterId">
+ #{workCenterId}
+ </foreach>
+ </if>
+ <if test="params.equipmentId != null">
+ and t1.equipment_id = #{params.equipmentId}
+ </if>
+ <if test="params.statusEnums != null">
+ and t1.status not in
+ <foreach collection="params.statusEnums" open="(" separator="," close=")" item="statusEnum">
+ #{statusEnum}
+ </foreach>
+ </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,
t9.item_text as assignModeName,
t1.create_by as createBy,
t1.create_time as createTime,
@@ -84,7 +190,13 @@
t1.inspect_user as inspectUser,
t1.inspect_date as inspectDate,
t12.item_text as checkStatusName,
- t1.not_pass_reason as notPassReason
+ 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
LEFT JOIN mom_eam_maintenance_standard t2 ON t1.maintenance_standard_id = t2.id
@@ -94,13 +206,49 @@
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'daily_maintenance_order_status' ) t5 on t5.item_value = t1.status
left join sys_depart t6 on t3.use_id = t6.id
left join mom_base_team t7 on t7.id = t3.team_id
- left join sys_user t8 on t1.maintenance_user_id = t8.id
left join ( SELECT * FROM v_sys_dict WHERE dict_code = 'assign_mode' ) t9 on t9.item_value = t2.assign_mode
left join (SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_type') t10 on t10.item_value = t4.maintenance_type
left join (SELECT * FROM v_sys_dict WHERE dict_code = 'check_status') t12 on t12.item_value = t1.check_status
+ left join sys_file_name t13 on t1.maintenance_order_uda5 = t13.id
+ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'sys_file_name') t14 on t14.item_value = t13.name
+ left join sys_file_name t15 on t1.maintenance_order_uda4 = t15.id
+ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'sys_file_name') t16 on t16.item_value = t15.name
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>
+ <if test="params.workCenterIds != null">
+ and t3.work_center_id in
+ <foreach collection="params.workCenterIds" open="(" separator="," close=")" item="workCenterId">
+ #{workCenterId}
+ </foreach>
+ </if>
+ <if test="params.equipmentId != null">
+ and t1.equipment_id = #{params.equipmentId}
+ </if>
+ <if test="params.statusEnums != null">
+ and t1.status not in
+ <foreach collection="params.statusEnums" open="(" separator="," close=")" item="statusEnum">
+ #{statusEnum}
+ </foreach>
</if>
ORDER BY t1.create_time desc
</select>
@@ -128,9 +276,70 @@
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'
+ WHERE t1.del_flag = '0' AND t2.type = 'daily'
<if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''">
and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
</if>
+-- AND t2.del_flag = '0' AND t3.del_flag = '0'
+ </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 1=1 AND t2.type = 'daily' and t1.maintenance_role = 'maintenance'
+ <if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''">
+ and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
+ </if>
+-- t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0'
+ </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 1=1 AND t2.type = 'daily' and t1.maintenance_role = 'operator'
+ <if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''">
+ and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
+ </if>
+ -- t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0'
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3