fix 渠道

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

@@ -24,6 +24,9 @@ public class FormFieldsDataView {
 	@DbField("fa.promotion_id")
 	private Long promotionId;
 
+	@DbField("fa.fields_name")
+	private String fieldsName;
+
 	@DbField("fa.fields_id")
 	private Long fieldsId;
 

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

@@ -1,7 +1,6 @@
 package com.cyksj.service.mange.form.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -14,7 +13,6 @@ import com.cyksj.service.mange.form.FormService;
 import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -72,20 +70,15 @@ public class FormServiceImpl implements FormService {
 
 	@Override
 	public void saveOrUpdateTemplateFieldsValue(List<FormFieldsDefault> values) {
-		values.forEach(value -> {
-			if (value.getId() == null) {
-				if (StrUtil.isEmpty(value.getFieldsName())) {
-					FormFields formFields = formFieldsMapper.selectById(value.getFieldsId());
-					value.setFieldsName(formFields.getFieldsName());
-				}
-				try {
-					formFieldsDefaultMapper.insert(value);
-				} catch (DuplicateKeyException e) {
-
-				}
+		values.forEach(formFieldsDefault ->{
+			FormFieldsDefault dbFieldDefault = formFieldsDefaultMapper.selectOne(Wrappers.lambdaQuery(FormFieldsDefault.class)
+					.eq(FormFieldsDefault::getFieldsId, formFieldsDefault.getFieldsId()).last("limit 1"));
+			if (dbFieldDefault == null){
+				formFieldsDefaultMapper.insert(formFieldsDefault);
 				return;
 			}
-			formFieldsDefaultMapper.updateById(value);
+			formFieldsDefault.setId(dbFieldDefault.getId());
+			formFieldsDefaultMapper.updateById(formFieldsDefault);
 		});
 	}
 

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

@@ -29,6 +29,7 @@ public class QuestionnairePromotionServiceImpl extends ServiceImpl<Questionnaire
 		QuestionnairePromotion db = promotionMapper.selectById(promotion.getId());
 		if (db.getIsUp()) {
 			promotion.setTemplateId(null);
+			promotion.setIsUp(true);
 		}
 		promotionMapper.updateById(promotion);
 		return promotion.getId();

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

@@ -144,6 +144,7 @@ public class FormController {
 			}
 		}
 		SearchResult<FormFieldsDataView> search = beanSearcher.search(FormFieldsDataView.class, MapUtils.flatBuilder(request.getParameterMap())
+				.field(FormFieldsDataView::getFieldsId, fieldsId)
 				.build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}