近十条记录

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java

@@ -38,7 +38,7 @@ public class LatestTenResultDTO implements Serializable {
     /**
      * 发布时间yyyy-MM-dd HH:mm
      */
-    private String releaseTimed;
+    private String releaseTime;
 
     /**
      * 内容
@@ -90,7 +90,7 @@ public class LatestTenResultDTO implements Serializable {
         this.userId = "";
         this.releaseUserName = "";
         this.releaseUserHeadPhoto = "";
-        this.releaseTimed = "";
+        this.releaseTime = "";
         this.content = "";
         this.status = "";
         this.releaseUserFlag = false;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -2260,6 +2260,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 });
             }
         });
+        result.setList(latestTenData);
         return result;
     }
 
@@ -2285,7 +2286,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             ui.setUserId(u.getUserId());
             ui.setReleaseUserHeadPhoto(u.getHeadImgUrl());
             if (groupType.equals(ModuleConstant.GROUP_TYPE_BRANCH)){
-                ui.setReleaseUserName(u.getRealName());
+                ui.setReleaseUserName(u.getStreet() + "-" + u.getRealName());
             }else {
                 ui.setReleaseUserName(u.getShowName());
             }

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@@ -556,7 +556,7 @@
             ((SELECT
                   t.ID,
                   t.CREATED_BY AS userId,
-                  t.CREATED_TIME AS releaseTime,
+                  DATE_FORMAT(t.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime,
                   t.TOPIC_CONTENT AS content,
                   t.`STATUS` AS status,
                   IFNULL(t.ISSUE_ID,'') AS issueId,
@@ -573,7 +573,7 @@
              (SELECT
                  ai.ID,
                  ai.CREATED_BY AS userId,
-                 ai.CREATED_TIME AS releaseTime,
+                 DATE_FORMAT(ai.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime,
                  IFNULL(ac.CONTENT,'') AS content,
                  ai.`STATUS` AS status,
                  '' AS issueId,
@@ -590,7 +590,7 @@
              (SELECT
                   n.ID,
                   n.CREATED_BY AS userId,
-                  n.CREATED_TIME AS releaseTime,
+                  DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime,
                   n.CONTENT AS content,
                   '' AS status,
                   '' AS issueId,