From 36484f8fa1668df588fa76d69e75733456f6902c Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 6 Jan 2022 16:06:08 +0800
Subject: [PATCH 1/2] emm

---
 .../src/main/java/com/epmet/dto/TimeDTO.java   |  2 ++
 .../impl/IcPartyServiceCenterServiceImpl.java  | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/TimeDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/TimeDTO.java
index 00b01c30fe..f80b084980 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/TimeDTO.java
+++ b/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;
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
index 9b1e1d02d0..bc76004610 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
@@ -441,9 +441,20 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
             }
         }
         if (LocalDate.now().isAfter(LocalDate.parse(formDTO.getDate()))){
-            timeList.forEach(t -> {
-                t.setIsAppointment(false);
-            });
+            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 +465,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
                     for (TimeDTO t : timeList) {
                         if (s.equals(t.getTimeId())){
                             t.setIsAppointment(false);
+                            t.setIsMiss(true);
                             break;
                         }
                     }

From be0c5f97a3a36a08c951d485b3a17beadfde76f7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 6 Jan 2022 16:09:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcPartyServiceCenterServiceImpl.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
index bc76004610..8522e229fb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
@@ -438,6 +438,17 @@ 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()))){