Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.4__awardpoint_volunteerpid.sql

@@ -4,5 +4,5 @@ add COLUMN LOCATION_DETAIL VARCHAR(255) DEFAULT'' COMMENT '门牌号详细地址
 add COLUMN LONGITUDE VARCHAR(64) DEFAULT'' COMMENT '经度,需求人是ic的居民时，取所住楼栋的中心点位',
 add COLUMN LATITUDE VARCHAR(64) DEFAULT'' COMMENT '纬度,需求人是ic的居民时，取所住楼栋的中心点位',
 add COLUMN DEMAND_USER_HOUSE_ID VARCHAR(64) DEFAULT'' COMMENT '需求人是ic的居民时,记录下住的房屋id';
-alter table volunteer_info add COLUMN PID VARCHAR(64) comment '网格所属的组织id' after GRID_ID;
+-- alter table volunteer_info add COLUMN PID VARCHAR(64) comment '网格所属的组织id' after GRID_ID;
-alter table volunteer_info add COLUMN PIDS VARCHAR(255) comment '网格的所有上级' after PID;
+-- alter table volunteer_info add COLUMN PIDS VARCHAR(255) comment '网格的所有上级' after PID;

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/TimeDTO.java

@@ -18,5 +18,7 @@ public class TimeDTO implements Serializable {
 
     private Boolean isAppointment = true;
 
+    private Boolean isMiss = false;
+
     private String time;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java

@@ -438,12 +438,34 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
                 String concat = formDTO.getDate().concat(" ").concat(list.get(NumConstant.ONE)).concat(":00");
                 LocalDateTime parse = LocalDateTime.parse(concat, df);
                 t.setIsAppointment(parse.isAfter(now));
+                if (CollectionUtils.isNotEmpty(records)){
+                    records.forEach(r -> {
+                        String[] split = r.getTimeId().split(",");
+                        for (String s : split) {
+                            if (s.equals(t.getTimeId())) {
+                                t.setIsMiss(true);
+                                break;
+                            }
+                        }
+                    });
+                }
             }
         }
         if (LocalDate.now().isAfter(LocalDate.parse(formDTO.getDate()))){
-            timeList.forEach(t -> {
+            if (CollectionUtils.isNotEmpty(records)) {
+                records.forEach(r -> {
+                    String[] split = r.getTimeId().split(",");
+                    for (String s : split) {
+                        for (TimeDTO t : timeList) {
+                            if (s.equals(t.getTimeId())) {
                                 t.setIsAppointment(false);
+                                t.setIsMiss(true);
+                                break;
+                            }
+                        }
+                    }
                 });
+            }
             result.setTimeDetail(timeList);
             return result;
         }
@@ -454,6 +476,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
                     for (TimeDTO t : timeList) {
                         if (s.equals(t.getTimeId())){
                             t.setIsAppointment(false);
+                            t.setIsMiss(true);
                             break;
                         }
                     }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -157,8 +157,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             throw new RenException(String.format("没有找到事件记录,eventId:%s",formDTO.getEventId()));
         }
         ResiEventMentionEntity resiEventMentionEntity=resiEventMentionDao.selectUser(formDTO.getEventId(),formDTO.getUserId());
-        if (formDTO.getUserId().equals(eventEntity.getReportUserId()) || null == resiEventMentionEntity) {
+        if (formDTO.getUserId().equals(eventEntity.getReportUserId()) || null != resiEventMentionEntity) {
-            log.warn("其他用户（非报事人、非被@的人）不需要调用此接口，直接返回");
+            log.warn("报事人、被@的人不需要调用此接口，直接返回");
             return;
         }
         // 这个事件已经被查看了