[chg] 年检流程，公告列表加入图片

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AnnouncementController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -71,8 +72,9 @@ public class AnnouncementController {
         if(records.size() > 0){
             List<Long> idList = records.stream().map(Announcement::getId).collect(Collectors.toList());
             List<AnnouncementImg> imgList = announcementImgService.listByAnnouncementIds(idList);
+            Map<Long, List<AnnouncementImg>> listMap = imgList.stream().collect(Collectors.groupingBy(AnnouncementImg::getAnnouncementId));
             for (AnnouncementResponse record : records) {
-                record.setImgs(imgList.stream().filter(img -> img.getAnnouncementId().equals(record.getId())).collect(Collectors.toList()));
+                record.setImgs(listMap.get(record.getId()));
             }
         }
         return RestResponse.success(CountPage.getCountPage(count, pages));

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/entity/Announcement.java

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -41,13 +42,13 @@ public class Announcement extends BaseEntity {
     /**
      * 标题
      */
-    @NotNull(message = "公告标题不能为空")
+    @NotEmpty(message = "公告标题不能为空")
     private String title;
 
     /**
      * 内容
      */
-    @NotNull(message = "公告内容不能为空")
+    @NotEmpty(message = "公告内容不能为空")
     private String content;
 
     /**

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/entity/Attendance.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
@@ -45,7 +46,7 @@ public class Attendance extends BaseEntity {
     /**
      * 经纬度
      */
-    @NotNull(message = "经纬度不能为空")
+    @NotEmpty(message = "经纬度不能为空")
     private String coordinate;
 
     /**
@@ -56,7 +57,7 @@ public class Attendance extends BaseEntity {
     /**
      * 地址
      */
-    @NotNull(message = "地址不能为空")
+    @NotEmpty(message = "地址不能为空")
     private String address;
 
     /**

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/entity/LiftCertificate.java

@@ -70,11 +70,13 @@ public class LiftCertificate extends BaseEntity {
     /**
      * 第一张图片路径
      */
+    @NotEmpty(message = "缺少操作证正反面图片")
     private String firstImgUrl;
 
     /**
      * 第二张图片路径
      */
+    @NotEmpty(message = "缺少操作证正反面图片")
     private String secondImgUrl;
 
     /**

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/service/AnnouncementImgService.java

@@ -27,7 +27,8 @@ public class AnnouncementImgService extends ServiceImpl<AnnouncementImgMapper, A
      */
     public List<AnnouncementImg> listByAnnouncement(Long announcementId){
         LambdaQueryWrapper<AnnouncementImg> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(AnnouncementImg::getAnnouncementId,announcementId);
+        lambdaQueryWrapper.eq(AnnouncementImg::getAnnouncementId, announcementId);
+        lambdaQueryWrapper.orderByAsc(AnnouncementImg::getSort);
         return list(lambdaQueryWrapper);
     }