Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-09 4ad61e4c257621124625a89853eaa8334a11b0be

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

@@ -12,7 +12,7 @@

    <!--右侧数据展示 工艺路线-->
    <resultMap id="selectAllTecMap" type="map">
        <id property="name" column="father"/>
        <id property="father" column="father"/>
        <collection property="children" resultMap="selectAllTecMaps" javaType="List"/>
    </resultMap>
    <resultMap id="selectAllTecMaps" type="map">
@@ -61,6 +61,16 @@
        where state = 1
          and specifications_id = #{specificationsId}
    </select>
    <!--查询该型号工艺下最新版本的工艺id-->
    <select id="selTech" resultType="java.lang.Integer">
        select id
        from mom_ocean.technology
        where state = 1
          and father = #{techfather}
          and name = #{techname}
          and specifications_id = #{specificationId}
          and version = #{version}
    </select>

    <!--批量删除-->
    <update id="delAllTech">