1. 巡查汇总报告功能编写基本完成

feiyu02

2022-07-19 b041775dae4438e428d2b70d2b22cfe8c49844fe

 src/main/kotlin/cn/flightfeather/supervision/common/utils/ExcelUtil.kt

@@ -181,11 +181,11 @@
    /**
     * 自动处理行合并数据
     */
    fun write2(out: OutputStream, heads: List<Array<Any>>, contents: MutableList<Array<Any>>) {
    fun write2(out: OutputStream, heads: List<Array<Any>>, contents: MutableList<Array<Any>>, sheetName: String = "sheet1") {

        val workbook = HSSFWorkbook()

        write(heads, contents, workbook)
        write(heads, contents, workbook, sheetName)

        workbook.write(out)
        workbook.close()
@@ -193,6 +193,10 @@
        out.close()
    }

    fun write3() {

    }

    private fun getMaxRows(rowArray: Array<Any>): Int {
        var maxRows = 1
        rowArray.forEach {