From fc5da310b7b05399af5706ace833f4b2e116f6b4 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 12 Aug 2022 10:11:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AF=95=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/IcWorkLogExcel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java index 3b58d200b8..328f5fbc92 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java @@ -1,6 +1,7 @@ package com.epmet.excel; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; import java.util.Date; @@ -15,24 +16,30 @@ import java.util.Date; public class IcWorkLogExcel { @Excel(name = "网格员") + @ColumnWidth(25) private String createdUser; @Excel(name = "联系电话") + @ColumnWidth(25) private String mobile; @Excel(name = "所属镇街") + @ColumnWidth(25) private String allAgencyName; @Excel(name = "所属网格") + @ColumnWidth(25) private String gridName; @Excel(name = "标题") + @ColumnWidth(25) private String title; @Excel(name = "日志时间") private String logDate; @Excel(name = "日志类型") + @ColumnWidth(25) private String logType; @Excel(name = "内容") From bfedd0d720fcbeccc05440e3671e1fa64e158708 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 12 Aug 2022 10:22:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcWorkLogDao.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml index 0e0c4dae24..117786e879 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml @@ -66,7 +66,11 @@ SELECT wl.CREATED_USER, wl.MOBILE, - CONCAT( a.ALL_PARENT_NAME, '-', a.ORGANIZATION_NAME ) AS allAgencyName, + IF + ( + a.ALL_PARENT_NAME = '', + a.ORGANIZATION_NAME, + CONCAT( a.ALL_PARENT_NAME, '-', a.ORGANIZATION_NAME )) AS allAgencyName, g.GRID_NAME, wl.TITLE, wl.LOG_DATE, From 38660ca0224f96b4f001f0f20ed8d5401da2f18a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 12 Aug 2022 10:26:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=97=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/IcWorkLogExcel.java | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java index 328f5fbc92..34b09af786 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java @@ -1,11 +1,8 @@ package com.epmet.excel; import cn.afterturn.easypoi.excel.annotation.Excel; -import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; -import java.util.Date; - /** * 网格员工作日志 * @@ -15,31 +12,25 @@ import java.util.Date; @Data public class IcWorkLogExcel { - @Excel(name = "网格员") - @ColumnWidth(25) + @Excel(name = "网格员", width = 25) private String createdUser; - @Excel(name = "联系电话") - @ColumnWidth(25) + @Excel(name = "联系电话", width = 25) private String mobile; - @Excel(name = "所属镇街") - @ColumnWidth(25) + @Excel(name = "所属镇街", width = 25) private String allAgencyName; - @Excel(name = "所属网格") - @ColumnWidth(25) + @Excel(name = "所属网格", width = 25) private String gridName; - @Excel(name = "标题") - @ColumnWidth(25) + @Excel(name = "标题", width = 25) private String title; @Excel(name = "日志时间") private String logDate; - @Excel(name = "日志类型") - @ColumnWidth(25) + @Excel(name = "日志类型", width = 25) private String logType; @Excel(name = "内容") From 684b330af67e4f96eca55aded0c860dcac4ce53e Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 12 Aug 2022 10:33:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/excel/IcWorkLogExcel.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java index 34b09af786..04c86926d5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java @@ -12,10 +12,10 @@ import lombok.Data; @Data public class IcWorkLogExcel { - @Excel(name = "网格员", width = 25) + @Excel(name = "网格员", width = 15) private String createdUser; - @Excel(name = "联系电话", width = 25) + @Excel(name = "联系电话", width = 20) private String mobile; @Excel(name = "所属镇街", width = 25) @@ -27,19 +27,19 @@ public class IcWorkLogExcel { @Excel(name = "标题", width = 25) private String title; - @Excel(name = "日志时间") + @Excel(name = "日志时间", width = 15) private String logDate; - @Excel(name = "日志类型", width = 25) + @Excel(name = "日志类型", width = 15) private String logType; - @Excel(name = "内容") + @Excel(name = "内容", width = 100) private String content; - @Excel(name = "备注") + @Excel(name = "备注", width = 50) private String remark; - @Excel(name = "照片") + @Excel(name = "照片", width = 50) private String url; } \ No newline at end of file