diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgLeaderDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgLeaderDTO.java index 151d45bfa8..3800c8e4c0 100755 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgLeaderDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgLeaderDTO.java @@ -93,4 +93,13 @@ public class IcPartyOrgLeaderDTO implements Serializable { */ private Date updatedTime; + /** + * 组织名称 + */ + private String orgName; + /** + * 父组织名称 + */ + private String orgPidName; + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgLeaderDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgLeaderDao.java index 13da9b7973..32ccd194b6 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgLeaderDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgLeaderDao.java @@ -19,7 +19,11 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgLeaderEntity; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgLeaderDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 党组织领导 @@ -29,5 +33,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPartyOrgLeaderDao extends BaseDao { - + + List partyOrgLeaderList(@Param("type") String type); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgLeaderService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgLeaderService.java index 3467370602..be4769c429 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgLeaderService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgLeaderService.java @@ -92,4 +92,6 @@ public interface IcPartyOrgLeaderService extends BaseService partyOrgLeaderList(String type); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgLeaderServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgLeaderServiceImpl.java index 0e6b46533d..3eeec453ea 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgLeaderServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgLeaderServiceImpl.java @@ -99,4 +99,9 @@ public class IcPartyOrgLeaderServiceImpl extends BaseServiceImpl partyOrgLeaderList(String type) { + return baseDao.partyOrgLeaderList(type); + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java index 20a3024ae1..3edc4b5c1c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.modules.partyOrg.service.IcPartyOrgLeaderService; import com.epmet.modules.partyOrg.service.YiFengPartyOrgService; import com.epmet.modules.partymember.service.IcPartyPlaceService; import com.epmet.modules.partymember.service.YiFengScreenService; @@ -16,6 +17,7 @@ import com.epmet.resi.partymember.dto.IcPartyPlaceDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgLeaderDTO; import com.epmet.resi.partymember.dto.partyOrg.result.LingShanPartyOrgAndOtherObjQtyRstDTO; import com.epmet.resi.partymember.dto.partyOrg.result.LingShanScreenPartyObjectByTypeRstDTO; import com.epmet.resi.partymember.dto.partymember.result.*; @@ -42,6 +44,22 @@ public class YiFengScreenController { @Autowired private IcPartyPlaceService icPartyPlaceService; + @Autowired + private IcPartyOrgLeaderService icPartyOrgLeaderService; + + + /** + * @Description: 领导班子列表 + * @param type: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2024/3/6 16:41 + */ + @GetMapping("partyOrgLeaderList") + public Result> partyOrgLeaderList(@RequestParam String type){ + List result = icPartyOrgLeaderService.partyOrgLeaderList(type); + return new Result>().ok(result); + } /** * @Description: 移风党建列表 * @param params: diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgLeaderDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgLeaderDao.xml index b6b188ff43..cf8b80e684 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgLeaderDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgLeaderDao.xml @@ -17,6 +17,20 @@ + \ No newline at end of file