From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 55 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 17 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 9976d5d..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
@@ -45,6 +45,10 @@
@Resource
private GuideRepairOrderMapper guideRepairOrderMapper;
+
+ @Resource
+ private AutomessagePolicyDocumentsMapper automessagePolicyDocumentsMapper;
+
@Override
public TransactionEvent selectConfigData(String Id, SysUser sysUser) {
TransactionEvent transactionEvent = baseMapper.selectConfigData(Id);
@@ -157,6 +161,8 @@
}
queryResults.setTransactionEventList(searchesAssociate);
queryResults.setKeywordEntityList(keywordMapper.selectByName(keyWord));
+ queryResults.setAutomessagePolicyDocuments(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"2",null,null));
+ queryResults.setRegulations(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"1",null,null));
return queryResults;
}
@@ -190,6 +196,8 @@
}
recommendResult.setKeywordEntityList(keywordEntityList);
List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByKeyWord(keyWord);
+ recommendResult.setAutomessagePolicyDocuments(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"2",null,null));
+ recommendResult.setRegulations(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"1",null,null));
recommendResult.setOrganizationChartEntityList(organizationChartEntities);
return recommendResult;
}
@@ -292,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) {
@@ -303,26 +315,27 @@
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);
- if (row.getCell(0).getStringCellValue().equals("办理途径、条件和注意事项")) {
+ if (new DataFormatter().formatCellValue(row.getCell(0)).equals("办理途径、条件和注意事项")) {
i = i + 2;
break;
}
applicationMaterial = applicationMaterial + "办理区域：" + new DataFormatter().formatCellValue(row.getCell(0)) + "<br />"
- + "咨询电话：" + new DataFormatter().formatCellValue(row.getCell(1)) + "<br />"
- + "办公地址：" + new DataFormatter().formatCellValue(row.getCell(2)) + "<br />"
- + "办公时间：" + new DataFormatter().formatCellValue(row.getCell(3)) + "<br />";
+ + "部门名称：" + new DataFormatter().formatCellValue(row.getCell(1)) + "<br />"
+ + "咨询电话：" + new DataFormatter().formatCellValue(row.getCell(2)) + "<br />"
+ + "办公地址：" + new DataFormatter().formatCellValue(row.getCell(3)) + "<br />"
+ + "办公时间：" + new DataFormatter().formatCellValue(row.getCell(4)) + "<br />";
applicationMaterial = applicationMaterial + "<br />";
i++;
}
@@ -331,13 +344,15 @@
String acceptConditions = "<p>";
while (true) {
Row row = sheetAt.getRow(i);
- if (row.getCell(0).getStringCellValue().equals("（二）网上申报")) {
+ if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（二）网上申报")) {
i = i + 1;
break;
}
acceptConditions = acceptConditions + new DataFormatter().formatCellValue(row.getCell(0)) + " "
+new DataFormatter().formatCellValue( row.getCell(1)) + " "
- + new DataFormatter().formatCellValue(row.getCell(2)) + " ";
+ + new DataFormatter().formatCellValue(row.getCell(2)) + " "
+ +new DataFormatter().formatCellValue( row.getCell(3)) + " "
+ + new DataFormatter().formatCellValue(row.getCell(4)) + " ";
acceptConditions = acceptConditions + "<br />";
i++;
}
@@ -346,13 +361,15 @@
String rates = "<p>";
while (true) {
Row row = sheetAt.getRow(i);
- if (row.getCell(0).getStringCellValue().equals("（三）手机移动申报")) {
+ if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（三）手机移动申报")) {
i = i + 1;
break;
}
rates = rates + new DataFormatter().formatCellValue(row.getCell(0)) + " "
+ new DataFormatter().formatCellValue(row.getCell(1)) + " "
- + new DataFormatter().formatCellValue(row.getCell(2)) + " ";
+ + new DataFormatter().formatCellValue(row.getCell(2)) + " "
+ +new DataFormatter().formatCellValue( row.getCell(3)) + " "
+ + new DataFormatter().formatCellValue(row.getCell(4)) + " ";
rates = rates + "<br />";
i++;
}
@@ -361,13 +378,15 @@
String transactionArea = "<p>";
while (true) {
Row row = sheetAt.getRow(i);
- if (row.getCell(0).getStringCellValue().equals("（四）经营许可（备案）事项程序运行图谱（附电子版）")) {
+ if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（四）经营许可（备案）事项程序运行图谱（附电子版）")) {
i = i + 1;
break;
}
transactionArea = transactionArea + new DataFormatter().formatCellValue(row.getCell(0)) + " "
+ new DataFormatter().formatCellValue(row.getCell(1)) + " "
- + new DataFormatter().formatCellValue(row.getCell(2)) + " ";
+ + new DataFormatter().formatCellValue(row.getCell(2)) + " "
+ +new DataFormatter().formatCellValue( row.getCell(3)) + " "
+ + new DataFormatter().formatCellValue(row.getCell(4)) + " ";
transactionArea = transactionArea + "<br />";
i++;
}
@@ -376,13 +395,15 @@
String handlingProcedures = "<p>";
while (true) {
Row row = sheetAt.getRow(i);
- if (row.getCell(0).getStringCellValue().equals("（五）经营许可（备案）事项实施内容一览表（附电子版）")) {
+ if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（五）经营许可（备案）事项实施内容一览表（附电子版）")) {
i = i + 1;
break;
}
handlingProcedures = handlingProcedures + new DataFormatter().formatCellValue(row.getCell(0)) + " "
+ new DataFormatter().formatCellValue(row.getCell(1)) + " "
- + new DataFormatter().formatCellValue(row.getCell(2)) + " ";
+ + new DataFormatter().formatCellValue(row.getCell(2)) + " "
+ +new DataFormatter().formatCellValue( row.getCell(3)) + " "
+ + new DataFormatter().formatCellValue(row.getCell(4)) + " ";
handlingProcedures = handlingProcedures + "<br />";
i++;
}
--
Gitblit v1.7.1