From f8a3a9826738a397bdf4aff4ca7a5116344b5a0a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 09 五月 2024 07:26:56 +0800
Subject: [PATCH] 实现报告生成合并单元格；修复部分bug
---
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
index 8c59858..16284d3 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -47,7 +47,7 @@
where io.id = #{orderId}
</select>
<select id="selectUserById" resultType="java.util.Map">
- select name,company,phone,address from user where id = #{userId}
+ select name,company,phone,address,name_en from user where id = #{userId}
</select>
<select id="getProductAndResult" resultType="com.yuanchu.mom.dto.ProductResultDto2">
select ip.id,ip.inspection_item,ip.inspection_item_subclass,ip.laboratory,ip.unit,ipr.equip_value,io.entrust_code,ipr.update_time,ip.ins_result,u.name updateUserName
--
Gitblit v1.9.3