From d652e069679ce7e267a0c09343de8ae42e92a437 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Fri, 22 Apr 2022 09:16:39 +0800
Subject: [PATCH] =?UTF-8?q?message:=20=E5=8A=A8=E5=8A=9B=E4=B8=BB=E8=BD=B4?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/PowerAxisLeaderDetailFormDTO.java     |  2 +-
 .../PowerAxisStructViewController.java         |  2 +-
 .../impl/PowerAxisLeaderServiceImpl.java       |  3 ++-
 .../mapper/poweraxis/PowerAxisLeaderDao.xml    | 18 ++++++++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisLeaderDetailFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisLeaderDetailFormDTO.java
index 26584e5..8d5e9d4 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisLeaderDetailFormDTO.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisLeaderDetailFormDTO.java
@@ -4,6 +4,6 @@ import lombok.Data;
 
 @Data
 public class PowerAxisLeaderDetailFormDTO {
-    private String agencyId;
+    private String axisStructId;
     private String leaderId;
 }
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java
index 23cd758..45e2b13 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java
@@ -38,6 +38,6 @@ public class PowerAxisStructViewController {
     @PostMapping("/leader")
     public Result getLeaderDetail(@RequestBody PowerAxisLeaderDetailFormDTO form){
         PowerAxisLeaderDetailResultDTO dto = powerAxisLeaderService.getLeaderDetail(form);
-        return new Result();
+        return new Result().ok(dto);
     }
 }
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java
index c260fff..0d205d2 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java
@@ -112,7 +112,8 @@ public class PowerAxisLeaderServiceImpl extends BaseServiceImpl<PowerAxisLeaderD
 
     @Override
     public PowerAxisLeaderDetailResultDTO getLeaderDetail(PowerAxisLeaderDetailFormDTO form) {
-        return null;
+        PowerAxisLeaderDetailResultDTO dto = baseDao.getLeaderDetail(form);
+        return dto;
     }
 
 
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml
index 4c190dc..c6953b0 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml
@@ -35,6 +35,24 @@
             </foreach>
         </where>
     </select>
+    <select id="getLeaderDetail"
+            resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisLeaderDetailResultDTO">
+        SELECT
+            NAME,
+            gender,
+            mobile,
+            INTERODUCTION,
+            ppat.CATEGORY_NAME,
+            AVATAR
+        FROM
+            pli_power_axis_leader AS ppal
+        LEFT JOIN
+            pli_power_axis_tag AS ppat
+        ON
+            ppal.CATEGORY_CODE = ppat.CATEGORY_CODE
+        WHERE
+	        ppal.id = #{leaderId}
+    </select>
 
 
 </mapper>
\ No newline at end of file