update

boxcost/api/report-produce-excel.go

@@ -106,7 +106,7 @@ func (b *ReportProduceExcel) drawSubTitles() error {
 	var drawLeft = func(rowIndex int, value string) error {
 		//左边1
 		left1Cell := fmt.Sprintf("A%d", rowIndex)
-		err = b.Excel.MergeCell(b.SheetName, left1Cell, fmt.Sprintf("E%d", rowIndex))
+		err = b.Excel.MergeCell(b.SheetName, left1Cell, fmt.Sprintf("I%d", rowIndex))
 		if err != nil {
 			return err
 		}
@@ -119,7 +119,7 @@ func (b *ReportProduceExcel) drawSubTitles() error {
 	}
 
 	var drawRight = func(rowIndex int, value string) error {
-		right1Cell := fmt.Sprintf("F%d", rowIndex)
+		right1Cell := fmt.Sprintf("J%d", rowIndex)
 		err = b.Excel.MergeCell(b.SheetName, right1Cell, fmt.Sprintf("L%d", rowIndex))
 		if err != nil {
 			return err
@@ -138,7 +138,7 @@ func (b *ReportProduceExcel) drawSubTitles() error {
 		drawLeft = func(rowIndex int, value string) error {
 			//左边1
 			left1Cell := fmt.Sprintf("A%d", rowIndex)
-			err = b.Excel.MergeCell(b.SheetName, left1Cell, fmt.Sprintf("E%d", rowIndex))
+			err = b.Excel.MergeCell(b.SheetName, left1Cell, fmt.Sprintf("F%d", rowIndex))
 			if err != nil {
 				return err
 			}
@@ -151,7 +151,7 @@ func (b *ReportProduceExcel) drawSubTitles() error {
 		}
 
 		drawRight = func(rowIndex int, value string) error {
-			right1Cell := fmt.Sprintf("F%d", rowIndex)
+			right1Cell := fmt.Sprintf("G%d", rowIndex)
 			err = b.Excel.MergeCell(b.SheetName, right1Cell, fmt.Sprintf("I%d", rowIndex))
 			if err != nil {
 				return err
@@ -163,6 +163,37 @@ func (b *ReportProduceExcel) drawSubTitles() error {
 			b.Excel.SetCellValue(b.SheetName, right1Cell, value)
 			return nil
 		}
+		if b.Content.IsLam {
+			drawLeft = func(rowIndex int, value string) error {
+				//左边1
+				left1Cell := fmt.Sprintf("A%d", rowIndex)
+				err = b.Excel.MergeCell(b.SheetName, left1Cell, fmt.Sprintf("H%d", rowIndex))
+				if err != nil {
+					return err
+				}
+				err = b.Excel.SetCellStyle(b.SheetName, left1Cell, left1Cell, styleLeft)
+				if err != nil {
+					return err
+				}
+				b.Excel.SetCellValue(b.SheetName, left1Cell, value)
+				return nil
+			}
+
+			drawRight = func(rowIndex int, value string) error {
+				right1Cell := fmt.Sprintf("I%d", rowIndex)
+				err = b.Excel.MergeCell(b.SheetName, right1Cell, fmt.Sprintf("K%d", rowIndex))
+				if err != nil {
+					return err
+				}
+				err = b.Excel.SetCellStyle(b.SheetName, right1Cell, right1Cell, styleRight)
+				if err != nil {
+					return err
+				}
+				b.Excel.SetCellValue(b.SheetName, right1Cell, value)
+				return nil
+			}
+
+		}
 
 	}