From 6c45ec5c5c9249a4506d0e92461130165a392e04 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 22 Sep 2021 15:10:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=A1=AB=E5=86=99=E3=80=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/PrUserProjectResultExtEntity.java | 5 +++ .../entity/UserProjectResultEntity.java | 12 +++++++ .../mapper/PrUserProjectResultExtDao.java | 14 +++++++++ .../impl/UserProjectResultServiceImpl.java | 31 +++++++++++++++++-- .../project/vo/PrUserProjectResultExtDTO.java | 11 +++---- 5 files changed, 65 insertions(+), 8 deletions(-) diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/PrUserProjectResultExtEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/PrUserProjectResultExtEntity.java index 18abae1..5ea8d3b 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/PrUserProjectResultExtEntity.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/PrUserProjectResultExtEntity.java @@ -39,6 +39,11 @@ public class PrUserProjectResultExtEntity extends BaseEntity */ @TableField(typeHandler = JacksonTypeHandler.class) private Map wxUserInfo; + + //填写问卷人员信息表【pr_user_project_result_ext】字段 + //问卷填写人所属端【工作端:gov、居民端:resi、运营端:oper】 + private transient String clientType = ""; + //填写人姓名 + private transient String realName = ""; + //工作人员添加入口Id(agencyId;deptId;gridId) + private transient String orgId = ""; + //人员注册时所属组织名【组织-组织，组织-部门，组织-网格】 + private transient String orgName = ""; + //工作人员添加入口类型(组织:agency;部门:dept;网格:gridId) + private transient String orgType = ""; } diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/mapper/PrUserProjectResultExtDao.java b/tduck-project/src/main/java/com/tduck/cloud/project/mapper/PrUserProjectResultExtDao.java index d82f6f4..c2d69e6 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/mapper/PrUserProjectResultExtDao.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/mapper/PrUserProjectResultExtDao.java @@ -19,7 +19,11 @@ package com.tduck.cloud.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.tduck.cloud.project.entity.PrUserProjectResultExtEntity; +import com.tduck.cloud.project.vo.PrUserProjectResultExtDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * 填写问卷人员信息 @@ -29,5 +33,15 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PrUserProjectResultExtDao extends BaseMapper { + + /** + * 查询填写问卷人员信息 + * @param projectKey + */ + @Select("SELECT id, customer_id, project_key, user_project_result, client_type, user_id, real_name, org_id, org_name, org_type " + + "FROM pr_user_project_result_ext " + + "WHERE project_key=#{projectKey} " + + "GROUP BY user_id ") + List selectResultExtList(String projectKey); } \ No newline at end of file diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java index d9ac771..564bdfc 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java @@ -18,15 +18,19 @@ import com.tduck.cloud.common.util.AddressUtils; import com.tduck.cloud.common.util.AsyncProcessUtils; import com.tduck.cloud.common.util.RedisUtils; import com.tduck.cloud.common.util.Result; +import com.tduck.cloud.project.entity.PrUserProjectResultExtEntity; import com.tduck.cloud.project.entity.UserProjectItemEntity; import com.tduck.cloud.project.entity.UserProjectResultEntity; import com.tduck.cloud.project.entity.enums.ProjectItemTypeEnum; import com.tduck.cloud.project.entity.struct.UploadResultStruct; +import com.tduck.cloud.project.mapper.PrUserProjectResultExtDao; import com.tduck.cloud.project.mapper.UserProjectResultMapper; import com.tduck.cloud.project.request.QueryProjectResultRequest; +import com.tduck.cloud.project.service.PrUserProjectResultExtService; import com.tduck.cloud.project.service.UserProjectItemService; import com.tduck.cloud.project.service.UserProjectResultService; import com.tduck.cloud.project.vo.ExportProjectResultVO; +import com.tduck.cloud.project.vo.PrUserProjectResultExtDTO; import com.tduck.cloud.storage.cloud.OssStorageFactory; import com.tduck.cloud.storage.util.StorageUtils; import lombok.RequiredArgsConstructor; @@ -52,6 +56,8 @@ public class UserProjectResultServiceImpl extends ServiceImpl'$.{}' {} {} ", item, queryComparison.getKey(), value)); }); } - return this.page(request.toMybatisPage(), lambdaQueryWrapper); + Page page = this.page(request.toMybatisPage(), lambdaQueryWrapper); + List resultEntity = (List) page.getRecords(); + List extList = prUserProjectResultExtDao.selectResultExtList(request.getProjectKey()); + resultEntity.forEach(re -> extList.stream().filter(l -> re.getId().equals(l.getUserProjectResult())).forEach(s -> { + re.setClientType(s.getClientType()); + re.setRealName(s.getRealName()); + re.setOrgId(s.getOrgId()); + re.setOrgName(s.getOrgName()); + re.setOrgType(s.getOrgType()); + })); + page.setRecords(resultEntity); + return page; } @Override diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/vo/PrUserProjectResultExtDTO.java b/tduck-project/src/main/java/com/tduck/cloud/project/vo/PrUserProjectResultExtDTO.java index 9df91c6..d33c68a 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/vo/PrUserProjectResultExtDTO.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/vo/PrUserProjectResultExtDTO.java @@ -33,6 +33,11 @@ public class PrUserProjectResultExtDTO { private static final long serialVersionUID = 1L; + /** + * pr_user_project表主键 + */ + private String projectKey; + /** * pr_user_project_result表主键 */ @@ -68,10 +73,4 @@ public class PrUserProjectResultExtDTO { */ private String orgType; - /** - * 版本号 - */ - private Integer revision; - - } \ No newline at end of file