From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
index 9d639ee..c2a8d35 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
@@ -8,6 +8,8 @@
t1.num,
t1.inspection_time as inspectionDate,
t1.inspection_time as inspectionTime,
+ DATEADD(DAY,+7,t1.inspection_time) as redWarningTime,
+ CONVERT(varchar(100), GETDATE(), 20) AS currentDateTime,
t1.inspection_deadline as inspectionDeadline,
t1.start_work_condition as startWorkCondition,
t1.status,
@@ -31,8 +33,7 @@
t7.name as teamName,
t4.assign_mode as assignMode,
t8.item_text as assignModeName,
- t1.inspection_user_id as inspectionUserId,
- t9.realname as inspectionUserName,
+ t1.inspection_order_uda2 as inspectionUserName,
t1.actual_end_time as actualEndTime,
t1.actual_start_time as actualStartTime,
t1.inspection_order_uda1 AS repairConfirmPerson,
@@ -46,13 +47,30 @@
left join sys_depart t6 on t2.use_id = t6.id
left join mom_base_team t7 on t2.team_id = t7.id
left join ( SELECT * FROM v_sys_dict WHERE dict_code = 'assign_mode' ) t8 on t8.item_value = t4.assign_mode
- left join sys_user t9 on t1.inspection_user_id = t9.id
WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 and t4.del_flag = 0
<!-- <if test="params.dailyInspectionStandardId != null and params.dailyInspectionStandardId != ''">-->
<!-- and t1.daily_inspection_standard_id = #{params.dailyInspectionStandardId}-->
<!-- </if>-->
<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 t2.num like concat('%',#{params.equipmentNum},'%')
+ </if>
+ <if test="params.useDepartId != null and params.useDepartId != ''">
+ and t2.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 t2.team_id = #{params.teamId}
+ </if>
+ <if test="params.inspectionStartTime != null">
+ and t1.actual_end_time >= #{params.inspectionStartTime}
+ </if>
+ <if test="params.inspectionEndTime != null">
+ and t1.actual_end_time <= #{params.inspectionEndTime}
</if>
ORDER BY t1.create_time desc
</select>
@@ -172,4 +190,39 @@
</if>
ORDER BY t1.create_time desc
</select>
+
+ <select id="findDayInspectionProjectList" parameterType="Map" resultType="Map">
+ SELECT
+ t4.num as equipmentNum,
+ t4.name as equipmentName,
+ t3.name,
+ t1.detection_standard as detectionStandard,
+ t1.inspection_project_result as insResult,
+ SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 9, 10 ) as createTime
+ FROM
+ mom_eam_inspection_order_detail t1
+ LEFT JOIN mom_eam_inspection_order t2 ON t1.inspection_order_id = t2.id
+ LEFT JOIN mom_eam_inspection_project t3 ON t1.inspection_project_id = t3.id
+ LEFT JOIN mom_eam_equipment t4 ON t2.equipment_id = t4.id
+ LEFT JOIN mom_eam_inspection_cycle t5 ON t2.inspection_cycle_id = t5.id
+ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'inspection_project_result') t6 on t1.inspection_project_result = t6.item_value
+ WHERE
+ t5.name = '1鏃�'
+ AND t4.num = 'HQ1901124'
+ AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 )
+ AND t1.inspection_standard_detail_id IN (
+ SELECT
+ tt2.id
+ FROM
+ mom_eam_daily_inspection_standard tt1
+ LEFT JOIN mom_eam_daily_inspection_standard_detail tt2 ON tt1.id= tt2.daily_inspection_standard_id
+ LEFT JOIN mom_eam_equipment tt3 ON tt1.equipment_id = tt3.id
+ LEFT JOIN mom_eam_inspection_cycle tt4 ON tt2.inspection_cycle_id = tt4.id
+ WHERE
+ tt4.name = '1鏃�'
+ AND tt3.num = 'HQ1901124'
+ AND tt1.version_status = '2'
+ AND tt1.del_flag = '0'
+ )
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3