zxc 4 years ago
parent
commit
36484f8fa1
  1. 2
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/TimeDTO.java
  2. 18
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java

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

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

Loading…
Cancel
Save