Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-21 dd571bf55de7f9a72d458adc179958ed2f9473c0

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

@@ -1,17 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.ProductMapper">
    <select id="selectProductByMaterialId" resultType="Product">
        select id, name, method, father, unit, required, internal
        from product
        where material_id = #{material_id}
        and state = 1
    <select id="selectProductByMaterialId" resultType="Map">
        select p.name, unit, required, internal
        from lims_laboratory.product p,
             lims_laboratory.specifications sp,
             lims_laboratory.standard st
        where specifications_id = sp.id
          and standard_id = st.id
          and material_id = #{materialId}
    </select>

    <select id="getProductInformation" parameterType="integer" resultType="map">
        SELECT p.method, ifnull(null, p.father) projectClassification, p.user_id, date_format(p.update_time, '%Y-%m-%d %H:%i:%s') updateTime,
               p.unit, p.required, p.internal
        FROM product p
        where p.id = #{productId}
    <!--展示该型号下的检验项目要求-->
    <select id="pageProductInformation" resultType="java.util.Map">
        select id,
               name,
               father,
               unit,
               required,
               internal
        from lims_laboratory.product
        where state = 1
          and specifications_id = #{specificationsId}
    </select>
</mapper>