fix 问卷详情

netflix-dao/src/main/java/com/cyksj/model/dto/FormFieldsView.java

@@ -1,15 +1,10 @@
 package com.cyksj.model.dto;
 
-import com.cyksj.model.entity.FormFieldsDefault;
 import com.ejlchina.searcher.bean.DbField;
-import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Date;
-import java.util.List;
-
 /*
  *项目名: netflix
  *文件名: FormFieldsView
@@ -18,8 +13,9 @@ import java.util.List;
  */
 @Getter
 @Setter
-@SearchBean(tables = "form_fields ff left join form_template ft on ft.id = ff.template_id",
-		where = "ff.deleted is true,ft.deleted is true")
+@SearchBean(tables = "form_fields_default fd left join form_fields ff on ff.id = fd.fields_id" +
+		" left join form_template ft on ft.id = ff.template_id",
+		where = "ff.deleted is true and ft.deleted is true")
 public class FormFieldsView {
 	@DbField("ff.id")
 	private Long id;
@@ -48,9 +44,9 @@ public class FormFieldsView {
 	@DbField("ft.desc_str")
 	private String descStr;
 
-	@DbField("ff.created_time")
-	private Date createdTime;
+	@DbField("fd.promotion_id")
+	private Long promotionId;
 
-	@DbIgnore
-	private List<FormFieldsDefault> fieldsDefaults;
+	@DbField("fd.value")
+	private String value;
 }

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

@@ -15,7 +15,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @SearchBean(tables = "form_template fd left join form_fields ff on ff.template_id = fd.id",
-		where = "fd.deleted is true,ff.deleted is true")
+		where = "fd.deleted is true and ff.deleted is true")
 public class QuestionnaireView {
 
 	@DbField("fd.promotion_id")

netflix-web/src/main/java/com/cyksj/web/controller/manage/form/FormController.java

@@ -9,7 +9,6 @@ import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.manage.form.FormFieldsDataMapper;
 import com.cyksj.mapper.manage.form.FormFieldsMapper;
 import com.cyksj.mapper.manage.form.FormTemplateMapper;
-import com.cyksj.model.dto.FormFieldsView;
 import com.cyksj.model.dto.FormTemplateDataDto;
 import com.cyksj.model.entity.FormFields;
 import com.cyksj.model.entity.FormFieldsDefault;
@@ -123,23 +122,6 @@ public class FormController {
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}
 
-	/**
-	 * 模板详情 问卷字段以及答案列表
-	 */
-	@GetMapping("/template/get/detail/{id}")
-	public Result<SearchResult<FormFieldsView>> getFieldsView(@PathVariable Long id) {
-		SearchResult<FormFieldsView> search = beanSearcher.search(FormFieldsView.class, MapUtils.flatBuilder(request.getParameterMap())
-				.field(FormFieldsView::getTemplateId, id)
-				.orderBy(FormFieldsView::getSorted).asc()
-				.build());
-		search.getDataList().forEach(data->{
-			List<FormFieldsDefault> formFieldsDefaults = beanSearcher.searchAll(FormFieldsDefault.class, MapUtils.builder().field(FormFieldsDefault::getFieldsId, data.getId()).orderBy(FormFieldsDefault::getId).asc().build());
-			data.setFieldsDefaults(formFieldsDefaults);
-		});
-		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
-	}
-
-
 	/**
 	 * 用户问卷回答列表
 	 */

netflix-web/src/main/java/com/cyksj/web/controller/manage/form/QuestionnairePromotionController.java

@@ -3,6 +3,7 @@ package com.cyksj.web.controller.manage.form;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.model.dto.FormFieldsView;
 import com.cyksj.model.entity.QuestionnairePromotion;
 import com.cyksj.service.mange.form.QuestionnairePromotionService;
 import com.ejlchina.searcher.BeanSearcher;
@@ -57,4 +58,16 @@ public class QuestionnairePromotionController {
 				.field(QuestionnairePromotion::getDeleted, true).build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}
+
+	/**
+	 * 问卷详情 问卷字段以及答案列表
+	 */
+	@GetMapping("/template/get/detail/{promotionId}")
+	public Result<SearchResult<FormFieldsView>> getFieldsView(@PathVariable Long promotionId) {
+		SearchResult<FormFieldsView> search = beanSearcher.search(FormFieldsView.class, MapUtils.flatBuilder(request.getParameterMap())
+				.field(FormFieldsView::getPromotionId, promotionId)
+				.orderBy(FormFieldsView::getSorted).asc()
+				.build());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+	}
 }