Merge branch 'feature/worklog_zhy'

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java

@@ -3,8 +3,6 @@ package com.epmet.excel;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 网格员工作日志
  *
@@ -14,34 +12,34 @@ import java.util.Date;
 @Data
 public class IcWorkLogExcel {
 
-    @Excel(name = "网格员")
+    @Excel(name = "网格员", width = 15)
     private String createdUser;
 
-    @Excel(name = "联系电话")
+    @Excel(name = "联系电话", width = 20)
     private String mobile;
 
-    @Excel(name = "所属镇街")
+    @Excel(name = "所属镇街", width = 25)
     private String allAgencyName;
 
-    @Excel(name = "所属网格")
+    @Excel(name = "所属网格", width = 25)
     private String gridName;
 
-    @Excel(name = "标题")
+    @Excel(name = "标题", width = 25)
     private String title;
 
-    @Excel(name = "日志时间")
+    @Excel(name = "日志时间", width = 15)
     private String logDate;
 
-    @Excel(name = "日志类型")
+    @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;
 
 }

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,