diff --git a/doc/tduck.sql b/doc/tduck.sql index a34fec0..3a50e8a 100644 --- a/doc/tduck.sql +++ b/doc/tduck.sql @@ -103,6 +103,7 @@ CREATE TABLE `pr_project_template_item` ( `required` tinyint(1) NOT NULL COMMENT '是否必填', `placeholder` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '输入型提示文字', `sort` bigint(20) NULL DEFAULT 0 COMMENT '排序', + `span` int(10) NOT NULL DEFAULT '24' COMMENT '栅格宽度', `expand` json NULL COMMENT '扩展字段 表单项独有字段', `reg_list` json NULL COMMENT '正则表达式 ', `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '更新时间', diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java index e432000..5e6a299 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/UserProjectItemEntity.java @@ -67,6 +67,12 @@ public class UserProjectItemEntity extends BaseEntity { * 排序 */ private Long sort; + + /** + * 栅格宽度 + */ + private int span; + /** * 扩展字段 表单项独有字段 */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/request/OperateProjectItemRequest.java b/tduck-project/src/main/java/com/tduck/cloud/project/request/OperateProjectItemRequest.java index d9665d5..f1f1612 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/request/OperateProjectItemRequest.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/request/OperateProjectItemRequest.java @@ -59,6 +59,11 @@ public class OperateProjectItemRequest { * 排序 */ private Integer sort; + /** + * 栅格宽度 + */ + private String span; + /** * 扩展字段 表单项独有字段 */ diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultEntityImpl.java b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java similarity index 92% rename from tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultEntityImpl.java rename to tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java index 13d66aa..84c1bb9 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultEntityImpl.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java @@ -2,6 +2,7 @@ package com.tduck.cloud.project.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -12,6 +13,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.tduck.cloud.common.constant.CommonConstants; import com.tduck.cloud.common.entity.BaseEntity; +import com.tduck.cloud.common.exception.BaseException; import com.tduck.cloud.common.util.AddressUtils; import com.tduck.cloud.common.util.RedisUtils; import com.tduck.cloud.project.entity.UserProjectItemEntity; @@ -38,7 +40,7 @@ import static com.tduck.cloud.project.constant.ProjectRedisKeyConstants.PROJECT_ */ @Service("projectResultService") @RequiredArgsConstructor -public class UserProjectResultEntityImpl extends ServiceImpl implements UserProjectResultService { +public class UserProjectResultServiceImpl extends ServiceImpl implements UserProjectResultService { private final UserProjectItemService userProjectItemService; private final RedisUtils redisUtils; @@ -84,6 +86,9 @@ public class UserProjectResultEntityImpl extends ServiceImpl> resultList = resultEntityList.stream().map(item -> { Map processData = item.getProcessData(); processData.put(BaseEntity.Fields.createTime, item.getCreateTime());