Prechádzať zdrojové kódy

撤回操作考生端

qinchao 4 rokov pred
rodič
commit
3a39703d1f

+ 1 - 0
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/NoticeController.java

@@ -214,6 +214,7 @@ public class NoticeController extends ControllerSupport {
             domain.setPublisher(info.getPublisher());
             domain.setPublishTime(info.getPublishTime());
             domain.setHasRead(info.getHasRead());
+            domain.setHasRecalled(info.getHasRecalled());
             domain.setTitle(info.getTitle());
             resultList.add(domain);
         }

+ 13 - 0
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/bean/UserNoticeDomain.java

@@ -51,6 +51,11 @@ public class UserNoticeDomain implements JsonSerializable {
      */
     @ApiModelProperty("读取状态")
     private Boolean hasRead;
+    /**
+     * 撤回状态
+     */
+    @ApiModelProperty("撤回状态")
+    private Boolean hasRecalled;
 
     public Long getId() {
         return id;
@@ -99,4 +104,12 @@ public class UserNoticeDomain implements JsonSerializable {
     public void setHasRead(Boolean hasRead) {
         this.hasRead = hasRead;
     }
+
+    public Boolean getHasRecalled() {
+        return hasRecalled;
+    }
+
+    public void setHasRecalled(Boolean hasRecalled) {
+        this.hasRecalled = hasRecalled;
+    }
 }

+ 14 - 0
examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/bean/UserNoticeInfo.java

@@ -55,6 +55,12 @@ public class UserNoticeInfo implements JsonSerializable {
     @ApiModelProperty("读取状态")
     private Boolean hasRead;
 
+    /**
+     * 撤回状态
+     */
+    @ApiModelProperty("撤回状态")
+    private Boolean hasRecalled;
+
     public Long getId() {
         return id;
     }
@@ -102,4 +108,12 @@ public class UserNoticeInfo implements JsonSerializable {
     public void setHasRead(Boolean hasRead) {
         this.hasRead = hasRead;
     }
+
+    public Boolean getHasRecalled() {
+        return hasRecalled;
+    }
+
+    public void setHasRecalled(Boolean hasRecalled) {
+        this.hasRecalled = hasRecalled;
+    }
 }

+ 1 - 0
examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/NoticeServiceImpl.java

@@ -100,6 +100,7 @@ public class NoticeServiceImpl implements NoticeService {
                 info.setPublisher(noticeEntity.getPublisher());
                 info.setPublishTime(noticeEntity.getPublishTime());
                 info.setHasRead(un.getHasRead());
+                info.setHasRecalled(un.getHasRecalled());
                 resultList.add(info);
             }
         }