From ac8e03a06d463aafcbe810af31e2da5037491a07 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期五, 13 六月 2025 13:10:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaBladeMapper.xml |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaBladeMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaBladeMapper.xml
index edaca31..c50113c 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaBladeMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaBladeMapper.xml
@@ -2,4 +2,43 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.tms.mapper.ParaBladeMapper">
 
+    <select id="selectByClassifyAndParam" resultType="org.jeecg.modules.tms.entity.vo.ParaBladeVo">
+        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,
+            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.tool_material AS toolMaterial,
+            t.part_material AS partMaterial,
+            t.technical_conditions AS technicalConditions,
+            t.conditions_info AS conditionsInfo,
+            t.brand,
+            t.types,
+            <!-- 鍒�鐗囩壒鏈夊瓧娈� -->
+            t.blade_shape AS bladeShape,
+            t.cutting_edge_count AS cuttingEdgeCount,
+            t.clamping_type AS clampingType,
+            t.nose_angle_r AS noseAngleR,
+            t.processing_classify AS processingClassify,
+            t.blade_posterior AS bladePosterior,
+            t.blade_size AS bladeSize,
+            t.in_out_thread AS inOutThread,
+            t.dental_angle AS dentalAngle,
+            t.min_internal_thread AS minInternalThread,
+            t.thread_standard AS threadStandard
+        FROM tms_para_blade 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
+        ${ew.customSqlSegment}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3