From 5505ab99718143a6422db051a96715919e5ef0f7 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 10 Jun 2020 16:12:03 +0800
Subject: [PATCH] =?UTF-8?q?=20PC=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=9A=E7=BB=BC=E6=B2=BB=E7=9F=9B=E8=B0=83=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ConflictMediateController.java |  2 +-
 .../conflict/excel/ConflictMediateExcel.java  | 27 +------------------
 .../service/ConflictMediateService.java       | 10 +++++++
 .../impl/ConflictMediateServiceImpl.java      |  9 +++++++
 4 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/ConflictMediateController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/ConflictMediateController.java
index 3915c82..5afc0b5 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/ConflictMediateController.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/controller/ConflictMediateController.java
@@ -87,7 +87,7 @@ public class ConflictMediateController {
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<ConflictMediateDTO> list = conflictMediateService.list(params);
+        List<ConflictMediateDTO> list = conflictMediateService.export(params);
         ExcelUtils.exportExcelToTarget(response, null, list, ConflictMediateExcel.class);
     }
 
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/excel/ConflictMediateExcel.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/excel/ConflictMediateExcel.java
index 0fb0e7e..b9fb2d0 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/excel/ConflictMediateExcel.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/excel/ConflictMediateExcel.java
@@ -31,12 +31,9 @@ import java.util.Date;
 @Data
 public class ConflictMediateExcel {
 
-    @Excel(name = "主键")
+    @Excel(name = "序号")
     private String id;
 
-    @Excel(name = "提交人ID")
-    private Long userId;
-
     @Excel(name = "矛盾纠纷类型")
     private String conflictType;
 
@@ -64,26 +61,4 @@ public class ConflictMediateExcel {
     @Excel(name = "备注")
     private String remark;
 
-    @Excel(name = "提报时间")
-    private Date submitTime;
-
-    @Excel(name = "删除标记 0：未删除，1：已删除")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-
 }
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java
index 94061fb..468d8eb 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/ConflictMediateService.java
@@ -58,6 +58,16 @@ public interface ConflictMediateService extends BaseService<ConflictMediateEntit
      */
     List<ConflictMediateDTO> list(Map<String, Object> params);
 
+    /**
+     * 导出
+     *
+     * @param params
+     * @return java.util.List<ConflictMediateDTO>
+     * @author zhangyuan
+     * @date 2020-06-10
+     */
+    List<ConflictMediateDTO> export(Map<String, Object> params);
+
     /**
      * 单条查询
      *
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java
index 08c1024..30df82e 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java
@@ -79,6 +79,15 @@ public class ConflictMediateServiceImpl extends BaseServiceImpl<ConflictMediateD
         return ConvertUtils.sourceToTarget(entityList, ConflictMediateDTO.class);
     }
 
+    @Override
+    public List<ConflictMediateDTO> export(Map<String, Object> params) {
+        List<ConflictMediateEntity> entityList = baseDao.selectList(getWrapper(params));
+        for (int i = 0; i < entityList.size(); i++) {
+            entityList.get(i).setId(i+1+"");
+        }
+        return ConvertUtils.sourceToTarget(entityList, ConflictMediateDTO.class);
+    }
+
     private QueryWrapper<ConflictMediateEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);