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 6777da6801..2e19ac3d1f 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 @@ -15,7 +15,7 @@ import com.epmet.modules.partyOrg.service.IcPartyWishService; import com.epmet.modules.partyOrg.service.YiFengPartyOrgService; import com.epmet.modules.partymember.dao.IcPartyMemberDao; import com.epmet.modules.partymember.service.*; -import com.epmet.resi.partymember.dto.IcPartyPlaceDTO; +import com.epmet.resi.partymember.dto.*; 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; @@ -33,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -68,7 +69,70 @@ public class YiFengScreenController { private IcPartyMemberService icPartyMemberService; @Autowired private IcCultureLegacyService icCultureLegacyService; + @Autowired + private IcSeedStrategyService icSeedStrategyService; + @Autowired + private IcSeedPowerService icSeedPowerService; + @Autowired + private IcSeedProjectService icSeedProjectService; + + @Autowired + private IcSeedNewsService icSeedNewsService; + + /** + * @Description: 种业咨询列表 + * @param : + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2024/3/20 15:18 + */ + @GetMapping("seedNewsList") + public Result> seedNewsList(){ + Map params = new HashMap<>(); + PageData page = icSeedNewsService.page(params); + return new Result>().ok(page); + } + + /** + * @Description: 在谈项目列表 + * @param : + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2024/3/20 15:15 + */ + @GetMapping("seedProjectList") + public Result> seedProjectList(){ + Map params = new HashMap<>(); + PageData page = icSeedProjectService.page(params); + return new Result>().ok(page); + } + + /** + * @Description: 科技人才 + * @param type: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2024/3/20 15:09 + */ + @GetMapping("seedPowerList") + public Result> seedPowerList(Integer type){ + List result = icSeedPowerService.seedPowerList(type); + return new Result>().ok(result); + } + + /** + * @Description: 领导关怀 + * @param type: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2024/3/20 15:06 + */ + @GetMapping("seedStrategyList") + public Result> seedStrategyList(Integer type){ + List result = icSeedStrategyService.seedStrategyList(type); + return new Result>().ok(result); + } /** * @Description: 文化移风列表 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcSeedPowerDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcSeedPowerDao.java index 86f651d5d1..7c7e73a762 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcSeedPowerDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcSeedPowerDao.java @@ -19,7 +19,11 @@ package com.epmet.modules.partymember.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partymember.entity.IcSeedPowerEntity; +import com.epmet.resi.partymember.dto.IcSeedPowerDTO; 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 IcSeedPowerDao extends BaseDao { - + + List seedPowerList(@Param("type") Integer type); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcSeedStrategyDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcSeedStrategyDao.java index 7d8365a78b..80cc2fca3d 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcSeedStrategyDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcSeedStrategyDao.java @@ -19,7 +19,11 @@ package com.epmet.modules.partymember.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partymember.entity.IcSeedStrategyEntity; +import com.epmet.resi.partymember.dto.IcSeedStrategyDTO; 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 IcSeedStrategyDao extends BaseDao { - + + List seedStrategyList(@Param("type") Integer type); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcSeedPowerService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcSeedPowerService.java index 85be2da6fa..8a3df6ccd0 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcSeedPowerService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcSeedPowerService.java @@ -92,4 +92,6 @@ public interface IcSeedPowerService extends BaseService { * @date 2024-03-19 */ void delete(String[] ids); + + List seedPowerList(Integer type); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcSeedStrategyService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcSeedStrategyService.java index ff9eef9dbb..a579ccbc84 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcSeedStrategyService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcSeedStrategyService.java @@ -93,4 +93,6 @@ public interface IcSeedStrategyService extends BaseService * @date 2024-03-19 */ void delete(String[] ids); + + List seedStrategyList(Integer type); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedNewsServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedNewsServiceImpl.java index 2a677696eb..fe49efeeec 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedNewsServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedNewsServiceImpl.java @@ -67,6 +67,7 @@ public class IcSeedNewsServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.orderByAsc("SORT"); return wrapper; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedPowerServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedPowerServiceImpl.java index 624bcd4b73..3b35bdc8ad 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedPowerServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedPowerServiceImpl.java @@ -98,4 +98,9 @@ public class IcSeedPowerServiceImpl extends BaseServiceImpl seedPowerList(Integer type) { + return baseDao.seedPowerList(type); + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedProjectServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedProjectServiceImpl.java index 77fa3e829b..d7a8f08be1 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedProjectServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedProjectServiceImpl.java @@ -69,6 +69,7 @@ public class IcSeedProjectServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.orderByAsc("SORT"); return wrapper; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedStrategyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedStrategyServiceImpl.java index 097e519f00..8e5456f940 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedStrategyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedStrategyServiceImpl.java @@ -100,4 +100,9 @@ public class IcSeedStrategyServiceImpl extends BaseServiceImpl seedStrategyList(Integer type) { + return baseDao.seedStrategyList(type); + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcSeedPowerDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcSeedPowerDao.xml index d371c0dd00..93599e7e0a 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcSeedPowerDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcSeedPowerDao.xml @@ -19,6 +19,19 @@ + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcSeedStrategyDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcSeedStrategyDao.xml index f8e9845d86..441b00e18a 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcSeedStrategyDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcSeedStrategyDao.xml @@ -20,6 +20,18 @@ + \ No newline at end of file