党员活动

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;

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<com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO>
+     * @Author: lichao
+     * @Date: 2024/3/11 14:21
+     */
+    @GetMapping("partymember-style-detail")
+    public Result<IcPartymemberStyleDTO> styleDetail(@RequestParam String id) {
+        IcPartymemberStyleDTO data = icPartymemberStyleService.get(id);
+        return new Result<IcPartymemberStyleDTO>().ok(data);
+    }
+    /**
+     * @Description: 党员风采列表
+     * @param formDTO:
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO>>
+     * @Author: lichao
+     * @Date: 2024/3/11 14:09
+     */
+    @PostMapping("partymember-style-list")
+    public Result<PageData<IcPartymemberStyleDTO>> partymemberStyleList(@RequestBody PartyMemberStyleFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<PageData<IcPartymemberStyleDTO>>().ok(icPartymemberStyleService.search(formDTO));
+    }
+    /**
+     * @Description: 党愿列表
+     * @param :
+     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.partyOrg.IcPartyWishDTO>>
+     * @Author: lichao
+     * @Date: 2024/3/11 14:07
+     */
     @GetMapping("partyWishList")
     public Result<List<IcPartyWishDTO>> partyWishList(){
         List<IcPartyWishDTO> list = icPartyWishService.partyWishList();

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<IcPartymember
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         //分页查询
         LambdaQueryWrapper<IcPartymemberStyleEntity> 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());