From 7374d150b7f08d4b126d3d0fde57ab55febb53dd Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 05 三月 2025 09:48:24 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr
---
cnas-device/src/main/resources/mapper/InstructionMapper.xml | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/InstructionMapper.xml b/cnas-device/src/main/resources/mapper/InstructionMapper.xml
index 2d1a823..8404014 100644
--- a/cnas-device/src/main/resources/mapper/InstructionMapper.xml
+++ b/cnas-device/src/main/resources/mapper/InstructionMapper.xml
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.device.mapper.InstructionMapper">
-
-
- <select id="pageByPageQueryOfHomeworkInstructions" resultType="com.ruoyi.device.pojo.DeviceInstruction">
+ <select id="pageByPageQueryOfHomeworkInstructions" resultType="com.ruoyi.device.dto.DeviceOperationInstructionDto">
SELECT
- doi.*,di.*,d.device_name, d.management_number device_number, d.specification_model device_model, u.name uploader_name, u1.name approver_name
+ doi.*,di.*,
+ d.device_name deviceName,
+ d.management_number deviceNumber,
+ d.specification_model deviceModel,
+ u.name uploaderName,
+ u1.name approverName
FROM
- device_operation_instruction doi
- LEFT JOIN device_instruction di ON di.id = doi.instruction_id
- left join device d on d.id = doi.device_id
- left join user u on u.id = doi.uploader
- left join user u1 on u1.id = doi.approver_id
+ device_operation_instruction doi
+ LEFT JOIN device_instruction di ON di.id = doi.instruction_id
+ left join device d on d.id = doi.device_id
+ left join user u on u.id = doi.uploader
+ left join user u1 on u1.id = doi.approver_id
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
--
Gitblit v1.9.3