mitao
2025-03-14 08f1b1f1804a8bd833d42f257908d80e88387b55
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
@@ -300,10 +300,14 @@
        // 获取excel的sheet页数
        int numberOfSheets = wb.getNumberOfSheets();
        for (int j = 0; j < numberOfSheets; j++) {
            int i = 2;
            //获取excel字段名称进行比较
            Sheet sheetAt = wb.getSheetAt(j);
            if(sheetAt.getRow(2)!=null){
            Row row1 = sheetAt.getRow(2);
            if (new DataFormatter().formatCellValue(sheetAt.getRow(1).getCell(1)).length()>=3){
                i--;
            }
            Row row1 = sheetAt.getRow(i);
            TransactionEvent transactionEvent = baseMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getMatterName, new DataFormatter().formatCellValue(row1.getCell(1))));
            boolean isAdd = false;
            if (transactionEvent == null) {
@@ -311,15 +315,15 @@
                isAdd = true;
            }
            transactionEvent.setMatterName(new DataFormatter().formatCellValue(row1.getCell(1)));
            Row row2 = sheetAt.getRow(3);
            Row row2 = sheetAt.getRow(i+1);
            transactionEvent.setSetGist("<p>" + new DataFormatter().formatCellValue(row2.getCell(1)) + "</p>");
            Row row3 = sheetAt.getRow(4);
            Row row4 = sheetAt.getRow(5);
            Row row3 = sheetAt.getRow(i+2);
            Row row4 = sheetAt.getRow(i+3);
            transactionEvent.setBasicInformation("<p> 事项名称:" + new DataFormatter().formatCellValue(row1.getCell(1)) + "<br />"
                    + new DataFormatter().formatCellValue(row3.getCell(0)) + ":" + new DataFormatter().formatCellValue(row3.getCell(1))+ "<br />"
                    + new DataFormatter().formatCellValue(row3.getCell(3)) + ":" + new DataFormatter().formatCellValue(row3.getCell(4)) + "<br />"
                    + new DataFormatter().formatCellValue(row4.getCell(0)) + ":" + new DataFormatter().formatCellValue(row4.getCell(1)) + "</p>");
            int i = 7;
             i = i+5;
            String applicationMaterial = "<p>";
            while (true) {
                Row row = sheetAt.getRow(i);