From 9fa13f13bc33a95b53d03cfd2bfc1dad2beab905 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 16 四月 2024 09:42:24 +0800
Subject: [PATCH] 修改排序
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 82 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index 995a2eb..8abc46d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -234,7 +234,7 @@
t1.port port,
t1.coordinate_num coordinateNum,
t1.project_approval_no projectApprovalNo,
- t1.standard_a tandardA,
+ t1.standard_a standardA,
t1.standard_b standardB,
t1.standard_c standardC,
t1.standard_d standardD,
@@ -252,11 +252,17 @@
t1.line_id lineId,
t1.is_meta isMeta,
t1.id showId,
+ t1.is_line_equip isLineEquip,
+ t1.is_judging isJudging,
+ t1.area_id areaId,
t3.sumOfEquipment
from mom_eam_equipment t1
left join (select * from mom_eam_equipment_category where del_flag = 0) t2 on t1.equipment_category_id = t2.id
left join(select count(id) sumOfEquipment,line_id from mom_eam_equipment where del_flag=0 group by line_id) t3 on t3.line_id = t1.id
where t1.del_flag = 0
+ <if test="equipmentCategoryId != null and equipmentCategoryId != ''">
+ and t1.equipment_category_id = #{equipmentCategoryId}
+ </if>
<if test="num != null and num != ''">
and t1.num like concat('%',#{num},'%')
</if>
@@ -268,6 +274,10 @@
</if>
<if test="workCenterId != null and workCenterId != ''">
and t1.work_center_id = #{workCenterId}
+ </if>
+-- 鏍规嵁areaId鏌ヨ璁惧
+ <if test="areaId != null and areaId != ''">
+ and t1.area_id = #{areaId}
</if>
<if test="factoryModelId != null and factoryModelId != ''">
and t1.factory_model_id = #{factoryModelId}
@@ -287,8 +297,20 @@
<if test="equipmentStatus != null and equipmentStatus != ''">
and t1.equipment_status = #{equipmentStatus}
</if>
+ <if test="isLineEquip != null and isLineEquip != ''">
+ and t1.is_line_equip = #{isLineEquip}
+ </if>
+ <if test="isLine != null and isLine != ''">
+ and t1.is_line = #{isLine}
+ </if>
<if test="specificEquipment != null and specificEquipment != ''">
and t1.specific_equipment = #{specificEquipment}
+ </if>
+ <if test="equipNums.size!=0">
+ and t1.num in
+ <foreach collection="equipNums" open="(" separator="," close=")" item="num">
+ #{num}
+ </foreach>
</if>
<if test="warrantyStart != null">
and DATEDIFF(day,t1.warranty_start,#{warrantyStart})=0
@@ -302,12 +324,14 @@
<if test="lineId != null and lineId != ''">
and t1.line_id = #{lineId}
</if>
- order by (CASE WHEN t1.is_meta='yes' then GETDATE() else t1.create_time end) desc
+ order by t1.create_time desc
</select>
+<!-- order by (CASE WHEN t1.is_meta='yes' then GETDATE() else t1.create_time end) desc-->
<select id="getStandardList" resultType="org.jeecg.modules.eam.entity.DailyInspectionStandardDetail">
select t9.* from ( select
t1.id id,
t5.name projectName,
+ '' as maintenanceRole,
t5.detection_standard standard,
'1' as type,
t6.name cycleName,
@@ -324,6 +348,7 @@
select
t3.id id,
t7.name projectName,
+ t3.maintenance_role maintenanceRole,
t7.standard standard,
t8.maintenance_type type,
t8.name cycleName,
@@ -341,4 +366,57 @@
order by t9.type
</select>
+ <select id="getEquipmentListAllStandard" parameterType="Map" resultType="Map">
+ SELECT
+ t1.id,
+ t2.name as categoryName,
+ t1.num as equipmentNum,
+ t1.name as equipmentName,
+ t1.model as equipmentModel,
+ t1.equipment_importance_id as abc,
+ t1.precision_parameters as precisionParameters,
+ t1.precision_parameters_template_id as precisionParametersTemplateId,
+ t3.depart_name as departName,
+ t4.item_text as technologyStatus,
+ t5.item_text as specificEquipment
+ FROM
+ mom_eam_equipment t1
+ LEFT JOIN mom_eam_equipment_category t2 ON t1.equipment_category_id = t2.id
+ LEFT JOIN sys_depart t3 ON t1.use_id = t3.id
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status' ) t4 ON t4.item_value = t1.technology_status
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'specific_equipment' ) t5 ON t5.item_value = t1.specific_equipment
+ WHERE t1.del_flag = '0'
+ <if test="params.num != null and params.num != ''">
+ and t1.num like concat('%',#{params.num},'%')
+ </if>
+ <if test="params.name != null and params.name != ''">
+ and t1.name like concat('%',#{params.name},'%')
+ </if>
+ <if test="params.model != null and params.model != ''">
+ and t1.model like concat('%',#{params.model},'%')
+ </if>
+ <if test="params.useId != null and params.useId != ''">
+ and t1.use_id = #{params.useId}
+ </if>
+ <if test="params.equipmentImportanceId != null and params.equipmentImportanceId != ''">
+ and t1. equipment_importance_id = #{params.equipmentImportanceId}
+ </if>
+ <if test="params.technologyStatus != null and params.technologyStatus != ''">
+ and t1.technology_status = #{params.technologyStatus}
+ </if>
+ <if test="params.equipmentStatus != null and params.equipmentStatus != ''">
+ and t1.equipment_status = #{params.equipmentStatus}
+ </if>
+ <if test="params.specificEquipment != null and params.specificEquipment != ''">
+ and t1.specific_equipment = #{params.specificEquipment}
+ </if>
+ <if test="params.factoryModelId != null and params.factoryModelId != ''">
+ and t1.factory_model_id = #{params.factoryModelId}
+ </if>
+ <if test="params.equipmentCategoryId != null and params.equipmentCategoryId != ''">
+ and t1.equipment_category_id = #{params.equipmentCategoryId}
+ </if>
+ ORDER BY t1.create_time desc
+ </select>
+
</mapper>
--
Gitblit v1.9.3