Merge remote-tracking branch 'origin/feature/syp_moduleCategory'

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;
 }

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/ModuleCategoryResultDTO.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.epdc.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 模块分类接口结果
@@ -69,4 +70,9 @@ public class ModuleCategoryResultDTO implements Serializable {
      */
     private Integer sort;
 
+    /**
+     * 详情样式
+     */
+    private String detailStyle;
+
 }

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;
+
     /**
      * 上级部门名称
      */

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,15 @@ 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 +235,16 @@ 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(",")));
+        }else {
+            entity.setDetailStyle("");
+        }
         updateById(entity);
     }
 

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml

@@ -63,7 +63,8 @@
            BANNER_FLAG,
            COMMENT_FLAG,
            REMARK,
-           SORT
+           SORT,
+           DETAIL_STYLE
         from epdc_module_category
         where DEL_FLAG='0' and ENABLE_FLAG ='1' and PID = #{pid}
         order by sort,UPDATED_TIME desc