Merge remote-tracking branch 'origin/master'

zss

2023-08-26 6984757bfc75b4a25014de1eb71c2aa75ebdb86f

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

@@ -37,6 +37,7 @@
        from lims_laboratory.product
        where state = 1
          and specifications_id = #{specificationsId}
        ORDER BY product.`create_time` DESC
          and version = #{version}
    </select>

@@ -70,4 +71,36 @@
        where state = 1
          and specifications_id = #{modelId}
    </select>

    <!--根据项目父类,型号id,版本查询二级详情-->
    <select id="selFath" resultMap="pageProductInformationMap">
        select id,
               name,
               father,
               unit,
               required,
               internal,
               version
        from lims_laboratory.product
        where state = 1
          and specifications_id = #{specificationId}
          and version = #{version}
          and father = #{exper}
    </select>

    <!--根据项目父类为空,项目名,型号id,版本查询-->
    <select id="selNam" resultType="java.util.Map">
        select id,
               name,
               unit,
               required,
               internal,
               version
        from lims_laboratory.product
        where state = 1
          and specifications_id = #{specificationId}
          and version = #{version}
          and name = #{exper}
          and father is null
    </select>
</mapper>