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

云

10 天以前 35f74c2abd95e6913180fbccd864915486eecc48

 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
@@ -44,6 +53,15 @@
        </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
            ORDER BY create_time DESC, id DESC