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/ParaThreadingToolMapper.xml | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaThreadingToolMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaThreadingToolMapper.xml index 83456b7..2fdf9fc 100644 --- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaThreadingToolMapper.xml +++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaThreadingToolMapper.xml @@ -2,4 +2,49 @@ <!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.ParaThreadingToolMapper"> + <select id="selectByClassifyAndParam" resultType="org.jeecg.modules.tms.entity.vo.ParaThreadingToolVo"> + 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.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.handle_specifications AS handleSpecifications, + t.cooling_method AS coolingMethod, + t.technical_conditions AS technicalConditions, + t.conditions_info AS conditionsInfo, + t.brand, + t.types, + <!-- 铻虹汗鍒�鍏风壒鏈夊瓧娈� --> + t.thread_code AS threadCode, + t.rotation_direction AS rotationDirection, + t.tolerancezone_level AS tolerancezoneLevel, + t.external_dimensions AS externalDimensions, + t.handle_specifications AS handleSpecifications, + t.screw_hole_type AS screwHoleType, + t.thread_standard AS threadStandard, + t.flute_solt_type AS fluteSoltType, + t.thread_type AS threadType, + t.guiding_size AS guidingSize, + t.connection_aperture AS connectionAperture, + t.connecting_keyway AS connectingKeyway + FROM tms_para_threading_tool 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