From 5d50a105020c607d43f0a9881630309f42aba9f1 Mon Sep 17 00:00:00 2001
From: wangqing <250543222@qq.com>
Date: Thu, 18 Mar 2021 23:11:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=A1=A8=E5=8D=95=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E7=BB=93=E6=9E=9C=E5=AF=BC=E5=87=BA=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=20feat=EF=BC=9A=E5=88=A0=E9=99=A4=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/web/controller/UserProjectController.java  | 14 ++++++++++++++
 .../controller/UserProjectResultController.java    |  2 ++
 .../service/impl/UserProjectResultEntityImpl.java  |  6 ++----
 .../cloud/project/vo/ExportProjectResultVO.java    | 12 ++++++++++--
 4 files changed, 28 insertions(+), 6 deletions(-)

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.<UserProjectEntity>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<UserProjectResultMa
             processData.put(UserProjectResultEntity.Fields.submitAddress, item.getSubmitAddress());
             return processData;
         }).collect(Collectors.toList());
-        List<ExportProjectResultVO.ExcelHeader> allHeaderList = new ArrayList<ExportProjectResultVO.ExcelHeader>() {{
-            addAll(ExportProjectResultVO.DEFAULT_HEADER_NAME);
-            addAll(titleList);
-        }};
+        List<ExportProjectResultVO.ExcelHeader> 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<ExcelHeader> 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;