From d6372da6f37778e90a4bae02865e8ec77e980b6e Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期四, 17 七月 2025 17:14:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderChangeMapper.xml | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderChangeMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderChangeMapper.xml index ff407ce..a938b50 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderChangeMapper.xml +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderChangeMapper.xml @@ -2,4 +2,12 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderChangeMapper"> + <select id="queryPageList" + resultType="org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange"> + select ems.*, e.equipment_code, e.equipment_name, e.equipment_model, emo.evaluation_date as originalEvaluationDate + from eam_technical_status_evaluation_order_change ems + inner join eam_technical_status_evaluation_order emo on ems.order_id = emo.id + inner join eam_equipment e on ems.equipment_id = e.id + ${ew.customSqlSegment} + </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3