lxw
2022-08-19 25dbf810498c07dcea8cb83d4bafefad0f29bfb8
product/downloadProductHistory 历史产品下载(产品id和版本<下载的版本>)
4个文件已修改
27 ■■■■ 已修改文件
src/main/java/com/whyc/controller/ProductController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/ProductBomHistoryService.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ProductBomHistoryMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ProductBomMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/ProductController.java
@@ -64,4 +64,9 @@
    public void downloadProductHistory(HttpServletRequest req, HttpServletResponse resp, @RequestParam int productId, @RequestParam int version){
        bomHistoryService.downloadProductHistory(req,resp,productId,version);
    }
    @ApiOperation(value = "测试",notes = "8.17修改后使用")
    @GetMapping("getBomHistoryAndMaterial")
    public Response getBomHistoryAndMaterial( @RequestParam int productId, @RequestParam int version){
        return bomHistoryService.getBomHistoryAndMaterial(productId,version);
    }
}
src/main/java/com/whyc/service/ProductBomHistoryService.java
@@ -116,7 +116,7 @@
        font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
        cellStyle.setFont(font);
        //生成excel并将dwg文件放在同一报下压缩
        creatBomHsitoryExcel(req,resp,pHistory,list,wb);
        creatBomHsitoryExcel(req,resp,pHistory,endList,wb);
        //记录日志
        DocUser docUser= ActionUtil.getUser();
        String operationDetail="具体产品为:"+pHistory.toString();
@@ -283,4 +283,10 @@
        bomHis.setCreateDate(m.getCreateDate());
        return  bomHis;
    }
    //测试
    public Response getBomHistoryAndMaterial(int productId, int version) {
        //读取指定版本产品的子件和关联的物料信息
        List<ProductBomHistory> list=mapper.getBomHistoryAndMaterial(productId,version);
        return new Response().setII(1,true,list,"");
    }
}
src/main/resources/mapper/ProductBomHistoryMapper.xml
@@ -9,7 +9,7 @@
        </foreach>
    </update>
    <resultMap id="MaterialList" type="productBomHistory">
    <resultMap id="BomHistoryList" type="productBomHistory">
        <id property="id" column="id"></id>
        <result property="type" column="type"></result>
        <result property="category" column="category"></result>
@@ -32,7 +32,7 @@
        <collection property="materials" javaType="java.util.ArrayList" ofType="com.whyc.pojo.Material" column="{productId=product_id,subCode=sub_code,version=version}" select="selectMaterial">
        </collection>
    </resultMap>
    <select id="getBomHistoryAndMaterial" resultType="com.whyc.pojo.ProductBomHistory">
    <select id="getBomHistoryAndMaterial" resultMap="BomHistoryList">
        select distinct *  from  db_doc.tb_product_bom_history
        <where>
            product_id = #{productId}
@@ -45,7 +45,7 @@
        select DISTINCT tb_Material.*  FROM db_doc.tb_Material,db_doc.tb_Material_product_history
        where tb_Material.id=tb_Material_product_history.Material_id
        and tb_Material_product_history.product_id=#{productId}
          and tb_Material_product_history.sub_code=#{subCode}
        and tb_Material_product_history.sub_code=#{subCode}
        and tb_Material_product_history.version=#{version}
    </select>
src/main/resources/mapper/ProductBomMapper.xml
@@ -146,8 +146,10 @@
        order by id asc
    </select>
    <select id="selectMaterial"  resultType="com.whyc.pojo.Material">
        select DISTINCT tb_Material.*  FROM db_doc.tb_Material,db_doc.tb_Material_product_history where tb_Material.id=tb_Material_product_history.Material_id
                and tb_Material_product_history.product_id=#{productId} and tb_Material_product_history.sub_code=#{subCode}
                and tb_Material_product_history.version=#{version}
        select DISTINCT tb_Material.*  FROM db_doc.tb_Material,db_doc.tb_Material_product_history
        where tb_Material.id=tb_Material_product_history.Material_id
        and tb_Material_product_history.product_id=#{productId}
        and tb_Material_product_history.sub_code=#{subCode}
        and tb_Material_product_history.version=#{version}
    </select>
</mapper>