添加单票分析查询数据重复问题

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -621,7 +621,7 @@ public class ExcelUtil<T>
             Cell cell;// 单元格
             String colString;//长度转成ABC后的列
             String sumString;//求和公式
-            Integer[] line = {4, 5, 7, 8, 9, 10};
+            Integer[] line = {3, 4, 6, 7, 8, 9};
             cell = row.createCell(0);// 创建单元格
             cell.setCellValue("合计：");
             int totalRows = sheet.getPhysicalNumberOfRows();
@@ -630,7 +630,7 @@ public class ExcelUtil<T>
                 cell.setCellStyle(styles.get("total"));// 设置单元格样式
                 colString = CellReference.convertNumToColString(l);  //长度转成ABC列
                 //求和公式 求i9至i12单元格的总和
-                if (l == 5 || l == 8) {
+                if (l == 4 || l == 7) {
                     sumString = "SUM(" + colString + "2:" + colString + (totalRows-1) + ") / 1000";
                 } else {
                     sumString = "SUM(" + colString + "2:" + colString + (totalRows-1) + ")";
@@ -729,7 +729,7 @@ public class ExcelUtil<T>
             Cell cell;// 单元格
             String colString;//长度转成ABC后的列
             String sumString;//求和公式
-            Integer[] line = {4, 6};
+            Integer[] line = {3, 5};
             cell = row.createCell(0);// 创建单元格
             cell.setCellValue("合计：");
             int totalRows = sheet.getPhysicalNumberOfRows();

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/domain/SingleAnalysisExcel.java

@@ -22,7 +22,6 @@ public class SingleAnalysisExcel {
     private String goodsName;
 
     /** 序号 */
-    @Excel(name = "序号")
     private Integer lineNo;
 
     /** 作业类型 */

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/domain/SingleAnalysisFeesExcel.java

@@ -8,7 +8,6 @@ import java.util.Date;
 
 public class SingleAnalysisFeesExcel {
     /** 序号 */
-    @Excel(name = "序号")
     private Integer lineNo;
 
     /** 日期 */

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -1828,6 +1828,7 @@
     <select id="selectSingleAnalysisFees" parameterType="com.ruoyi.reportManagement.domain.SingleAnalysisFeesExcel" resultType="com.ruoyi.reportManagement.domain.SingleAnalysisFeesExcel">
         SELECT
         DISTINCT
+            f.f_id,
             date_format( f.create_time, '%Y-%m-%d' ) createTime,
             d.dict_label fBusinessType,
             fee.f_name fFeeid,