430/mdc_430_new.git

			@@ -108,7 +108,7 @@
			t1.fault_time as faultTime,
			t2.item_text as maintenanceMethodName,
			t3.name as teamName,
			t4.realname as recipientuserName,
			t1.recipient_user_id as recipientuserName,
			t1.actual_hour as actualHour,
			t1.actual_start_time AS actualStartTime,
			t1.actual_end_time as actualEndTime
			@@ -116,8 +116,7 @@
			mom_eam_repair_order t1
			LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_method' ) t2 ON t2.item_value = t1.maintenance_method
			left join mom_base_team t3 on t1.team_id = t3.id
			left join sys_user t4 on t1.recipient_user_id = t4.id
			WHERE t1.del_flag = '0' and t4.del_flag= '0' and t3.del_flag= '0' and t1.equipment_id = #{params.equipmentId}
			WHERE t1.del_flag = '0' and t1.equipment_id = #{params.equipmentId}
			</select>

			<select id="getResumeCalibrationRecordList" parameterType="Map" resultType="Map">
			@@ -165,13 +164,14 @@
			mom_eam_equipment t1
			LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'equipment_status' ) t2 ON t1.equipment_status = t2.item_value
			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>

			</select>
			<!-- <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>-->
			<select id="getEquipmentList" resultType="org.jeecg.modules.eam.entity.Equipment">
			select
			t1.id id,
			@@ -325,6 +325,12 @@
			<if test="lineId != null and lineId != ''">
			and t1.line_id = #{lineId}
			</if>
			<if test="userWorkCenterIds != null and userWorkCenterIds.size > 0">
			and t1.work_center_id in
			<foreach collection="userWorkCenterIds" open="(" separator="," close=")" item="workCenterId">
			#{workCenterId}
			</foreach>
			</if>
			order by t1.create_time desc
			</select>

			@@ -344,8 +350,8 @@
			t1.constructor_id constructorId,
			t1.supplier_id supplierId,
			t1.factory_number factoryNumber,
			t1.leave_factory_date leaveFactoryDate,
			t1.acceptance_check_date acceptanceCheckDate,
			CONVERT(VARCHAR(10), t1.leave_factory_date, 120) leaveFactoryDate,
			CONVERT(VARCHAR(10), t1.acceptance_check_date, 120) acceptanceCheckDate,
			t1.affiliation_id affiliationId,
			t1.manage_id manageId,
			t1.manager manager,
			@@ -405,6 +411,9 @@
			t1.next_technology_status_qualification_time nextTechnologyStatusQualificationTime,
			t1.technology_status_qualification_time technologyStatusQualificationTime,
			t1.technology_status_verification_type technologyStatusVerificationType,
			t1.second_maintenance_time secondMaintenanceTime,
			t1.third_maintenance_time thirdMaintenanceTime,
			t1.next_third_maintenance_time nextThirdMaintenanceTime,
			t1.line_id lineId,
			t1.is_meta isMeta,
			t1.id showId,
			@@ -579,4 +588,70 @@
			ORDER BY t1.create_time desc
			</select>

			<select id="exportXlsNew" parameterType="Map" resultType="map">
			SELECT
			t1.num,
			t1.name,
			t2.depart_name AS useDepart,
			t2.depart_name AS manageDepart,
			t4.name as workCenter,
			t5.name as factoryModel,
			t6.name as area,
			t7.name as teamName,
			t8.name as equipmentCategoryName,
			t9.item_text as equipmentStatus,
			t10.item_text as technologyStatus,
			t1.equipment_importance_id as abc,
			t11.item_text as specificEquipment,
			t1.security_configuration as securityConfiguration,
			t12.item_text as coolingSystem,
			t1.fire_extinguisher as fireExtinguisher,
			t1.fire_extinguisher_validity_period as fireExtinguisherValidityPeriod,
			t13.item_text as operatingSystem,
			t1.system,
			t1.port,
			t1.coordinate_num as coordinateNum,
			t1.equipment_uda3 as equipmentUda3,
			t1.equipment_uda4 as equipmentUda4,
			t1.equipment_Uda5 as equipmentUda5,
			t1.location,
			CONVERT(VARCHAR(10), t1.leave_factory_date, 120) as leaveFactoryDate,
			t1.project_approval_no as projectApprovalNo,
			t1.fund_source as fundSource,
			CONVERT(VARCHAR(10), t1.acceptance_check_date, 120) as acceptanceCheckDate,
			t1.factory_number as factoryNumber,
			t15.name as constructor,
			t1.source_country as sourceCountry,
			t1.model as equipmentModel,
			t1.specification as equpmentSspecification,
			t1.gpo,
			t1.warranty_start as warrantyStart,
			t1.warranty_end as warrantyEnd,
			t14.item_text as propertyStatus,
			CONVERT(VARCHAR(10), t1.third_maintenance_time, 120) as thirdMaintenanceTime,
			CONVERT(VARCHAR(10), t1.next_technology_status_qualification_time, 120) as nextTechnologyStatusQualificationTime,
			t1.create_by as createBy,
			CONVERT(VARCHAR(10), t1.create_time, 120) as createTime,
			t1.update_by as updateBy,
			CONVERT(VARCHAR(10), t1.update_time, 120) as updateTime
			FROM
			mom_eam_equipment t1
			LEFT JOIN sys_depart t2 ON t1.use_id = t2.id
			left join sys_depart t3 on t1.manage_id = t3.id
			left join mom_base_area t4 on t1.work_center_id = t4.id
			left join mom_base_area t5 on t1.factory_model_id = t5.id
			left join mom_base_area t6 on t1.area_id = t6.id
			left join mom_base_team t7 on t1.team_id = t7.id
			left join mom_eam_equipment_category t8 on t1.equipment_category_id = t8.id
			left join (SELECT * FROM v_sys_dict WHERE dict_code = 'equipment_status') t9 on t1.equipment_status = t9.item_value
			left join (SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status') t10 on t1.technology_status =t10.item_value
			left join (SELECT * FROM v_sys_dict WHERE dict_code = 'specific_equipment') t11 on t1.specific_equipment = t11.item_value
			left join (SELECT * FROM v_sys_dict WHERE dict_code = 'cooling_system') t12 on t1.cooling_system = t12.item_value
			left join (SELECT * FROM v_sys_dict WHERE dict_code = 'operation_flag') t13 on t1.operating_system = t13.item_value
			left join (SELECT * FROM v_sys_dict WHERE dict_code = 'property_status') t14 on t1.property_status = t14.item_value
			left join mom_base_constructor t15 on t1.constructor_id = t15.id
			where t1.del_flag = '0' ORDER BY t1.create_time DESC

			</select>

			</mapper>