message:

新增，修改，查询节点负责人，查询节点负责人列表，按节点类型获取节点列表

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructListByCategoryCodeFormDTO.java

@@ -0,0 +1,9 @@
+package com.epmet.plugin.power.dto.axis.form;
+
+import lombok.Data;
+
+@Data
+public class PowerAxisStructListByCategoryCodeFormDTO {
+    private String agencyId;
+    private String categoryCode;
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAixsStructListByCategoryResultDTO.java

@@ -0,0 +1,9 @@
+package com.epmet.plugin.power.dto.axis.result;
+
+import lombok.Data;
+
+@Data
+public class PowerAixsStructListByCategoryResultDTO {
+    private String id;
+    private String name;
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSLeaderResultDTO.java

@@ -0,0 +1,12 @@
+package com.epmet.plugin.power.dto.axis.result;
+
+import lombok.Data;
+
+@Data
+public class PowerAxisSLeaderResultDTO {
+    private String name;
+    private String gender;
+    private String mobile;
+    private String interoduction;
+    private String avatar;
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSimpleListDTO.java

@@ -0,0 +1,10 @@
+package com.epmet.plugin.power.dto.axis.result;
+
+import lombok.Data;
+
+@Data
+public class PowerAxisSimpleListDTO {
+    private String id;
+    private String name;
+    private String mobile;
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisLeaderController.java

@@ -10,8 +10,14 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.plugin.power.dto.axis.PowerAxisLeaderDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO;
+import com.epmet.plugin.power.modules.axis.dao.PowerAxisStructLeaderDao;
 import com.epmet.plugin.power.modules.axis.excel.PowerAxisLeaderExcel;
 import com.epmet.plugin.power.modules.axis.service.PowerAxisLeaderService;
+import com.epmet.plugin.power.modules.axis.service.PowerAxisStructLeaderService;
+import com.epmet.plugin.power.modules.axis.service.PowerAxisStructService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,6 +39,12 @@ public class PowerAxisLeaderController {
     @Autowired
     private PowerAxisLeaderService powerAxisLeaderService;
 
+    @Autowired
+    private PowerAxisStructLeaderService powerAxisStructLeaderService;
+
+    @Autowired
+    private PowerAxisStructService powerAxisStructService;
+
     @RequestMapping("page")
     public Result<PageData<PowerAxisLeaderDTO>> page(@RequestParam Map<String, Object> params){
         PageData<PowerAxisLeaderDTO> page = powerAxisLeaderService.page(params);
@@ -77,6 +89,23 @@ public class PowerAxisLeaderController {
         ExcelUtils.exportExcelToTarget(response, null, list, PowerAxisLeaderExcel.class);
     }
 
-    
+    /**
+     * 查询节点负责人信息
+     */
+    @PostMapping("/getLeaderDetail/{axisStructId}")
+    public Result getLeaderDetail(@PathVariable String axisStructId){
+        PowerAxisSLeaderResultDTO dto = powerAxisStructLeaderService.queryLeaderDetailById(axisStructId);
+        return new Result().ok(dto);
+    }
+
+    /**
+     * 查询节点负责人列表
+     */
+    @PostMapping("/listSimpleByAgency")
+    public Result getListSimpleByAgency(@RequestBody String agencyId){
+        List<String> ids = powerAxisStructService.getIdByAgencyId(agencyId);
+        List<PowerAxisSimpleListDTO> list = powerAxisLeaderService.getSimpleList(ids);
+        return new Result().ok(list);
+    }
 
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java

@@ -15,6 +15,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 
 import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructListByCategoryCodeFormDTO;
 import com.epmet.plugin.power.dto.axis.result.*;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructAddFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructFormDTO;
@@ -122,6 +123,12 @@ public class PowerAxisStructController {
     @PostMapping("/addOrg")
     public Result addOrg(@RequestBody PowerAxisStructEntity form){
         int i = powerAxisStructService.addOrg(form);
+        if(i == -1){
+            return new Result().error(1,"名字重复");
+        }
+        if(i == -2){
+            return new Result().error(1,"同一组织下只允许存在一个党委");
+        }
         return new Result();
     }
     /**
@@ -133,6 +140,12 @@ public class PowerAxisStructController {
         if(i == 0){
             return new Result().error(1,"不能所属自己");
         }
+        if(i == -2){
+            return new Result().error(1,"同一组织下只允许存在一个党委");
+        }
+        if(i == -3){
+            return new Result().error(1,"名字重复");
+        }
         return new Result();
     }
 
@@ -179,4 +192,13 @@ public class PowerAxisStructController {
         return new Result<PowerAxisStructEntity>().ok(power);
     }
 
+    /**
+     * 按节点类型获取节点列表
+     */
+    @PostMapping("/listByCategoryCode")
+    public Result getListByCategoryCode(@RequestBody PowerAxisStructListByCategoryCodeFormDTO form){
+        List<PowerAixsStructListByCategoryResultDTO> dto = powerAxisStructService.getListByCategoryCode(form);
+        return new Result().ok(dto);
+    }
+
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java

@@ -79,5 +79,4 @@ public class PowerKernelHouseholdController {
     }
 
 
-
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisLeaderDao.java

@@ -1,9 +1,14 @@
 package com.epmet.plugin.power.modules.axis.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.plugin.power.dto.axis.PowerAxisLeaderDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisLeaderEntity;
+import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructLeaderEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 动力主轴领导人 
  *
@@ -12,5 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PowerAxisLeaderDao extends BaseDao<PowerAxisLeaderEntity> {
-	
+
+
+    List<PowerAxisSimpleListDTO> getSimpleList(List<String> ids);
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java

@@ -5,6 +5,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructAddFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructFormDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructListByCategoryCodeFormDTO;
 import com.epmet.plugin.power.dto.axis.result.*;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity;
@@ -62,4 +63,11 @@ public interface PowerAxisStructDao extends BaseDao<PowerAxisStructEntity> {
     List<PowerAxisStructPartyCommResultDTO> getPartyCommList();
 
 
+    int queryName(PowerAxisStructEntity form);
+
+    int queryCategory(PowerAxisStructEntity form);
+
+    List<String> getIdsByAgencyId(String agencyId);
+
+    List<PowerAixsStructListByCategoryResultDTO> getListByCategoryCode(PowerAxisStructListByCategoryCodeFormDTO form);
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java

@@ -1,6 +1,7 @@
 package com.epmet.plugin.power.modules.axis.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructLeaderEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -12,5 +13,8 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PowerAxisStructLeaderDao extends BaseDao<PowerAxisStructLeaderEntity> {
-	
+
+    String queryId(PowerAxisStructLeaderEntity leaderEntity);
+
+    PowerAxisSLeaderResultDTO queryLeaderDetailById(String axisStructId);
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisStructEntity.java

@@ -7,6 +7,7 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -67,4 +68,14 @@ public class PowerAxisStructEntity extends BaseEpmetEntity {
      */
 	private Integer sort;
 
+	/**
+	 * 经度
+	 */
+	private BigDecimal longitude;
+
+	/**
+	 * 纬度
+	 */
+	private BigDecimal latitude;
+
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisLeaderService.java

@@ -3,6 +3,7 @@ package com.epmet.plugin.power.modules.axis.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.plugin.power.dto.axis.PowerAxisLeaderDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisLeaderEntity;
 
 import java.util.List;
@@ -75,4 +76,9 @@ public interface PowerAxisLeaderService extends BaseService<PowerAxisLeaderEntit
      * @date 2022-04-18
      */
     void delete(String[] ids);
+
+    /**
+     * 根据动力主轴id列表获取人员信息
+     */
+    List<PowerAxisSimpleListDTO> getSimpleList(List<String> ids);
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructLeaderService.java

@@ -3,6 +3,7 @@ package com.epmet.plugin.power.modules.axis.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.plugin.power.dto.axis.PowerAxisStructLeaderDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructLeaderEntity;
 
 import java.util.List;
@@ -75,4 +76,9 @@ public interface PowerAxisStructLeaderService extends BaseService<PowerAxisStruc
      * @date 2022-04-19
      */
     void delete(String[] ids);
+
+    /**
+     * 查询节点负责人信息
+     */
+    PowerAxisSLeaderResultDTO queryLeaderDetailById(String axisStructId);
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java

@@ -6,6 +6,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructAddFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructFormDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructListByCategoryCodeFormDTO;
 import com.epmet.plugin.power.dto.axis.result.*;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity;
@@ -139,4 +140,13 @@ public interface PowerAxisStructService extends BaseService<PowerAxisStructEntit
     PowerAxisStructEntity queryModifyById(String id);
 
 
+    /**
+     * 根据agencyId获取id列表
+     */
+    List<String> getIdByAgencyId(String agencyId);
+
+    /**
+     * 按节点类型获取节点列表
+     */
+    List<PowerAixsStructListByCategoryResultDTO> getListByCategoryCode(PowerAxisStructListByCategoryCodeFormDTO form);
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java

@@ -7,13 +7,18 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.plugin.power.dto.axis.PowerAxisLeaderDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO;
 import com.epmet.plugin.power.modules.axis.dao.PowerAxisLeaderDao;
+import com.epmet.plugin.power.modules.axis.dao.PowerAxisStructLeaderDao;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisLeaderEntity;
+import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructLeaderEntity;
 import com.epmet.plugin.power.modules.axis.service.PowerAxisLeaderService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -27,6 +32,8 @@ import java.util.Map;
 @Service
 public class PowerAxisLeaderServiceImpl extends BaseServiceImpl<PowerAxisLeaderDao, PowerAxisLeaderEntity> implements PowerAxisLeaderService {
 
+    @Resource
+    PowerAxisStructLeaderDao powerAxisStructLeaderDao;
 
     @Override
     public PageData<PowerAxisLeaderDTO> page(Map<String, Object> params) {
@@ -63,14 +70,30 @@ public class PowerAxisLeaderServiceImpl extends BaseServiceImpl<PowerAxisLeaderD
     @Transactional(rollbackFor = Exception.class)
     public void save(PowerAxisLeaderDTO dto) {
         PowerAxisLeaderEntity entity = ConvertUtils.sourceToTarget(dto, PowerAxisLeaderEntity.class);
-        insert(entity);
+        boolean i = insert(entity);
+        if(i){
+            PowerAxisStructLeaderEntity leaderEntity = new PowerAxisStructLeaderEntity();
+            leaderEntity.setCustomerId(dto.getCustomerId());
+            leaderEntity.setLeaderId(entity.getId());
+            leaderEntity.setStructReferenceId(dto.getStructReferenceId());
+            powerAxisStructLeaderDao.insert(leaderEntity);
+        }
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(PowerAxisLeaderDTO dto) {
         PowerAxisLeaderEntity entity = ConvertUtils.sourceToTarget(dto, PowerAxisLeaderEntity.class);
-        updateById(entity);
+         boolean i = updateById(entity);
+         if(i){
+             PowerAxisStructLeaderEntity leaderEntity = new PowerAxisStructLeaderEntity();
+             leaderEntity.setLeaderId(entity.getId());
+             leaderEntity.setStructReferenceId(dto.getStructReferenceId());
+             leaderEntity.setCustomerId(dto.getCustomerId());
+             leaderEntity.setId(powerAxisStructLeaderDao.queryId(leaderEntity));
+             System.out.println(leaderEntity.getId());
+             powerAxisStructLeaderDao.updateById(leaderEntity);
+         }
     }
 
     @Override
@@ -80,4 +103,11 @@ public class PowerAxisLeaderServiceImpl extends BaseServiceImpl<PowerAxisLeaderD
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<PowerAxisSimpleListDTO> getSimpleList(List<String> ids) {
+        List<PowerAxisSimpleListDTO> list = baseDao.getSimpleList(ids);
+        return list;
+    }
+
+
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java

@@ -6,6 +6,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO;
 import com.epmet.plugin.power.modules.axis.dao.PowerAxisStructLeaderDao;
 import com.epmet.plugin.power.dto.axis.PowerAxisStructLeaderDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructLeaderEntity;
@@ -82,4 +83,10 @@ public class PowerAxisStructLeaderServiceImpl extends BaseServiceImpl<PowerAxisS
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public PowerAxisSLeaderResultDTO queryLeaderDetailById(String axisStructId) {
+        PowerAxisSLeaderResultDTO dto = baseDao.queryLeaderDetailById(axisStructId);
+        return dto;
+    }
+
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java

@@ -11,6 +11,7 @@ import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructAddFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructLeaderFormDTO;
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructListByCategoryCodeFormDTO;
 import com.epmet.plugin.power.dto.axis.result.*;
 import com.epmet.plugin.power.modules.axis.dao.PowerAxisStructDao;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisStructEntity;
@@ -114,16 +115,35 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
 
     @Override
     public int addOrg(PowerAxisStructEntity form) {
-       int i = baseDao.insert(form);
-       return i;
+        if(form.getCategoryCode().equals("community_party")){
+            int y = baseDao.queryCategory(form);
+            if(y != 0){
+                return -2;
+            }
+        }
+        int x = baseDao.queryName(form);
+        if(x == 0){
+            int i = baseDao.insert(form);
+            return i;
+        }
+        return -1;
     }
 
     @Override
     public int modifyRog(PowerAxisStructEntity form) {
         if(form.getId().equals( form.getPid())){
-            System.out.println("11111");
             return 0;
         }
+        if(form.getCategoryCode().equals("community_party")){
+            int y = baseDao.queryCategory(form);
+            if(y != 0){
+                return -2;
+            }
+        }
+        int x = baseDao.queryName(form);
+        if(x != 0){
+            return -3;
+        }
         int i = baseDao.updateById(form);
         return i;
     }
@@ -160,5 +180,20 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
         return entity;
     }
 
+    @Override
+    public List<String> getIdByAgencyId(String agencyId) {
+        List<String> ids = baseDao.getIdsByAgencyId(agencyId);
+        return ids;
+    }
+
+    /**
+     * 按节点类型获取节点列表
+     */
+    @Override
+    public List<PowerAixsStructListByCategoryResultDTO> getListByCategoryCode(PowerAxisStructListByCategoryCodeFormDTO form) {
+        List<PowerAixsStructListByCategoryResultDTO> dto = baseDao.getListByCategoryCode(form);
+        return dto;
+    }
+
 
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml

@@ -18,6 +18,23 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="getSimpleList" resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisSimpleListDTO">
+        SELECT
+            ppal.id,
+            ppal.NAME,
+            ppal.MOBILE
+        FROM
+	        pli_power_axis_leader AS ppal
+	    LEFT JOIN
+	        pli_power_axis_struct_leader as ppasl
+	    ON
+	        ppal.id = ppasl.LEADER_ID
+	    <where>
+            <foreach collection="list" item="id">
+                STRUCT_REFERENCE_ID = #{id}
+            </foreach>
+        </where>
+    </select>
 
 
 </mapper>

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml

@@ -124,6 +124,39 @@
 	    AND
 	        del_flag = 0
     </select>
+    <select id="queryName" resultType="java.lang.Integer">
+        SELECT
+            count(*)
+        FROM
+            pli_power_axis_struct
+        WHERE
+	        NAME = #{name}
+	    AND
+	        pid = #{pid}
+    </select>
+    <select id="queryCategory" resultType="java.lang.Integer">
+        SELECT
+            count(*)
+        FROM
+            pli_power_axis_struct
+        WHERE
+	        AGENCY_ID = #{agencyId}
+    </select>
+    <select id="getIdsByAgencyId" resultType="java.lang.String">
+        select id from pli_power_axis_struct where agency_id = #{agencyId}
+    </select>
+    <select id="getListByCategoryCode"
+            resultType="com.epmet.plugin.power.dto.axis.result.PowerAixsStructListByCategoryResultDTO">
+        SELECT
+            id,
+            NAME
+        FROM
+            pli_power_axis_struct
+        WHERE
+	        AGENCY_ID = #{agencyId}
+	    and
+	        CATEGORY_CODE = #{categoryCode}
+    </select>
 
 
 </mapper>

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml

@@ -16,6 +16,25 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="queryId" resultType="java.lang.String">
+        select id from pli_power_axis_struct_leader
+        where customer_id = #{customerId}
+    </select>
+    <select id="queryLeaderDetailById"
+            resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO">
+        SELECT
+            NAME,
+            GENDER,
+            MOBILE,
+            INTERODUCTION,
+            AVATAR
+        FROM
+            pli_power_axis_struct_leader
+	    LEFT JOIN
+	        pli_power_axis_leader
+	    ON
+	        STRUCT_REFERENCE_ID = #{axisStructId}
+    </select>
 
 
 </mapper>