查询参数

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

@@ -1,12 +1,14 @@
 package com.platform.dao.vo.query.custom;
 
 import com.platform.common.bean.BaseVO;
+import com.platform.dao.dto.custom.CustomFieldDTO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * @Description 自定义表单表VO结果类
@@ -69,4 +71,6 @@ public class CustomFormVO extends BaseVO implements Serializable {
     private Integer status; // 表单状态 0 待发布 1 已发布 2 已废弃
 
     private String category; // 分类  category_type  设备 维修 采购 备件 仓库 巡检 点检  保养
+
+    private List<CustomFieldDTO> queryFields; // 查询参数设置
 }

platform-rest/src/main/java/com/platform/rest/controller/custom/CustomFormController.java

@@ -17,7 +17,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -41,8 +40,8 @@ public class CustomFormController {
      * @return R
      */
     @GetMapping("/{id}")
-    public R<CustomForm> getById(@PathVariable("id") String id) {
-        return new R<>(customFormService.getModelById(id));
+    public R<CustomFormVO> getById(@PathVariable("id") String id) {
+        return new R<>(customFormService.getVOById(id));
     }
 
     /**

platform-service/src/main/java/com/platform/service/custom/CustomFormService.java

@@ -37,4 +37,6 @@ public interface CustomFormService extends IBaseService<CustomForm, CustomFormDT
     CustomForm saveByDTO(CustomFormDTO record);
 
     void modByDTO(CustomFormDTO record);
+
+    CustomFormVO getVOById(String id);
 }

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

@@ -93,6 +93,30 @@ public class CustomFormServiceImpl extends BaseServiceImpl<CustomFormMapper, Cus
         mapper.updateByPrimaryKeySelective(form);
     }
 
+    @Override
+    public CustomFormVO getVOById(String id) {
+        CustomFormVO vo = BeanConverterUtil.copyObjectProperties(mapper.selectByPrimaryKey(id),CustomFormVO.class);
+        CustomFormBomField queryField = new CustomFormBomField();
+        queryField.setFormId(id);
+        vo.setQueryFields(transfer(customFormBomFieldMapper.select(queryField)));
+        return vo;
+    }
+
+    private List<CustomFieldDTO> transfer(List<CustomFormBomField> fields){
+        List<CustomFieldDTO> dtos = new ArrayList<>();
+        if(CollectionUtil.isNotEmpty(fields)){
+            fields.forEach(item->{
+                CustomFieldDTO dto = new CustomFieldDTO();
+                dto.setComments(item.getName());
+                dto.setFieldName(item.getFiledName());
+                dto.setDataJson(item.getDataJson());
+                dto.setDataType(item.getDataType());
+                dtos.add(dto);
+            });
+        }
+        return dtos;
+    }
+
     private List<CustomFormBomField> packageField(String id, List<CustomFieldDTO> queryFields){
         List<CustomFormBomField> fields = new ArrayList<CustomFormBomField>();
         queryFields.forEach(field -> {