From b892b3d8c2a536b6c2f5f9b9e67e195779037665 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 15 十一月 2022 14:17:11 +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 |   41 +++++++++++++++++++++++++++++------------
 1 files changed, 29 insertions(+), 12 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..f26d570 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));
+        queryResults.setRegulations(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"1",null));
         return queryResults;
     }
 
@@ -190,6 +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.setOrganizationChartEntityList(organizationChartEntities);
         return recommendResult;
     }
@@ -315,14 +323,15 @@
             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 +340,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)) + "&nbsp; "
                         +new DataFormatter().formatCellValue( row.getCell(1)) + "&nbsp; "
-                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; ";
+                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; "
+                         +new DataFormatter().formatCellValue( row.getCell(3)) + "&nbsp; "
+                        + new DataFormatter().formatCellValue(row.getCell(4)) + "&nbsp; ";
                 acceptConditions = acceptConditions + "<br />";
                 i++;
             }
@@ -346,13 +357,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)) + "&nbsp; "
                         + new DataFormatter().formatCellValue(row.getCell(1)) + "&nbsp; "
-                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; ";
+                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; "
+                        +new DataFormatter().formatCellValue( row.getCell(3)) + "&nbsp; "
+                        + new DataFormatter().formatCellValue(row.getCell(4)) + "&nbsp; ";
                 rates = rates + "<br />";
                 i++;
             }
@@ -361,13 +374,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)) + "&nbsp; "
                         + new DataFormatter().formatCellValue(row.getCell(1)) + "&nbsp; "
-                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; ";
+                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; "
+                        +new DataFormatter().formatCellValue( row.getCell(3)) + "&nbsp; "
+                        + new DataFormatter().formatCellValue(row.getCell(4)) + "&nbsp; ";
                 transactionArea = transactionArea + "<br />";
                 i++;
             }
@@ -376,13 +391,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)) + "&nbsp; "
                         + new DataFormatter().formatCellValue(row.getCell(1)) + "&nbsp; "
-                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; ";
+                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; "
+                        +new DataFormatter().formatCellValue( row.getCell(3)) + "&nbsp; "
+                        + new DataFormatter().formatCellValue(row.getCell(4)) + "&nbsp; ";
                 handlingProcedures = handlingProcedures + "<br />";
                 i++;
             }

--
Gitblit v1.7.1