From dcfefd27cbe6184f9eac53c45cf6963fa9bedd03 Mon Sep 17 00:00:00 2001
From: uu <1197651512@qq.com>
Date: Sat, 22 Jun 2024 00:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=A3=E4=BB=BB=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E3=80=81=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/HuzhouProjectController.java      | 10 ++++++++++
 .../service/IHuzhouProjectinfoService.java       |  4 ++++
 .../impl/HuzhouProjectinfoServiceImpl.java       | 16 ++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java
index 0787f50..115a292 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java
@@ -254,5 +254,15 @@ public class HuzhouProjectController {
         return Result.ok(result);
 
     }
+    @GetMapping("/getDutyWorkplaceList")
+    public Result<?> getDutyWorkplaceList(){
+        List<String> result = projectinfoService.getDutyWorkplaceList();
+        return Result.ok(result);
+    }
+    @GetMapping("/getadminDivisionList")
+    public Result<?> getAdminDivisionList(){
+        List<String> result = projectinfoService.getDutyWorkplaceList();
+        return Result.ok(result);
+    }
 
 }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java
index 2ffd471..cc1ad9d 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java
@@ -177,5 +177,9 @@ public interface IHuzhouProjectinfoService extends IService<HuzhouProjectinfo> {
 
     CountBoardOV showCountBoard();
 
+    List<String> getDutyWorkplaceList();
+    List<String> getAdminDivisionList();
+
+
 }
 
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 91916ea..4438c3d 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
@@ -1151,6 +1151,22 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
 
     }
 
+    @Override
+    public List<String> getDutyWorkplaceList() {
+        HuzhouProjectinfo info = new HuzhouProjectinfo();
+        List<HuzhouProjectinfoOV> infoList = projectinfoMapper.getProjectAndChildInfoPageList(info);
+        List<String> result = infoList.stream().map(x -> x.getDutyWorkplace()).collect(Collectors.toList());
+        return result;
+    }
+
+    @Override
+    public List<String> getAdminDivisionList() {
+        HuzhouProjectinfo info = new HuzhouProjectinfo();
+        List<HuzhouProjectinfoOV> infoList = projectinfoMapper.getProjectAndChildInfoPageList(info);
+        List<String> result = infoList.stream().map(x -> x.getAdminDivision()).collect(Collectors.toList());
+        return result;
+    }
+
     public TotalProgressOV countNumByPlan(List<String> projectIds) {
 
         List<String> planName = new ArrayList<>();