From c1d1c4dd78ea55a4a364b761826470212f79bdb0 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 08 十二月 2022 09:37:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
index f26d570..d235426 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
@@ -161,8 +161,8 @@
}
queryResults.setTransactionEventList(searchesAssociate);
queryResults.setKeywordEntityList(keywordMapper.selectByName(keyWord));
- queryResults.setAutomessagePolicyDocuments(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"2",null));
- queryResults.setRegulations(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"1",null));
+ queryResults.setAutomessagePolicyDocuments(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"2",null,null));
+ queryResults.setRegulations(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"1",null,null));
return queryResults;
}
@@ -196,8 +196,8 @@
}
recommendResult.setKeywordEntityList(keywordEntityList);
List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByKeyWord(keyWord);
- recommendResult.setAutomessagePolicyDocuments(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"2",null));
- recommendResult.setRegulations(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"1",null));
+ recommendResult.setAutomessagePolicyDocuments(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"2",null,null));
+ recommendResult.setRegulations(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"1",null,null));
recommendResult.setOrganizationChartEntityList(organizationChartEntities);
return recommendResult;
}
@@ -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);
--
Gitblit v1.7.1