From f3a7d211a4a616d8ed2a08b103d8d162f06d389e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 八月 2025 17:23:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaHoleToolsMapper.xml | 102 ++++++++++++++++++++++++---------------------------
1 files changed, 48 insertions(+), 54 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaHoleToolsMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaHoleToolsMapper.xml
index 11de71a..75bb798 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaHoleToolsMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaHoleToolsMapper.xml
@@ -4,62 +4,56 @@
<select id="selectByClassifyAndDiameter" resultType="org.jeecg.modules.tms.entity.vo.ParaHolesToolsVo">
SELECT
- t.id,
- t.classify_id AS classifyId,
- t2.classify_id AS classifyNum,
- t2.type_name AS classifyName,
- t1.id AS toolId,
- t1.tool_code AS toolCode,
- t.sign_code AS signCode,
- t.chinese_name AS chineseName,
- t.foreign_language_name AS foreignLanguageName,
- t.standard_level AS standardLevel,
- t.standard_code AS standardCode,
- t.position_code AS positionCode,
- t.tool_model AS toolModel,
- t.diameter,
- t.cone_angle AS coneAngle,
- t.edge_length AS edgeLength,
- t.total_length AS totalLength,
- t.tool_material AS toolMaterial,
- t.part_material AS partMaterial,
- t.paintcoat_flag AS paintcoatFlag,
- t.tool_pattern AS toolPattern,
- t.handle_specifications AS handleSpecifications,
- t.cooling_method AS coolingMethod,
- t.technical_conditions AS technicalConditions,
- t.conditions_info AS conditionsInfo,
- t.brand,
- t.types,
- t.tolerance_class AS toleranceClass,
- t.flute_form AS fluteForm,
- t.handle_form AS handleForm,
- t.blade_count AS bladeCount,
- t.small_diameter AS smallDiameter,
- t.chamfer_angle AS chamferAngle,
- t.fitter_part AS fitterPart,
- t.effective_length AS effectiveLength,
- t.drill_diameter_range AS drillDiameterRange,
- t.knife_diameter AS knifeDiameter,
- t.bore_diameter AS boreDiameter,
- t.connector_type AS connectorType,
- t.slot_specification AS slotSpecification,
- t.scope_of_application AS scopeOfApplication,
- t.latest_boring_diameter AS latestBoringDiameter,
- t.max_boring_diameter AS maxBoringDiameter,
- t.processingmethod,
- t.heads_number AS headsNumber,
- t.adapt_holder AS adaptHolder
+ t.id,
+ t.classify_id AS classifyId,
+ t2.classify_id AS classifyNum,
+ t2.type_name AS classifyName,
+ t1.id AS toolId,
+ t1.tool_code AS toolCode,
+ t1.parama_table_name AS paramaTableName,
+ t.sign_code AS signCode,
+ t.chinese_name AS chineseName,
+ t.foreign_language_name AS foreignLanguageName,
+ t.standard_level AS standardLevel,
+ t.standard_code AS standardCode,
+ t.position_code AS positionCode,
+ t.tool_model AS toolModel,
+ t.diameter,
+ t.cone_angle AS coneAngle,
+ t.edge_length AS edgeLength,
+ t.total_length AS totalLength,
+ t.tool_material AS toolMaterial,
+ t.part_material AS partMaterial,
+ t.paintcoat_flag AS paintcoatFlag,
+ t.tool_pattern AS toolPattern,
+ t.handle_specifications AS handleSpecifications,
+ t.cooling_method AS coolingMethod,
+ t.technical_conditions AS technicalConditions,
+ t.conditions_info AS conditionsInfo,
+ t.brand,
+ t.types,
+ t.tolerance_class AS toleranceClass,
+ t.flute_form AS fluteForm,
+ t.handle_form AS handleForm,
+ t.blade_count AS bladeCount,
+ t.small_diameter AS smallDiameter,
+ t.chamfer_angle AS chamferAngle,
+ t.fitter_part AS fitterPart,
+ t.effective_length AS effectiveLength,
+ t.drill_diameter_range AS drillDiameterRange,
+ t.knife_diameter AS knifeDiameter,
+ t.bore_diameter AS boreDiameter,
+ t.connector_type AS connectorType,
+ t.slot_specification AS slotSpecification,
+ t.scope_of_application AS scopeOfApplication,
+ t.latest_boring_diameter AS latestBoringDiameter,
+ t.max_boring_diameter AS maxBoringDiameter,
+ t.processingmethod,
+ t.heads_number AS headsNumber,
+ t.adapt_holder AS adaptHolder
FROM tms_para_hole_tools t
LEFT JOIN tms_base_tools t1 on t.tool_code = t1.id
LEFT JOIN tms_tools_classify t2 on t.classify_id = t2.id
- <where>
- <if test="classifyId != null and classifyId != ''">
- AND t.classify_id = #{classifyId}
- </if>
- <if test="diameter != null and diameter != ''">
- AND t.diameter = #{diameter}
- </if>
- </where>
+ ${ew.customSqlSegment}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3