--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/controller/notice/FgNoticeController.java

@@ -53,6 +53,8 @@ public class FgNoticeController {
 		for (Notice notice : list) {
 			// 问卷数据
 			if (notice.getType() == 4) {
+				
+				if(notice.getExType() ==null) {
 				FgAnswerForm form = new FgAnswerForm();
 				form.setExaminationId(notice.getResId());
 				form.setUserId(notice.getUserid());
@@ -74,7 +76,7 @@ public class FgNoticeController {
 					try {
 						date1 = df.parse(currentTime);
 						if (date1.after(endTime)) {
-							notice.setType(1);
+							notice.setExType(1);
 						}
 					} catch (ParseException e) {
 						e.printStackTrace();
@@ -82,6 +84,7 @@ public class FgNoticeController {
 				}
 
 			}
+			}
 		}
 		list.sort(Comparator.comparing(Notice::getCreateTime, Comparator.nullsFirst(Date::compareTo)).reversed());
 		return CallBack.success(list);