From df13f27e9cae2d7b112ef0dda85cba456ecef32b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 二月 2025 16:45:09 +0800
Subject: [PATCH] 远场和近场的数据解析的单位和指标需要重新对应+报告生成放在复核结束里面
---
cnas-process/src/main/resources/mapper/QualitySuperviseMapper.xml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/cnas-process/src/main/resources/mapper/QualitySuperviseMapper.xml b/cnas-process/src/main/resources/mapper/QualitySuperviseMapper.xml
index 106c046..28186f9 100644
--- a/cnas-process/src/main/resources/mapper/QualitySuperviseMapper.xml
+++ b/cnas-process/src/main/resources/mapper/QualitySuperviseMapper.xml
@@ -1,13 +1,18 @@
<?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.yuanchu.mom.mapper.QualitySuperviseMapper">
-
<!-- 鐩戠潱璁″垝鍒楄〃 -->
- <select id="pageQualitySupervise" resultType="com.yuanchu.mom.pojo.QualitySupervise">
+ <select id="pageQualitySupervise" resultType="com.yuanchu.mom.dto.QualitySuperviseDto">
select *
- from (select *
- from cnas_quality_supervise
- order by create_time desc ) a
+ from (select cqs.*,
+ u1.name write_name,
+ u3.name ratify_name,
+ u4.name createUserName
+ from cnas_quality_supervise cqs
+ left join user u1 on u1.id = cqs.write_user_id
+ left join user u3 on u3.id = cqs.ratify_user_id
+ left join user u4 on u4.id = cqs.create_user
+ order by create_time desc ) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
--
Gitblit v1.9.3