实现报告生成合并单元格；修复部分bug

value

2024-05-09 f8a3a9826738a397bdf4aff4ca7a5116344b5a0a

 inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java

@@ -1,6 +1,7 @@
package com.yuanchu.mom.mapper;

import com.yuanchu.mom.dto.FactoryDto;
import com.yuanchu.mom.dto.SampleTypeDto;
import com.yuanchu.mom.pojo.StandardMethodList;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
@@ -26,6 +27,13 @@

    List<StandardMethodList> getStandardMethodListBySample(String sampleType);

    List<StandardProductList> selectStandardProductListByTree(String tree, String sample, String model, String trees);

    List<StandardProductList> selectStandardProductListByTree2(String tree, String sample, String model, String trees);

    List<StandardProductList> selectStandardProductListByTree3(String tree, String sample, String model, String trees);

    List<SampleTypeDto> getStandardTree2();
}