历史版本查看需要加软件

lxw

2022-08-27 706f912105b26e7b4506a76f11268eee25c6a619

历史版本查看需要加软件

 src/main/java/com/whyc/pojo/ProductBomHistory.java

@@ -60,6 +60,10 @@
    @ApiModelProperty(value = "关联的物料集合")
    private List<Material> materials;

    @TableField(exist = false)
    @ApiModelProperty(value = "关联的物料集合")
    private List<ProductSoftware> softwares;

    public Integer getId() {
        return id;
    }
@@ -227,4 +231,12 @@
    public void setMaterials(List<Material> materials) {
        this.materials = materials;
    }

    public List<ProductSoftware> getSoftwares() {
        return softwares;
    }

    public void setSoftwares(List<ProductSoftware> softwares) {
        this.softwares = softwares;
    }
}

 src/main/resources/mapper/ProductBomHistoryMapper.xml

@@ -31,6 +31,8 @@
        <result property="dwgUrl" column="dwg_url"></result>
        <collection property="materials" javaType="java.util.ArrayList" ofType="com.whyc.pojo.Material" column="{parentCode=parent_code,customCode=custom_code,subCode=sub_code,version=version}" select="selectMaterial">
        </collection>
        <collection property="softwares" javaType="java.util.ArrayList" ofType="com.whyc.pojo.ProductSoftware" column="{parentCode=parent_code}" select="selectSoftware">
        </collection>
    </resultMap>
    <select id="getBomHistoryAndMaterial" resultMap="BomHistoryList">
        select distinct tb_product_bom_history.*
@@ -58,6 +60,10 @@
          and tb_material_product_history.s_version&lt;=#{version}
          and tb_material_product_history.e_version>=#{version}
    </select>
    <select id="selectSoftware"  resultType="com.whyc.pojo.ProductSoftware">
        select DISTINCT tb_product_software.*  FROM db_doc.tb_product_software
        where ttb_product_software.parent_code=#{parentCode}
    </select>


</mapper>