diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java index 1a69370..49a7ab2 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java @@ -175,6 +175,20 @@ public class UserProjectController { return Result.success(projectService.updateById(entity)); } + /** + * 删除项目 + * + * @param request + * @return + */ + @Login + @PostMapping("/user/project/delete") + public Result deleteProject(@RequestBody UserProjectEntity request) { + boolean del = projectService.remove(Wrappers.lambdaQuery().eq(UserProjectEntity::getKey, request.getKey())); + return Result.success(del); + } + + /** * 查询项目详情 * 包含项目信息 项目保单项信息 项目主题 diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java index b647ca0..753e6da 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectResultController.java @@ -136,6 +136,8 @@ public class UserProjectResultController { exportProjectResultVO.getTitleList().forEach(item -> { writer.addHeaderAlias(item.getFieldKey(), item.getTitle()); }); + //设置每列默认宽度 + writer.setColumnWidth(-1, 20); // 一次性写出内容,使用默认样式,强制输出标题 writer.write(exportProjectResultVO.getResultList(), true); //out为OutputStream,需要写出到的目标流 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/UserProjectResultEntityImpl.java index 1938fc2..13d66aa 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/UserProjectResultEntityImpl.java @@ -90,10 +90,8 @@ public class UserProjectResultEntityImpl extends ServiceImpl allHeaderList = new ArrayList() {{ - addAll(ExportProjectResultVO.DEFAULT_HEADER_NAME); - addAll(titleList); - }}; + List allHeaderList = ExportProjectResultVO.DEFAULT_HEADER_NAME; + allHeaderList.addAll(titleList); return new ExportProjectResultVO(allHeaderList, resultList); } } \ No newline at end of file diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/vo/ExportProjectResultVO.java b/tduck-project/src/main/java/com/tduck/cloud/project/vo/ExportProjectResultVO.java index 1c13ce0..17e8039 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/vo/ExportProjectResultVO.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/vo/ExportProjectResultVO.java @@ -5,6 +5,7 @@ import com.tduck.cloud.common.entity.BaseEntity; import com.tduck.cloud.project.entity.UserProjectResultEntity; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.List; import java.util.Map; @@ -28,8 +29,14 @@ public class ExportProjectResultVO { * 默认字段 */ public final static List DEFAULT_HEADER_NAME = Lists.newArrayList( - new ExcelHeader(BaseEntity.Fields.createTime, "提交时间"), - new ExcelHeader(UserProjectResultEntity.Fields.submitAddress, "提交地址")); + new ExcelHeader() {{ + setFieldKey(BaseEntity.Fields.createTime); + setTitle("提交时间"); + }}, + new ExcelHeader() {{ + setFieldKey(UserProjectResultEntity.Fields.submitAddress); + setTitle("提交地址"); + }}); /** * 标题 @@ -47,6 +54,7 @@ public class ExportProjectResultVO { * excel表头标题 */ @Data + @NoArgsConstructor public static class ExcelHeader { private String fieldKey;