Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

8 天以前 a3c54410de03f0fd242e1a1118d6471300cf1eda

 src/main/resources/mapper/basic/ProductModelMapper.xml

@@ -14,7 +14,16 @@
        <result column="product_name" property="productName" />
        <result column="product_id" property="productId" />
    </resultMap>
    <select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">

    <resultMap id="ProductModelVoResultMap" type="com.ruoyi.basic.vo.ProductModelVo" extends="BaseResultMap">
        <result column="create_time" property="createTime" />
        <collection property="batchNoList"
                    ofType="java.lang.String"
                    column="{productModelId=id}"
                    select="selectBatchNoListByProductModelId"/>
    </resultMap>

    <select id="listPageProductModel" resultMap="ProductModelVoResultMap">
        select pm.*,p.product_name
        from product_model pm
        left join product p on pm.product_id = p.id
@@ -25,8 +34,33 @@
            <if test="c.productName != null and c.productName != ''">
                and p.product_name  like  concat('%',#{c.productName},'%')
            </if>
            <if test="c.topProductParentId != null and c.topProductParentId > 0">
                and p.id in (
                    WITH RECURSIVE product_tree AS (
                        SELECT id
                        FROM product
                        WHERE id = #{c.topProductParentId}

                        UNION ALL

                        SELECT p.id
                        FROM product p
                        INNER JOIN product_tree pt ON p.parent_id = pt.id
                    )
                    select id from product_tree
                )
            </if>
        </where>
        order by  pm.id
    </select>

    <select id="selectBatchNoListByProductModelId" resultType="java.lang.String">
        select distinct si.batch_no
        from stock_inventory si
        where si.product_model_id = #{productModelId}
          and si.batch_no is not null
          and si.batch_no != ''
        order by si.batch_no
    </select>
    <select id="selectLatestRecord" resultType="com.ruoyi.basic.pojo.ProductModel">
            SELECT * FROM product_model
@@ -97,5 +131,14 @@

        ORDER BY pm.id DESC
    </select>
    <select id="getProductAndModelList" resultType="java.util.Map">
        select p.id as id,
               pm.id as modelId,
               p.product_name as productName ,
               pm.model as  model
        from product_model pm
        left join product p on p.id = pm.product_id
        order by p.id,pm.id desc
    </select>

</mapper>
</mapper>