Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.dataaggre.service.impl;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
@@ -142,12 +143,12 @@ public class AggreGridServiceImpl implements AggreGridService {
                     if (data != null) {
                         data.setPatrolRoutineWorkTimes(d.getPatrolRoutineWorkTimes());
                         data.setPatrolTimes(d.getPatrolTimes());
-
+                        data.setTotalTime(NumConstant.ZERO_STR);
                         int totalTime = d.getTotalTime();
-                        if (totalTime > 0){
-                            int minutes = totalTime / 60;
-                            if (minutes > 0){
-                                String totalTimeDesc = minutes / 60 + "小时"+ minutes % 60 + "分钟";
+                        if (totalTime > NumConstant.ZERO){
+                            int minutes = totalTime / NumConstant.SIXTY;
+                            if (minutes > NumConstant.ZERO){
+                                String totalTimeDesc = minutes / NumConstant.SIXTY + "小时"+ minutes % NumConstant.SIXTY + "分钟";
                                 data.setTotalTime(totalTimeDesc);
                             }
                         }

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 -> {
-                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 +476,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
                     for (TimeDTO t : timeList) {
                         if (s.equals(t.getTimeId())){
                             t.setIsAppointment(false);
+                            t.setIsMiss(true);
                             break;
                         }
                     }