查询参数

platform-dao/src/main/java/com/platform/dao/dto/custom/CustomFormBomFieldDTO.java

@@ -91,5 +91,6 @@ public class CustomFormBomFieldDTO extends BaseDTO implements Serializable {
     private String dataJson; // 数据
     private String category;
     private String type;
+    private String bomFieldName; // bom表对应的属性名称
 
 }

platform-dao/src/main/java/com/platform/dao/entity/custom/CustomFormBomField.java

@@ -80,4 +80,5 @@ public class CustomFormBomField implements Serializable{
 
     private String dataJson; // 数据
 
+    private String bomFieldName; // bom表对应的属性名称
 }

platform-dao/src/main/java/com/platform/dao/vo/query/custom/CustomFormBomFieldVO.java

@@ -69,4 +69,6 @@ public class CustomFormBomFieldVO extends BaseVO implements Serializable {
     private String dataType; // 数据类型
 
     private String dataJson; // 数据
+
+    private String bomFieldName; // bom表对应的属性名称
 }

platform-service/src/main/java/com/platform/service/custom/impl/CustomFormBomFieldServiceImpl.java

@@ -1,23 +1,21 @@
 package com.platform.service.custom.impl;
 
+import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.exception.DeniedException;
 import com.platform.common.util.StringUtils;
 import com.platform.dao.bean.MyPage;
-import com.github.pagehelper.PageHelper;
-import com.platform.dao.vo.query.custom.CustomFormBomFieldVO;
 import com.platform.dao.dto.custom.CustomFormBomFieldDTO;
 import com.platform.dao.entity.custom.CustomFormBomField;
 import com.platform.dao.mapper.custom.CustomFormBomFieldMapper;
+import com.platform.dao.vo.query.custom.CustomFormBomFieldVO;
+import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.custom.CustomFormBomFieldService;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.platform.service.base.impl.BaseServiceImpl;
-import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
-import lombok.AllArgsConstructor;
 
-import java.util.Collections;
 import java.util.List;
 
 /**

platform-service/src/main/java/com/platform/service/custom/impl/CustomFormDataServiceImpl.java

@@ -1,20 +1,31 @@
 package com.platform.service.custom.impl;
 
+import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.exception.DeniedException;
+import com.platform.common.util.BeanConverterUtil;
+import com.platform.common.util.IdGeneratorUtils;
+import com.platform.common.util.SecurityUtils;
+import com.platform.common.util.StringUtils;
 import com.platform.dao.bean.MyPage;
-import com.github.pagehelper.PageHelper;
-import com.platform.dao.vo.query.custom.CustomFormDataVO;
 import com.platform.dao.dto.custom.CustomFormDataDTO;
+import com.platform.dao.entity.custom.CustomForm;
+import com.platform.dao.entity.custom.CustomFormBom;
+import com.platform.dao.entity.custom.CustomFormBomField;
 import com.platform.dao.entity.custom.CustomFormData;
+import com.platform.dao.mapper.custom.CustomFormBomFieldMapper;
 import com.platform.dao.mapper.custom.CustomFormDataMapper;
+import com.platform.dao.mapper.custom.CustomFormMapper;
+import com.platform.dao.vo.query.custom.CustomFormDataVO;
+import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.custom.CustomFormDataService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import com.platform.service.base.impl.BaseServiceImpl;
-import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
-import lombok.AllArgsConstructor;
 
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -23,9 +34,13 @@ import java.util.List;
  * @Date 2024-06-03 16:58:32
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
-@AllArgsConstructor
 @Service("customFormDataService")
+@Slf4j
 public class CustomFormDataServiceImpl extends BaseServiceImpl<CustomFormDataMapper, CustomFormData, CustomFormDataDTO> implements CustomFormDataService {
+    @Resource
+    private CustomFormBomFieldMapper customFormBomFieldMapper;
+    @Resource
+    private CustomFormMapper customFormMapper;
 
     @Override
     public int batchDelete(List<String> ids) {
@@ -44,9 +59,45 @@ public class CustomFormDataServiceImpl extends BaseServiceImpl<CustomFormDataMap
 
     @Override
     public CustomFormData saveByDTO(CustomFormDataDTO record) {
+        log.info("新增dataJson===" + record.getJsonString());
+        checkPreview(record);
+        CustomForm form = customFormMapper.selectByPrimaryKey(record.getFormId());
+        // 新增data
+        CustomFormData data = BeanConverterUtil.copyObjectProperties(record, CustomFormData.class);
+        packageData(data);
+
+        // 获取的查询字段值
+        CustomFormBomField fieldQuery = new CustomFormBomField();
+        fieldQuery.setFormId(record.getFormId());
+        List<CustomFormBomField> fieldList = customFormBomFieldMapper.select(fieldQuery);
+        // 新增bom表（存储查询的value值）
+        CustomFormBom bom = addBom(record,fieldList);
         return null;
     }
 
+    private void packageData(CustomFormData data) {
+        data.setId(IdGeneratorUtils.getObjectId());
+        data.setCreatedTime(LocalDateTime.now());
+        data.setCreatedUserName(SecurityUtils.getUserInfo().getRealName());
+        data.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
+        // 根据jsonString 存储targetId
+    }
+
+    private void checkPreview(CustomFormDataDTO record) {
+        if(StringUtils.isBlank(record.getFormId())){
+            throw new DeniedException("表单模板ID不能为空");
+        }
+    }
+
+    private CustomFormBom addBom(CustomFormDataDTO record, List<CustomFormBomField> fieldList){
+        CustomFormBom bom = new CustomFormBom();
+        bom.setApplyMan(SecurityUtils.getUserInfo().getRealName());
+        bom.setApplyTime(LocalDateTime.now());
+        bom.setId(IdGeneratorUtils.getObjectId());
+        //bom.setDataId()
+        return bom;
+    }
+
     @Override
     public AbstractPageResultBean<CustomFormData> selectPageInfo(CustomFormDataDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);

platform-service/src/main/java/com/platform/service/custom/impl/CustomFormServiceImpl.java

@@ -142,7 +142,8 @@ public class CustomFormServiceImpl extends BaseServiceImpl<CustomFormMapper, Cus
 
     private List<CustomFormBomField> packageField(String id, List<CustomFieldDTO> queryFields){
         List<CustomFormBomField> fields = new ArrayList<CustomFormBomField>();
-        queryFields.forEach(field -> {
+        int sortNum = 1;
+        for(CustomFieldDTO field : queryFields){
             if(StringUtils.isBlank(field.getFieldName())){
                 throw new DeniedException("属性名称不能为空");
             }
@@ -162,8 +163,10 @@ public class CustomFormServiceImpl extends BaseServiceImpl<CustomFormMapper, Cus
             bomField.setFiledName(field.getFieldName());
             bomField.setDataType(field.getDataType());
             bomField.setDataJson(field.getDataJson());
+            bomField.setBomFieldName("cdefine"+sortNum);
             fields.add(bomField);
-        });
+            sortNum++;
+        }
         return fields;
     }