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] 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;
                     }
                 }
             }