Merge branch 'nf_midjourney_alpha'

netflix-dao/src/main/java/com/cyksj/model/views/FormSubmitDataView.java

@@ -39,6 +39,12 @@ public class FormSubmitDataView {
 	@DbField("ff.sorted")
 	private Integer sorted;
 
+	@DbField("fd.user_id")
+	private Long userId;
+
+	@DbField("u.nickname")
+	private String nickname;
+
 	@DbField("fd.created_time")
 	private Date createdTime;
 }

netflix-service/src/main/java/com/cyksj/service/mange/form/impl/FormServiceImpl.java

@@ -135,6 +135,8 @@ public class FormServiceImpl implements FormService {
 		formFields.forEach((field) -> {
 			headTitles.add(Lists.newArrayList(field.getFieldsName()));
 		});
+		headTitles.add(Lists.newArrayList("用户id"));
+		headTitles.add(Lists.newArrayList("用户名"));
 		headTitles.add(Lists.newArrayList("提交时间"));
 		return headTitles;
 	}
@@ -171,6 +173,9 @@ public class FormServiceImpl implements FormService {
 				}
 				dataList.add(values.get(0).getContent());
 			});
+
+			dataList.add(answers.get(0).getUserId().toString());
+			dataList.add(answers.get(0).getNickname());
 			dataList.add(DateUtil.format(answers.get(answers.size() - 1).getCreatedTime(), "yyyy-MM-dd HH:mm:ss"));
 			contentList.add(dataList);
 		});