From 8fc78597cd3ebbeeef42558232976ac02d5fa86d Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Sun, 24 Apr 2022 19:41:23 +0800
Subject: [PATCH] =?UTF-8?q?message:=20=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/axis/dao/PowerAxisStructDao.java  |  4 ++--
 .../axis/service/PowerAxisLeaderService.java  | 10 +++++++++
 .../service/PowerAxisStructLeaderService.java |  5 +++++
 .../axis/service/PowerAxisStructService.java  | 21 +++++++++++++++++++
 .../impl/PowerAxisStructServiceImpl.java      |  4 ++--
 5 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java
index 875d679..1f53238 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java
@@ -107,8 +107,8 @@ public interface PowerAxisStructDao extends BaseDao<PowerAxisStructEntity> {
      * 查询cateGoryCode
      *
      * @param customerId
- * @param level
- * @param tagCateGory
+     * @param level
+     * @param tagCateGory
      * @return java.lang.String
      * @author LZN
      * @date 2022/4/24 19:29
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java
index 7a71334..ebf4dec 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java
@@ -81,11 +81,21 @@ public interface PowerAxisLeaderService extends BaseService<PowerAxisLeaderEntit
 
     /**
      * 根据动力主轴id列表获取人员信息
+     *
+     * @param ids
+     * @return java.util.List<com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO>
+     * @author LZN
+     * @date 2022/4/24 19:38
      */
     List<PowerAxisSimpleListDTO> getSimpleList(List<String> ids);
 
     /**
      * 动力主轴负责人详细信息
+     *
+     * @param form
+     * @return com.epmet.plugin.power.dto.axis.result.PowerAxisLeaderDetailResultDTO
+     * @author LZN
+     * @date 2022/4/24 19:38
      */
     PowerAxisLeaderDetailResultDTO getLeaderDetail(PowerAxisLeaderDetailFormDTO form);
 }
\ No newline at end of file
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java
index 680fb08..4bf5a11 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java
@@ -82,6 +82,11 @@ public interface PowerAxisStructLeaderService extends BaseService<PowerAxisStruc
 
     /**
      * 查询节点负责人信息
+     *
+     * @param axisStructId
+     * @return com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO
+     * @author LZN
+     * @date 2022/4/24 19:39
      */
     PowerAxisSLeaderResultDTO queryLeaderDetailById(String axisStructId);
 
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java
index d1910a7..84d2489 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java
@@ -103,22 +103,43 @@ public interface PowerAxisStructService extends BaseService<PowerAxisStructEntit
 
     /**
      * 根据id查询修改表单数据
+     *
+     * @param id
+     * @return com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity
+     * @author LZN
+     * @date 2022/4/24 19:39
      */
     PowerAxisStructEntity queryModifyById(String id);
 
 
     /**
      * 根据agencyId获取id列表
+     *
+     * @param agencyId
+     * @return java.util.List<java.lang.String>
+     * @author LZN
+     * @date 2022/4/24 19:39
      */
     List<String> getIdByAgencyId(String agencyId);
 
     /**
+     *
      * 关键指标统计
+     *
+     * @param form
+     * @return com.epmet.plugin.power.dto.axis.result.PowerAxisStructViewResultDTO
+     * @author LZN
+     * @date 2022/4/24 19:40
      */
     PowerAxisStructViewResultDTO getStatistics(PowerAxisStructViewFormDTO form);
 
     /**
      * 树结构
+     *
+     * @param form
+     * @return java.util.List<com.epmet.plugin.power.dto.axis.result.PowerAxisStructTreeResultDTO>
+     * @author LZN
+     * @date 2022/4/24 19:40
      */
     List<PowerAxisStructTreeResultDTO> getStructTree(PowerAxisStructStructTreeFormDTO form);
 
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
index 6998094..c93c012 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
@@ -229,12 +229,12 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
     public PowerAxisStructViewResultDTO getStatistics(PowerAxisStructViewFormDTO form) {
         form.setCustomerId(loginUserUtil.getLoginUserCustomerId());
 
-        String gridCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(),PowerTagLevelEnum.CHILD_FIRST.level(),PowerTagCategoryEnum.STRUCT.category());
         // 查网格党支部数 grid_party
+        String gridCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(),PowerTagLevelEnum.CHILD_FIRST.level(),PowerTagCategoryEnum.STRUCT.category());
         int gridParty = baseDao.queryGridParty(form,gridCateGoryCode);
 
-        String groupCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(),PowerTagLevelEnum.CHILD_SECOND.level(),PowerTagCategoryEnum.STRUCT.category());
         // 查楼院党小组数 group_party
+        String groupCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(),PowerTagLevelEnum.CHILD_SECOND.level(),PowerTagCategoryEnum.STRUCT.category());
         int groupParty = baseDao.queryGroupParty(form,groupCateGoryCode);
         // 查询党员数
         int partyNum = 0;