预约列表

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

@@ -40,6 +40,8 @@ public class AppointmentRecordResultDTO implements Serializable {
      */
     private String remark;
 
+    private Boolean isCancel;
+
     private String recordId;
     private String centerName;
     private String address;
@@ -65,5 +67,6 @@ public class AppointmentRecordResultDTO implements Serializable {
         this.appointmentTime = new ArrayList<>();
         this.recordId = "";
         this.appointmentDate = "";
+        this.isCancel = true;
     }
 }

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

@@ -35,6 +35,7 @@ import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.PartyServiceCenterConstant;
 import com.epmet.dao.IcMatterAppointmentRecordDao;
@@ -487,6 +488,10 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
             List<String> list = Arrays.asList(r.getTimeId().split(","));
             list.forEach(l -> timeList.stream().filter( t -> l.equals(t.getTimeId())).forEach(t -> time.add(t.getTime())));
             r.setAppointmentTime(time);
+            String endTime = time.get(time.size() - NumConstant.ONE).substring(6, -1);
+            if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + " " + endTime))){
+                r.setIsCancel(false);
+            }
         });
         return result;
     }
@@ -545,6 +550,10 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
                     List<String> list = Arrays.asList(r.getTimeId().split(","));
                     list.forEach(l -> timeList.stream().filter( t -> l.equals(t.getTimeId())).forEach(t -> time.add(t.getTime())));
                     r.setAppointmentTime(time);
+                    String endTime = time.get(time.size() - NumConstant.ONE).substring(6, -1);
+                    if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + " " + endTime))){
+                        r.setIsCancel(false);
+                    }
                 }
             });
         });

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml

@@ -67,5 +67,6 @@
           AND ar.ORG_ID = #{orgId}
           AND ar.CREATED_BY = #{userId}
           AND ar.`STATUS` = 'appointing'
+        ORDER BY ar.APPOINTMENT_DATE
     </select>
 </mapper>