Merge branch 'develop' into release_temp

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridMemberDataAnalysisResultDTO.java

@@ -22,7 +22,7 @@ public class GridMemberDataAnalysisResultDTO {
 
     // 巡查
     private int patrolTimes;
-    private double totalTime;
+    private String totalTime;
     private int patrolRoutineWorkTimes;
 
 }

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;
@@ -21,11 +22,7 @@ import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 @Service
 public class AggreGridServiceImpl implements AggreGridService {
@@ -144,13 +141,17 @@ public class AggreGridServiceImpl implements AggreGridService {
                 if (gridAndData != null) {
                     GridMemberDataAnalysisResultDTO data = gridAndData.get(d.getGridId());
                     if (data != null) {
-                        data.setPatrolTimes(d.getPatrolTimes());
-
-                        // 巡查时长，转为h为单位
-                        double f = ((double)d.getTotalTime()) / 3600;
-                        BigDecimal h = new BigDecimal(f).setScale(2, RoundingMode.HALF_UP);
-                        data.setTotalTime(h.doubleValue());
                         data.setPatrolRoutineWorkTimes(d.getPatrolRoutineWorkTimes());
+                        data.setPatrolTimes(d.getPatrolTimes());
+                        data.setTotalTime(NumConstant.ZERO_STR);
+                        int totalTime = d.getTotalTime();
+                        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/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java

@@ -196,7 +196,7 @@ public interface UserMessageTypeConstant {
      * 事件回复、立项、办结操作
      * rsi_event.id
      */
-    String EVENT ="event  ";
+    String EVENT ="event";
 
     /**
      * 需求接单、指派、确认服务时间操作

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)) {
-                t.setIsAppointment(false);
+                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-user/epmet-user-client/src/main/java/com/epmet/dto/result/PcWorkListResultDTO.java

@@ -42,7 +42,7 @@ public class PcWorkListResultDTO implements Serializable {
         /**
          * 事项类型名称
          */
-        private List<String> workTypeName;
+        private String workTypeName;
 
         /**
          * 有无异常
@@ -94,7 +94,7 @@ public class PcWorkListResultDTO implements Serializable {
         public PcWorkListResult() {
             this.title = "";
             this.workTypeCode = new ArrayList<>();
-            this.workTypeName = new ArrayList<>();
+            this.workTypeName = "";
             this.isNormal = "";
             this.happenAddress = "";
             this.happenTime = "";

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java

@@ -32,7 +32,7 @@ public class PcWorkListExport {
 
     @ExcelProperty("事项类型名称")
     @ColumnWidth(40)
-    private String workTypeNames;
+    private String workTypeName;
 
     @ExcelProperty("有无异常")
     private String isNormal;

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java

@@ -195,7 +195,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
             throw new EpmetException("查询网格名字失败...");
         }
         list.forEach(l -> {
-            l.setWorkTypeName(disposeWorkTypeCode(workTypeResult.getData(),l.getWorkTypeCode()));
+            l.setWorkTypeName(disposeWorkTypeCode(workTypeResult.getData(),l.getWorkTypeCode()).stream().collect(Collectors.joining(",")));
             gridNamesResult.getData().stream().filter(g -> l.getGridId().equals(g.getGridId())).forEach(g -> l.setGridName(g.getGridName()));
         });
         result.setList(list);
@@ -220,9 +220,6 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
                 formDTO.setPageNo(pageNo);
                 formDTO.setPageSize(pageSize);
                 List<PcWorkListResultDTO.PcWorkListResult> dtos = pcWorkList(formDTO).getList();
-                dtos.forEach(d -> {
-                    d.setWorkTypeNames(d.getWorkTypeName().toString());
-                });
                 List<PcWorkListExport> data = ConvertUtils.sourceToTarget(dtos, PcWorkListExport.class);
                 num = data.size();
                 excelWriter.write(data, writeSheet);