diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListForScreenFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListForScreenFormDTO.java
new file mode 100644
index 0000000000..4681515a6c
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListForScreenFormDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.resi.partymember.dto.partymember.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class StyleShowListForScreenFormDTO implements Serializable {
+ public interface AddUserInternalGroup {
+ }
+
+ @NotBlank(message = "agencyId不能为空", groups = AddUserInternalGroup.class)
+ private String agencyId;
+ @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
+ private String customerId;
+
+ @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class)
+ private Integer pageNo;
+ @NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class)
+ private Integer pageSize;
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index e8fc3e1c99..7163e6ffce 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -333,7 +333,7 @@
5
192.168.203.30
- 10052
+ 6379
Elink833066
true
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java
index ef2469b7b0..f4d712b672 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java
@@ -36,6 +36,7 @@ import com.epmet.modules.partymember.excel.IcPartymemberStyleExcel;
import com.epmet.modules.partymember.service.IcPartymemberStyleService;
import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.StyleShowListForScreenFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO;
import lombok.extern.slf4j.Slf4j;
@@ -179,6 +180,20 @@ public class IcPartymemberStyleController {
return new Result>().ok(icPartymemberStyleService.showList(formDTO));
}
+
+ /**
+ * 数据分析-党员风采列表查询 for 大屏
+ *
+ * @param
+ * @return
+ */
+ @PostMapping("screen/showlist")
+ public Result> showListForScreen(@RequestBody StyleShowListForScreenFormDTO formDTO) {
+ formDTO.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
+ ValidatorUtils.validateEntity(formDTO, StyleShowListFormDTO.AddUserInternalGroup.class);
+ return new Result>().ok(icPartymemberStyleService.showListForScreen(formDTO));
+ }
+
/**
* 党员风采列表
*
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java
index 526e939bcb..9b84df5d64 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java
@@ -23,6 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.modules.partymember.entity.IcPartymemberStyleEntity;
import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.StyleShowListForScreenFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO;
@@ -129,4 +130,6 @@ public interface IcPartymemberStyleService extends BaseService showListByAgency(StyleShowListResiFormDTO formDto);
+
+ PageData showListForScreen(StyleShowListForScreenFormDTO formDTO);
}
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 b488b7e15f..cdcfb9810e 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
@@ -59,6 +59,7 @@ import com.epmet.modules.partymember.service.IcPartymemberStyleImageService;
import com.epmet.modules.partymember.service.IcPartymemberStyleService;
import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.StyleShowListForScreenFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO;
import com.github.pagehelper.PageHelper;
@@ -464,6 +465,12 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl showListForScreen(StyleShowListForScreenFormDTO formDTO) {
+ String customerId = formDTO.getCustomerId();
+ return showListByAgency(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getAgencyId(), customerId);
+ }
+
private PageData showListByAgency(int pageNo, int pageSize, String agencyId, String customerId) {
PageInfo pageInfo = PageHelper.startPage(pageNo, pageSize).doSelectPageInfo(() -> baseDao.selectShowList(agencyId, customerId));
if (CollectionUtils.isNotEmpty(pageInfo.getList())) {