From eab07479f481ddd84b4009386a8d048efa8055a0 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 10 十月 2023 16:37:42 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/resources/mapping/TSteelNeedYearMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/TSteelNeedYearMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/TSteelNeedYearMapper.xml
index 36bd77e..3da3639 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/TSteelNeedYearMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/TSteelNeedYearMapper.xml
@@ -272,8 +272,8 @@
</select>
<select id="selectPipeInfo" resultType="java.util.Map" parameterType="java.util.Map">
SELECT
- tpi.ring_num,
- tpi.pipe_num,
+ tpi.ring_num ringNum,
+ tpi.pipe_num pipeNum,
sd1.dict_name turn,
sd2.dict_name reinforcement,
sd3.dict_name groutingHoles,
@@ -283,7 +283,7 @@
IFNULL(tpi.pouring_time,' ') pouringTime,
tpi.check_time checkTime,
IFNULL(sg.group_name,'无') groupName,
- sp.pro_name,
+ sp.pro_name proName,
CASE tpi.check_result
WHEN 1 THEN '合格'
WHEN 2 THEN '不合格'
--
Gitblit v1.9.3