guarantee-lsq преди 11 месеца
родител
ревизия
795d3a11b5

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

@@ -89,5 +89,7 @@ public class CustomFormBomFieldDTO extends BaseDTO implements Serializable {
     private String dataType; // 数据类型
 
     private String dataJson; // 数据
+    private String category;
+    private String type;
 
 }

+ 2 - 0
platform-dao/src/main/java/com/platform/dao/mapper/custom/CustomFormBomFieldMapper.java

@@ -23,4 +23,6 @@ public interface CustomFormBomFieldMapper extends MyMapper<CustomFormBomField> {
      */
     List<CustomFormBomFieldVO> selectList(CustomFormBomFieldDTO dto);
 
+    List<CustomFormBomFieldVO> selectByCategoryType(CustomFormBomFieldDTO dto);
+
 }

+ 14 - 0
platform-dao/src/main/resources/mapper/custom/CustomFormBomFieldMapper.xml

@@ -84,4 +84,18 @@
             <include refid="List_Condition"/>
         </where>
     </select>
+
+    <select id="selectByCategoryType" parameterType="com.platform.dao.dto.custom.CustomFormBomFieldDTO"
+            resultType="com.platform.dao.vo.query.custom.CustomFormBomFieldVO">
+        select field.* from t_custom_form_bom_field as field 
+            join t_custom_form form on field.form_id = form.id 
+        <where>
+            <if test="type != null and type != ''">
+                and form.type = #{type}
+            </if>
+            <if test="category != null and category != ''">
+                and form.category = #{category}
+            </if>
+        </where>
+    </select>
 </mapper>

+ 11 - 0
platform-rest/src/main/java/com/platform/rest/controller/custom/CustomFormBomFieldController.java

@@ -124,6 +124,17 @@ public class CustomFormBomFieldController {
         return new R<>(customFormBomFieldService.getModelListByDTO(customFormBomFieldDTO));
     }
 
+    /**
+     * 获取列表
+     *
+     * @param customFormBomFieldDTO 查询bom字段命名表DTO
+     * @return R
+     */
+    @GetMapping("/query/field")
+    public R queryField(CustomFormBomFieldDTO customFormBomFieldDTO) {
+        return new R<>(customFormBomFieldService.selectByCategoryType(customFormBomFieldDTO));
+    }
+
     /**
      * 查询bom字段命名表导出
      *

+ 6 - 0
platform-service/src/main/java/com/platform/service/custom/CustomFormBomFieldService.java

@@ -34,4 +34,10 @@ public interface CustomFormBomFieldService extends IBaseService<CustomFormBomFie
      */
     AbstractPageResultBean<CustomFormBomFieldVO> selectPageList(CustomFormBomFieldDTO record, int pageNum, int pageSize);
 
+    /**
+     * 获取查询字段集合
+     * @param dto
+     * @return
+     */
+    List<CustomFormBomFieldVO> selectByCategoryType(CustomFormBomFieldDTO dto);
 }

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

@@ -1,6 +1,8 @@
 package com.platform.service.custom.impl;
 
 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;
@@ -15,6 +17,7 @@ import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 import lombok.AllArgsConstructor;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -42,6 +45,17 @@ public class CustomFormBomFieldServiceImpl extends BaseServiceImpl<CustomFormBom
         return new MyPage(mapper.selectList(record));
     }
 
+    @Override
+    public List<CustomFormBomFieldVO> selectByCategoryType(CustomFormBomFieldDTO dto) {
+        if(StringUtils.isBlank(dto.getType())){
+            throw new DeniedException("表单类型不能为空");
+        }
+        if(StringUtils.isBlank(dto.getCategory())){
+            throw new DeniedException("归属分类不能为空");
+        }
+        return mapper.selectByCategoryType(dto);
+    }
+
     @Override
     public AbstractPageResultBean<CustomFormBomField> selectPageInfo(CustomFormBomFieldDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);