From 523d14ada0ae239cc131dc880b2305644ac1ae5e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Sep 2021 13:56:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=852=E5=8D=A0?= =?UTF-8?q?=E4=B8=AA=E5=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmettduck/form/ItemResDetailFormDTO.java | 3 +++ .../controller/EpmetTDuckController.java | 10 ++++++---- .../epmettduck/PrUserProjectService.java | 13 +++++++++++++ .../impl/PrUserProjectServiceImpl.java | 17 ++++++++++++++++- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java index f0c992eae4..381efce3d1 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/ItemResDetailFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.dataaggre.dto.epmettduck.form; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** * @Description 问卷-数据分析-查看详情 @@ -24,7 +25,9 @@ public class ItemResDetailFormDTO extends ProjectKeyCommonDTO{ /** * 09.22目前产品没要求分页 */ + @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class) private Integer pageNo; + @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class) private Integer pageSize; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java index 641feb4d28..ea90244205 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java @@ -1,6 +1,7 @@ package com.epmet.dataaggre.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -14,7 +15,6 @@ import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity; import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity; import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService; import com.epmet.dataaggre.service.epmettduck.PrUserProjectService; -import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -114,6 +114,8 @@ public class EpmetTDuckController { /** * 查看详情 + * 1、联系人组件统一用一个统计显示多少条，点击查看更多显示汇总列表，如有非必填项没有填写显示空（手机号验证不需要统计） + * 2、单行文本、多行文本、时间选择、时间范围、日期选择、日期范围，统计填写人数，点击查看列表 * * @param formDTO * @return com.epmet.commons.tools.utils.Result @@ -121,9 +123,9 @@ public class EpmetTDuckController { * @date 2021/9/22 1:37 下午 */ @PostMapping("itemresdetail") - public Result queryItemResDetail(@RequestBody ItemResDetailFormDTO formDTO){ + public Result>> queryItemResDetail(@RequestBody ItemResDetailFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO,ProjectKeyCommonDTO.AddUserInternalGroup.class); - //todo - return null; + PageData> page=prUserProjectService.queryItemResDetail(formDTO); + return new Result>>().ok(page); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java index 7ba470a900..55323276ea 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java @@ -20,6 +20,7 @@ package com.epmet.dataaggre.service.epmettduck; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO; +import com.epmet.dataaggre.dto.epmettduck.form.ItemResDetailFormDTO; import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO; import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO; import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO; @@ -143,4 +144,16 @@ public interface PrUserProjectService extends BaseService { * @Date 2021/9/18 15:18 */ GetRangeResultDTO getRange(String projectKey); + + /** + * 查看详情 + * 1、联系人组件统一用一个统计显示多少条，点击查看更多显示汇总列表，如有非必填项没有填写显示空（手机号验证不需要统计） + * 2、单行文本、多行文本、时间选择、时间范围、日期选择、日期范围，统计填写人数，点击查看列表 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @date 2021/9/22 1:37 下午 + */ + PageData> queryItemResDetail(ItemResDetailFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index c1bcf57deb..de5a424a77 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -34,6 +34,7 @@ import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao; import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao; import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO; import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum; +import com.epmet.dataaggre.dto.epmettduck.form.ItemResDetailFormDTO; import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO; import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO; import com.epmet.dataaggre.dto.epmettduck.result.*; @@ -531,5 +532,19 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl> queryItemResDetail(ItemResDetailFormDTO formDTO) { + //todo + return null; + } } \ No newline at end of file