From a8cfe3e7e12ab4e8a933f725f2e9036b5feefb66 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 5 Mar 2024 16:00:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/YiFengScreenController.java | 31 +++++++++++++++++++ .../entity/IcPartyPlaceEntity.java | 5 +++ .../service/YiFengScreenService.java | 3 ++ .../service/impl/IcPartyPlaceServiceImpl.java | 8 ++++- 4 files changed, 46 insertions(+), 1 deletion(-) 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 6c70e1c4ec..20a3024ae1 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 @@ -10,7 +10,9 @@ import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.partyOrg.service.YiFengPartyOrgService; +import com.epmet.modules.partymember.service.IcPartyPlaceService; import com.epmet.modules.partymember.service.YiFengScreenService; +import com.epmet.resi.partymember.dto.IcPartyPlaceDTO; 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; @@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; import java.util.List; +import java.util.Map; @RestController @RequestMapping("yifengScreen") @@ -36,6 +39,34 @@ public class YiFengScreenController { @Autowired private YiFengPartyOrgService yiFengPartyOrgService; + @Autowired + private IcPartyPlaceService icPartyPlaceService; + + /** + * @Description: 移风党建列表 + * @param params: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2024/3/5 14:50 + */ + @GetMapping("partyPlacePage") + public Result> page(@RequestParam Map params){ + PageData page = icPartyPlaceService.page(params); + return new Result>().ok(page); + } + + /** + * @Description: 移风党建详情 + * @param id: + * @Return com.epmet.commons.tools.utils.Result + * @Author: lichao + * @Date: 2024/3/5 15:10 + */ + @GetMapping("partyPlace/{id}") + public Result get(@PathVariable("id") String id){ + IcPartyPlaceDTO data = icPartyPlaceService.get(id); + return new Result().ok(data); + } /** * @Description: 移风大屏-党员活动列表 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyPlaceEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyPlaceEntity.java index d8ff481717..509d7fedcd 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyPlaceEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyPlaceEntity.java @@ -46,4 +46,9 @@ public class IcPartyPlaceEntity extends BaseEpmetEntity { */ private String address; + /** + * 类型 1：公司 2：阵地 + */ + private 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/YiFengScreenService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/YiFengScreenService.java index b8829ef580..d642c046b0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/YiFengScreenService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/YiFengScreenService.java @@ -1,6 +1,7 @@ package com.epmet.modules.partymember.service; import com.epmet.commons.tools.page.PageData; +import com.epmet.resi.partymember.dto.IcPartyPlaceDTO; 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; @@ -8,6 +9,7 @@ import com.epmet.resi.partymember.dto.partymember.result.*; import java.util.Date; import java.util.List; +import java.util.Map; public interface YiFengScreenService { /** @@ -69,4 +71,5 @@ public interface YiFengScreenService { PageData actPageList(IcPartyActPageFormDTO formDTO); IcPartyActDetailResDTO queryActDetail(String customerId, String icPartyActId); + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyPlaceServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyPlaceServiceImpl.java index f57e8b7089..470cc027a7 100755 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyPlaceServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyPlaceServiceImpl.java @@ -49,9 +49,15 @@ public class IcPartyPlaceServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); + String type = (String)params.get("type"); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + if (type!=null){ + wrapper.eq("type", type); + } + return wrapper; } @@ -65,7 +71,7 @@ public class IcPartyPlaceServiceImpl extends BaseServiceImpl