Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-27 c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf

 standard-server/src/main/resources/mapper/MaterialMapper.xml

@@ -2,15 +2,15 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.MaterialMapper">

    <select id="selectMaterialLimit" resultType="com.yuanchu.limslaboratory.pojo.Material">
    <select id="selectMaterialLimit" resultType="Map">
        select id, name
        from material
        from lims_laboratory.material
        where state = 1
        and type = #{type}
        order by create_time desc
            limit #{num1},#{num2}
    </select>
    <select id="selectMaterialById" resultType="java.util.Map">
    <select id="selectMaterialById" resultType="Map">
        select m.id,
               m.num,
               m.supplier,
@@ -23,10 +23,11 @@
               s.cross_section              crossSection,
               s.number_of_cores            numberOfCores,
               s.instruct
        from material m,
             specifications s,
             serial_number sn
        from lims_laboratory.material m,
             lims_laboratory.specifications s,
             lims_laboratory.serial_number sn
        where m.specifications_id = s.id
          and s.serial_id = sn.id
        and m.id=#{materialId}
    </select>
</mapper>