diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java index 7e35c92f39..7c53d5b367 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java @@ -41,5 +41,7 @@ public class IcPartyActPageFormDTO extends PageFormDTO implements Serializable { * 工作端小程序用yyyyMM */ private String holdMonthId; + + private String introduce; } 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 3a54e19d95..2a5549d893 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 @@ -13,6 +13,7 @@ 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.IcParameterConfigService; import com.epmet.modules.partymember.service.IcPartyPlaceService; import com.epmet.modules.partymember.service.IcPartymemberStyleService; import com.epmet.modules.partymember.service.YiFengScreenService; @@ -25,6 +26,7 @@ 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.IcParameterConfigDTO; import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO; import com.epmet.resi.partymember.dto.partymember.result.*; @@ -61,7 +63,22 @@ public class YiFengScreenController { private IcPartyWishService icPartyWishService; @Autowired private IcPartymemberStyleService icPartymemberStyleService; + @Autowired + private IcParameterConfigService icParameterConfigService; + + /** + * @Description: 参数配置 + * @param type: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2024/3/12 14:49 + */ + @GetMapping("selectConfigList") + public Result> selectConfigList(@RequestParam String type){ + List result = icParameterConfigService.selectConfigList(type); + return new Result>().ok(result); + } /** * @Description: 党员风采详情 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcParameterConfigService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcParameterConfigService.java index a3a23c5644..53d737d263 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcParameterConfigService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcParameterConfigService.java @@ -93,4 +93,6 @@ public interface IcParameterConfigService extends BaseService selectConfigList(String 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/IcParameterConfigServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcParameterConfigServiceImpl.java index 67aa8d23b0..5c5d455af5 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcParameterConfigServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcParameterConfigServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.modules.partymember.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -98,4 +99,12 @@ public class IcParameterConfigServiceImpl extends BaseServiceImpl selectConfigList(String type) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .eq(IcParameterConfigEntity::getType,type); + List entityList = baseDao.selectList(lambdaQueryWrapper); + return ConvertUtils.sourceToTarget(entityList, IcParameterConfigDTO.class); + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 00be5d9714..3987936452 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -107,6 +107,7 @@ a.ADDRESS, a.IS_PUBLISH, a.PUBLISH_STAFF_ID, + a.INTRODUCE as introduce, (case when a.IS_PUBLISH='0' then '未发布' when a.IS_PUBLISH='1' then '已发布' else ''