From d8e9d0af3202ba96cee4cb3f67143149e0431a8d Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 14 May 2021 10:53:48 +0800
Subject: [PATCH] =?UTF-8?q?pc=E7=AB=AF=E6=A8=A1=E5=9D=97=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=85=E5=AE=B9=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/ModuleCategoryDTO.java      |  6 +++++
 .../epdc/entity/ModuleCategoryEntity.java     |  5 ++++
 .../impl/ModuleCategoryServiceImpl.java       | 23 +++++++++++++++++--
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleCategoryDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleCategoryDTO.java
index fee214ab..18eeeb88 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleCategoryDTO.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/ModuleCategoryDTO.java
@@ -27,6 +27,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Null;
 import java.io.Serializable;
+import java.util.List;
 
 
 /**
@@ -116,4 +117,9 @@ public class ModuleCategoryDTO extends TreeNode implements Serializable {
 
     private String label;
 
+
+    /**
+     * 详情样式
+     */
+    private List<String> detailStyle;
 }
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/ModuleCategoryEntity.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/ModuleCategoryEntity.java
index 521c7983..131df600 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/ModuleCategoryEntity.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/ModuleCategoryEntity.java
@@ -96,6 +96,11 @@ public class ModuleCategoryEntity extends BaseEpdcEntity {
      */
     private String commentFlag;
 
+    /**
+     * 详情样式
+     */
+    private String detailStyle;
+
     /**
      * 上级部门名称
      */
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/ModuleCategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/ModuleCategoryServiceImpl.java
index debdfb98..b61f1f2b 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/ModuleCategoryServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/ModuleCategoryServiceImpl.java
@@ -99,8 +99,11 @@ public class ModuleCategoryServiceImpl extends BaseServiceImpl<ModuleCategoryDao
             return null;
         }
         ModuleCategoryEntity entity = baseDao.getById(id);
-
-        return ConvertUtils.sourceToTarget(entity, ModuleCategoryDTO.class);
+        ModuleCategoryDTO moduleCategoryDTO = ConvertUtils.sourceToTarget(entity, ModuleCategoryDTO.class);
+        if(StringUtils.isNotBlank(entity.getDetailStyle())){
+            moduleCategoryDTO.setDetailStyle(Arrays.asList(entity.getDetailStyle().split(",")));
+        }
+        return moduleCategoryDTO;
     }
 
     @Override
@@ -127,6 +130,14 @@ public class ModuleCategoryServiceImpl extends BaseServiceImpl<ModuleCategoryDao
             }
             entity.setPids(pids);
         }
+        //处理detailStyle
+        StringBuffer detailStyle  = new StringBuffer();
+        if(dto.getDetailStyle().size()>0){
+            for (String detail : dto.getDetailStyle()) {
+                detailStyle.append(detail).append(",");
+            }
+        }
+        entity.setDetailStyle(detailStyle.substring(0,detailStyle.lastIndexOf(",")));
         insert(entity);
     }
     /**
@@ -223,6 +234,14 @@ public class ModuleCategoryServiceImpl extends BaseServiceImpl<ModuleCategoryDao
                 updateBatchById(moduleCategoryEntities);
             }
         }
+        //处理detailStyle
+        StringBuffer detailStyle  = new StringBuffer();
+        if(dto.getDetailStyle().size()>0){
+            for (String detail : dto.getDetailStyle()) {
+                detailStyle.append(detail).append(",");
+            }
+        }
+        entity.setDetailStyle(detailStyle.substring(0,detailStyle.lastIndexOf(",")));
         updateById(entity);
     }