Merge branch 'master' of http://111.30.93.211:10101/r/supipe

叶松

2023-10-10 eab07479f481ddd84b4009386a8d048efa8055a0

Merge branch 'master' of http://111.30.93.211:10101/r/supipe

 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 '不合格'