From 79c55c8c2c789c5caca11e2d258bb1d25514fcff Mon Sep 17 00:00:00 2001
From: zhouhaibin <zhouhaibin@qq.com>
Date: Thu, 28 Nov 2024 15:15:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 easy-api/pom.xml                              | 64 +++++++++----------
 .../impl/HuzhouProjectinfoServiceImpl.java    |  2 +-
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/easy-api/pom.xml b/easy-api/pom.xml
index 5efe217..85629e9 100644
--- a/easy-api/pom.xml
+++ b/easy-api/pom.xml
@@ -89,39 +89,39 @@
                     </dependency>
                 </dependencies>
             </plugin>
-<!--            <plugin>-->
-<!--                &lt;!&ndash; https://gitee.com/roseboy/classfinal &ndash;&gt;-->
-<!--&lt;!&ndash;                <groupId>cn.ywyu</groupId>&ndash;&gt;-->
-<!--&lt;!&ndash;                <artifactId>classfinal-maven-plugin</artifactId>&ndash;&gt;-->
-<!--&lt;!&ndash;                <version>1.3.2</version>&ndash;&gt;-->
-<!--                <groupId>com.gitee.lcm742320521</groupId>-->
+            <plugin>
+                <!-- https://gitee.com/roseboy/classfinal -->
+<!--                <groupId>cn.ywyu</groupId>-->
 <!--                <artifactId>classfinal-maven-plugin</artifactId>-->
-<!--                <version>1.4.1</version>-->
-<!--                <configuration>-->
-<!--                    &lt;!&ndash;加密密码，如果是#号，则使用无密码模式加密，【加密后没有pom文件，不用担心泄漏】&ndash;&gt;-->
-<!--                    <password>123456</password>-->
-<!--                    &lt;!&ndash;加密的包名(可为空,多个用","分割)&ndash;&gt;-->
-<!--                    <packages>com.easy.admin</packages>-->
-<!--                    &lt;!&ndash;需要加密的配置文件，一般是classes目录下的yml或properties文件(可为空,多个用","分割)&ndash;&gt;-->
-<!--                    <cfgfiles>*.properties,*.yml,com/easy/admin/**/mapping/*.xml</cfgfiles>-->
-<!--                    &lt;!&ndash;外部依赖的jar目录，例如/tomcat/lib(可为空,多个用","分割)&ndash;&gt;-->
-<!--                    &lt;!&ndash;<classpath></classpath>&ndash;&gt;-->
-<!--                    <libjars>huzhou-1.1.0.jar</libjars> &lt;!&ndash;jar/war包lib下要加密jar文件名(可为空,多个用","分割)&ndash;&gt;-->
-<!--                    &lt;!&ndash;<cfgpasspath>/etc/.env</cfgpasspath>&ndash;&gt;         &lt;!&ndash;密码文件路径，可为空，默认 /etc/.env&ndash;&gt;-->
-<!--                    &lt;!&ndash;<excludes>com.Test</excludes>&ndash;&gt;                &lt;!&ndash;排除不需要加密的文件&ndash;&gt;-->
-<!--                    &lt;!&ndash;<classpath></classpath>&ndash;&gt;                      &lt;!&ndash;外部依赖jarlib&ndash;&gt;-->
-<!--                    &lt;!&ndash;<debug>true</debug>&ndash;&gt;                          &lt;!&ndash;调试模式，打印debug日志&ndash;&gt;-->
-<!--                    <code>7E38231D00D8427BB1E463E0BD7375EDD41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E</code>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>classFinal</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
+<!--                <version>1.3.2</version>-->
+                <groupId>com.gitee.lcm742320521</groupId>
+                <artifactId>classfinal-maven-plugin</artifactId>
+                <version>1.4.1</version>
+                <configuration>
+                    <!--加密密码，如果是#号，则使用无密码模式加密，【加密后没有pom文件，不用担心泄漏】-->
+                    <password>123456</password>
+                    <!--加密的包名(可为空,多个用","分割)-->
+                    <packages>com.easy.admin</packages>
+                    <!--需要加密的配置文件，一般是classes目录下的yml或properties文件(可为空,多个用","分割)-->
+                    <cfgfiles>*.properties,*.yml,com/easy/admin/**/mapping/*.xml</cfgfiles>
+                    <!--外部依赖的jar目录，例如/tomcat/lib(可为空,多个用","分割)-->
+                    <!--<classpath></classpath>-->
+                    <libjars>huzhou-1.1.0.jar</libjars> <!--jar/war包lib下要加密jar文件名(可为空,多个用","分割)-->
+                    <!--<cfgpasspath>/etc/.env</cfgpasspath>-->         <!--密码文件路径，可为空，默认 /etc/.env-->
+                    <!--<excludes>com.Test</excludes>-->                <!--排除不需要加密的文件-->
+                    <!--<classpath></classpath>-->                      <!--外部依赖jarlib-->
+                    <!--<debug>true</debug>-->                          <!--调试模式，打印debug日志-->
+                    <code>7E38231D00D8427BB1E463E0BD7375EDD41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E</code>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>classFinal</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
index 2ff42cd..c98ddce 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
@@ -1530,7 +1530,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
 
             // 分组
             Map<String, List<ProjectSummaryOV>> groupedRecords = new HashMap<>();
-            groupedRecords.put("市委建委", records.stream().filter(r -> shiweiJianwei.contains(r.getDutyWorkplace())).collect(Collectors.toList()));
+            groupedRecords.put("市卫健委", records.stream().filter(r -> shiweiJianwei.contains(r.getDutyWorkplace())).collect(Collectors.toList()));
             groupedRecords.put("市级医院", records.stream().filter(r -> shijiYiyuan.contains(r.getDutyWorkplace())).collect(Collectors.toList()));
             groupedRecords.put("区县", records.stream().filter(r -> quxian.contains(r.getDutyWorkplace())).collect(Collectors.toList()));