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

叶松

2023-10-10 da8dcef599d67dcc66742e53a872b45ead53b1ea

 hd/pipe/materialsManage/src/main/resources/mapping/TSteelNeedYearMapper.xml

@@ -232,4 +232,76 @@
   and print_time like concat('%',#{years},'%')
   GROUP BY block_num
  </select>

  <select id="selectSteelInfo" resultType="java.util.Map" parameterType="java.util.Map">
    SELECT
            tsp.produce_number produceNumber,
            sp.pro_name proName,
            sd1.dict_name sizeName,
            sd2.dict_name reinforcementName,
            sd3.dict_name blockName,
            tsp.quality_time,
            su1.real_name checkName,
            su2.real_name createUser,
            CASE tsp.is_qualified
                    WHEN  1 THEN '合格'
                    WHEN  2 THEN '不合格'
                    END isQualified,
            CASE tsp.is_model
                    WHEN  1 THEN '入模'
                    WHEN  2 THEN '未入模'
                    END isModel,
            IFNULL(sg.group_name,'无') groupName
    FROM t_steel_produce tsp
                 LEFT JOIN sys_project sp ON sp.pro_id = tsp.pro_id
                 LEFT JOIN sys_dict sd1 ON sd1.dict_id = tsp.size_id
                 LEFT JOIN sys_dict sd2 ON sd2.dict_id = tsp.reinforcement_id
                 LEFT JOIN sys_dict sd3 ON sd3.dict_id = tsp.block_num
                 LEFT JOIN sys_users su1 ON su1.user_id = tsp.quality_user
                 LEFT JOIN sys_users su2 ON su2.user_id = tsp.create_user
                 LEFT JOIN sys_group_user sgu ON sgu.user_id = tsp.create_user
                 LEFT JOIN sys_group sg ON sg.group_id = sgu.group_id
    WHERE
            tsp.is_use = 1
      AND tsp.is_qualified = 1
      AND tsp.reinforcement_id = #{reinforcementId}
      AND tsp.pro_id = #{proId}
      AND tsp.size_id = #{sizeId}
      AND tsp.print_time like concat(#{years},'%')
      AND sp.company_id=#{companyId}
  </select>
    <select id="selectPipeInfo" resultType="java.util.Map" parameterType="java.util.Map">
        SELECT
                tpi.ring_num,
                tpi.pipe_num,
                sd1.dict_name turn,
                sd2.dict_name reinforcement,
                sd3.dict_name groutingHoles,
                sd4.dict_name blockNum,
                sm.mould_num mouldNum,
                tpi.into_mod_time intoModTime,
                IFNULL(tpi.pouring_time,' ') pouringTime,
                tpi.check_time checkTime,
                IFNULL(sg.group_name,'无') groupName,
                sp.pro_name,
                CASE tpi.check_result
                        WHEN  1 THEN '合格'
                        WHEN  2 THEN '不合格'
                        END checkResult
        FROM t_pipe_info tpi
                     LEFT JOIN sys_project sp ON sp.pro_id = tpi.pro_id
                     LEFT JOIN sys_group_user sgu ON sgu.user_id = tpi.check_user
                     LEFT JOIN sys_group sg ON sg.group_id = sgu.group_id
                     LEFT JOIN sys_dict sd1 ON sd1.dict_id = tpi.turn
                     LEFT JOIN sys_dict sd2 ON sd2.dict_id = tpi.reinforcement
                     LEFT JOIN sys_dict sd3 ON sd3.dict_id = tpi.grouting_holes
                     LEFT JOIN sys_dict sd4 ON sd4.dict_id = tpi.block_num
                     LEFT JOIN sys_mould sm ON sm.mould_id = tpi.mod_id
        WHERE
          tpi.check_result = 1
          AND sp.pro_id = #{proId}
          AND tpi.size= #{sizeId}
          AND tpi.check_time like concat(#{yearAndMonth},'%')
          AND sp.company_id=#{companyId}
    </select>
</mapper>