From 13fe3218eb3e201da34afad72c57953d03a5471d Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Thu, 7 Mar 2024 18:08:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E6=84=BF=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/modules/partyOrg/dao/IcPartyWishDao.java | 6 +++++- .../modules/partyOrg/service/IcPartyWishService.java | 2 ++ .../partyOrg/service/impl/IcPartyWishServiceImpl.java | 5 +++++ .../partymember/controller/YiFengScreenController.java | 10 ++++++++++ .../main/resources/mapper/partyOrg/IcPartyWishDao.xml | 8 ++++++++ 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyWishDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyWishDao.java index b8e11b120d..8d8bc8871d 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyWishDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyWishDao.java @@ -20,8 +20,11 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyWishEntity; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyWishDTO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 党员心愿 * @@ -30,5 +33,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPartyWishDao extends BaseDao { - + + List partyWishList(); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyWishService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyWishService.java index 4c664aba24..bfc9fecce1 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyWishService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyWishService.java @@ -93,4 +93,6 @@ public interface IcPartyWishService extends BaseService { * @date 2024-03-07 */ void delete(String[] ids); + + List partyWishList(); } \ 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/IcPartyWishServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyWishServiceImpl.java index dc1d1403a4..3f75b529e7 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyWishServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyWishServiceImpl.java @@ -100,4 +100,9 @@ public class IcPartyWishServiceImpl extends BaseServiceImpl partyWishList() { + return baseDao.partyWishList(); + } + } \ 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 ec9aa936fb..8c205808cc 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 @@ -11,6 +11,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.partyOrg.service.IcPartyOrgCensusService; import com.epmet.modules.partyOrg.service.IcPartyOrgLeaderService; +import com.epmet.modules.partyOrg.service.IcPartyWishService; import com.epmet.modules.partyOrg.service.YiFengPartyOrgService; import com.epmet.modules.partymember.service.IcPartyPlaceService; import com.epmet.modules.partymember.service.YiFengScreenService; @@ -20,6 +21,7 @@ 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.IcPartyOrgCensusDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgLeaderDTO; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyWishDTO; 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.*; @@ -52,7 +54,15 @@ public class YiFengScreenController { @Autowired private IcPartyOrgCensusService icPartyOrgCensusService; + @Autowired + private IcPartyWishService icPartyWishService; + + @GetMapping("partyWishList") + public Result> partyWishList(){ + List list = icPartyWishService.partyWishList(); + return new Result>().ok(list); + } /** * @Description: 党组织统计列表 * @param type: diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyWishDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyWishDao.xml index 1bfc334227..db774bb1d6 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyWishDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyWishDao.xml @@ -16,6 +16,14 @@ + \ No newline at end of file