From 2866631c7e32569f74292965d7c7221bae4f3cf4 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 11 Mar 2024 18:24:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/PartyMemberStyleFormDTO.java | 1 - .../controller/YiFengScreenController.java | 36 +++++++++++++++++++ .../impl/IcPartymemberStyleServiceImpl.java | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberStyleFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberStyleFormDTO.java index 40edfb678a..01bcbbaf0c 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberStyleFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberStyleFormDTO.java @@ -15,7 +15,6 @@ import java.io.Serializable; @Data public class PartyMemberStyleFormDTO implements Serializable { private static final long serialVersionUID = 4743261460276449408L; - @NotBlank(message = "组织ID不能为空") private String agencyId; private String gridId; private String name; 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 8c205808cc..3a54e19d95 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 @@ -14,6 +14,7 @@ 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.IcPartymemberStyleService; import com.epmet.modules.partymember.service.YiFengScreenService; import com.epmet.resi.partymember.dto.IcPartyPlaceDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; @@ -24,6 +25,8 @@ 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.IcPartymemberStyleDTO; +import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO; import com.epmet.resi.partymember.dto.partymember.result.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -56,8 +59,41 @@ public class YiFengScreenController { @Autowired private IcPartyWishService icPartyWishService; + @Autowired + private IcPartymemberStyleService icPartymemberStyleService; + /** + * @Description: 党员风采详情 + * @param id: + * @Return com.epmet.commons.tools.utils.Result + * @Author: lichao + * @Date: 2024/3/11 14:21 + */ + @GetMapping("partymember-style-detail") + public Result styleDetail(@RequestParam String id) { + IcPartymemberStyleDTO data = icPartymemberStyleService.get(id); + return new Result().ok(data); + } + /** + * @Description: 党员风采列表 + * @param formDTO: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2024/3/11 14:09 + */ + @PostMapping("partymember-style-list") + public Result> partymemberStyleList(@RequestBody PartyMemberStyleFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return new Result>().ok(icPartymemberStyleService.search(formDTO)); + } + /** + * @Description: 党愿列表 + * @param : + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2024/3/11 14:07 + */ @GetMapping("partyWishList") public Result> partyWishList(){ List list = icPartyWishService.partyWishList(); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java index b7299c3ad8..fcb9256bab 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java @@ -235,7 +235,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcPartymemberStyleEntity::getAgencyId, formDTO.getAgencyId()); + wrapper.eq(StringUtils.isNotBlank(formDTO.getAgencyId()),IcPartymemberStyleEntity::getAgencyId, formDTO.getAgencyId()); wrapper.eq(StringUtils.isNotBlank(formDTO.getGridId()), IcPartymemberStyleEntity::getGridId, formDTO.getGridId()); wrapper.like(StringUtils.isNotBlank(formDTO.getName()), IcPartymemberStyleEntity::getName, formDTO.getName()); wrapper.like(StringUtils.isNotBlank(formDTO.getMainDeed()), IcPartymemberStyleEntity::getMainDeed, formDTO.getMainDeed());