From 8f60af53f3bdc7c6935ec77592277db5d4b0be72 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 24 Sep 2021 15:55:17 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java | 8 ++++++++
 1 file changed, 8 insertions(+)

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 89f03e8545..23579dd5d2 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
@@ -169,16 +169,20 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
     @Override
     public List<TDuckListResultDTO> queryProjectList(TDuckListFormDTO formDTO) {
         List<String> orgIds = new ArrayList<>();
+        // 工作端不需要传orgId
         if (formDTO.getClient().equals(TDuckConstant.CLIENT_GOV)){
+            // 根据 客户ID 和 人ID 从redis获取信息
             CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
             String pids = staffInfo.getAgencyPIds();
             String agencyId = staffInfo.getAgencyId();
+            // 来源于 部门
             if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_DEPT)){
                 List<IdAndNameDTO> deptList = staffInfo.getDeptList();
                 if (CollectionUtils.isEmpty(deptList)){
                     return new ArrayList<>();
                 }
                 orgIds = joint(pids,agencyId,deptList);
+                // 来源于 网格
             }else if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_GRID)){
                 List<IdAndNameDTO> gridList = staffInfo.getGridList();
                 if (CollectionUtils.isEmpty(gridList)){
@@ -192,6 +196,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         }else {
             CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
             customerGridFormDTO.setGridId(formDTO.getOrgId());
+            // 查询网格信息
             Result<CustomerGridDTO> gridResult = govOrgOpenFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
             if (!gridResult.success()){
                 throw new RenException("查询网格信息失败了...");
@@ -200,12 +205,14 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
             String oneOrg = data.getPids() + ":" + data.getId();
             orgIds.add(oneOrg);
         }
+        // 根据orgIds查询 问卷调查的key
         List<String> projectKeys = baseDao.selectProjectKey(orgIds);
         if (CollectionUtils.isEmpty(projectKeys)){
             return new ArrayList<>();
         }
         PageInfo<TDuckListResultDTO> projectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryProjectList(projectKeys, formDTO.getStatus(), formDTO.getClient()));
         List<TDuckListResultDTO> result = projectPageInfo.getList();
+        // 查询此人已填写过的问卷 并赋值已填写字段
         List<String> records = visitRecordDao.selectVisitRecordByUserId(formDTO.getUserId());
         if (!CollectionUtils.isEmpty(records)){
             for (String r : records) {
@@ -217,6 +224,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 }
             }
         }
+        //赋值 orgName
         result.forEach(r -> {
             CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), r.getCreatedBy());
             String orgName = "";

From 4d46b8d15f6fb4046ff6abd7644054ecacaf8aeb Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 24 Sep 2021 16:51:31 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=A1=AB=E5=86=99=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dao/epmettduck/PrUserProjectResultDao.java   | 7 ++++++-
 .../epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java    | 2 +-
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java  | 5 +++--
 .../resources/mapper/epmettduck/PrUserProjectResultDao.xml | 5 +++++
 .../main/resources/mapper/epmettduck/PrVistRecordDao.xml   | 6 ------
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectResultDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectResultDao.java
index 15ae5f7c3a..eac14a49b8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectResultDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectResultDao.java
@@ -3,6 +3,9 @@ package com.epmet.dataaggre.dao.epmettduck;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 项目表单项
@@ -12,5 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PrUserProjectResultDao extends BaseDao<PrUserProjectResultEntity> {
-	
+
+    List<String> selectFillRecordByUserId(@Param("userId")String userId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java
index 279884c678..5714df590e 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java
@@ -16,6 +16,6 @@ import java.util.List;
 @Mapper
 public interface PrVistRecordDao extends BaseDao<PrVistRecordEntity> {
 
-    List<String> selectVisitRecordByUserId(@Param("userId")String userId);
+
 
 }
\ 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 23579dd5d2..5d22f94772 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
@@ -38,6 +38,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.constant.TDuckConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
+import com.epmet.dataaggre.dao.epmettduck.PrUserProjectResultDao;
 import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao;
 import com.epmet.dataaggre.dto.epmettduck.PrPublishRangeDTO;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
@@ -85,7 +86,7 @@ import java.util.stream.Stream;
 public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao, PrUserProjectEntity> implements PrUserProjectService {
 
     @Autowired
-    private PrVistRecordDao visitRecordDao;
+    private PrUserProjectResultDao prUserProjectResultDao;
     @Resource
     private PrPublishRangeService prPublishRangeService;
     @Resource
@@ -213,7 +214,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         PageInfo<TDuckListResultDTO> projectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryProjectList(projectKeys, formDTO.getStatus(), formDTO.getClient()));
         List<TDuckListResultDTO> result = projectPageInfo.getList();
         // 查询此人已填写过的问卷 并赋值已填写字段
-        List<String> records = visitRecordDao.selectVisitRecordByUserId(formDTO.getUserId());
+        List<String> records = prUserProjectResultDao.selectFillRecordByUserId(formDTO.getUserId());
         if (!CollectionUtils.isEmpty(records)){
             for (String r : records) {
                 for (TDuckListResultDTO t : result) {
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectResultDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectResultDao.xml
index 21518172dc..76fc783368 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectResultDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectResultDao.xml
@@ -3,4 +3,9 @@
 
 <mapper namespace="com.epmet.dataaggre.dao.epmettduck.PrUserProjectResultDao">
 
+    <select id="selectFillRecordByUserId" resultType="java.lang.String">
+        SELECT DISTINCT project_key FROM pr_user_project_result
+        WHERE del_flag = 0
+          AND user_id = #{userId}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml
index 77f2f5c68a..8ea675b0e9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml
@@ -3,10 +3,4 @@
 
 <mapper namespace="com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao">
 
-    <!-- 根据userId查询是否已填 -->
-    <select id="selectVisitRecordByUserId" resultType="java.lang.String">
-        SELECT project_key FROM pr_vist_record
-        WHERE del_flag = 0
-          AND user_id = #{userId}
-    </select>
 </mapper>
\ No newline at end of file

From 98952a8142bb16f2aad6b1277100dc75554a3086 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 24 Sep 2021 17:11:20 +0800
Subject: [PATCH 3/4] fill

---
 .../dto/epmettduck/result/TDuckListResultDTO.java   |  4 ++++
 .../epmettduck/impl/PrUserProjectServiceImpl.java   |  2 +-
 .../mapper/epmettduck/PrUserProjectDao.xml          | 13 +++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
index 0874011bce..b58d156a3d 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
@@ -1,6 +1,7 @@
 package com.epmet.dataaggre.dto.epmettduck.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -86,6 +87,9 @@ public class TDuckListResultDTO implements Serializable {
 
     private String createdBy;
 
+    @JsonIgnore
+    private Integer isEveryoneWriteOnceUid;
+
     public TDuckListResultDTO() {
         this.customerId = "";
         this.key = "";
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 5d22f94772..6d78893d55 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
@@ -218,7 +218,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         if (!CollectionUtils.isEmpty(records)){
             for (String r : records) {
                 for (TDuckListResultDTO t : result) {
-                    if (r.equals(t.getKey())){
+                    if (t.getIsEveryoneWriteOnceUid() == NumConstant.ONE && r.equals(t.getKey())){
                         t.setFillStatus(true);
                         continue;
                     }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
index b9e54b758b..541271e826 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml
@@ -82,16 +82,17 @@
 
     <!-- 根据keys查询project -->
     <select id="queryProjectList" resultType="com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO">
-        select * from pr_user_project
-        where del_flag = 0
-        AND status = #{status}
-        AND client = #{client}
-        AND `key` in (
+        select up.*,ps.is_everyone_write_once_uid from pr_user_project up
+        LEFT JOIN pr_user_project_setting ps ON (ps.project_key = up.`key` AND ps.del_flag = 0)
+        where up.del_flag = 0
+        AND up.status = #{status}
+        AND up.client = #{client}
+        AND up.`key` in (
             <foreach collection="keys" item="key" separator=",">
                 #{key}
             </foreach>
             )
-        ORDER BY created_time DESC
+        ORDER BY up.created_time DESC
     </select>
 
 </mapper>
\ No newline at end of file

From 812ed27eadff3f331d394fadadb92925b020e6c8 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 24 Sep 2021 17:27:15 +0800
Subject: [PATCH 4/4] fill

---
 .../dataaggre/dto/epmettduck/result/TDuckListResultDTO.java | 6 ++++++
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java   | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
index b58d156a3d..ee412e8ad3 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java
@@ -75,6 +75,11 @@ public class TDuckListResultDTO implements Serializable {
      */
     private Boolean fillStatus;
 
+    /**
+     * 是否还能填写问卷，能：true，不能：false
+     */
+    private Boolean isFillQuestion;
+
     /**
      * 回收状态 0:未回收；1已回收
      */
@@ -103,6 +108,7 @@ public class TDuckListResultDTO implements Serializable {
         this.client = "";
         this.createdTime = "";
         this.fillStatus = false;
+        this.isFillQuestion = true;
         this.orgName = "";
     }
 }
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 6d78893d55..8f8176d5dd 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
@@ -219,8 +219,10 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
             for (String r : records) {
                 for (TDuckListResultDTO t : result) {
                     if (t.getIsEveryoneWriteOnceUid() == NumConstant.ONE && r.equals(t.getKey())){
+                        t.setIsFillQuestion(false);
+                    }
+                    if (r.equals(t.getKey())){
                         t.setFillStatus(true);
-                        continue;
                     }
                 }
             }