更多-巡查记录列表-V2--接口调整

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffListResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dataaggre.dto.epmetuser.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -32,6 +33,7 @@ public class StaffListResultDTO implements Serializable {
     private Integer reportProjectCount;
     //巡查总时长
     private String totalTime = "";
+    @JsonIgnore
     private Integer timeNum;
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java

@@ -87,7 +87,6 @@ public class EpmetUserController {
     @PostMapping("staffpatrollist")
     @RequirePermission(requirePermission = RequirePermissionEnum.MORE_PATROL_RECORD_LIST)
     public Result<List<StaffListResultDTO>> staffPatrolList(@LoginUser TokenDto tokenDto, @RequestBody StaffListFormDTO formDTO) {
-        //String totalTimeDesc = minutes / 60 + "小时"+ minutes % 60 + "分";
         ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class);
         if (!"patrolTotal".equals(formDTO.getSortCode()) && !"latestPatrolledTime".equals(formDTO.getSortCode())
                 && !"reportProjectCount".equals(formDTO.getSortCode()) && !"totalTime".equals(formDTO.getSortCode())) {

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml

@@ -57,7 +57,7 @@
             ssp.staff_id AS staffId,
             cs.real_name AS staffName,
             cs.gender AS gender,
-            MAX(ssp.latest_patrol_time) AS patrolStartTime,
+            IFNULL(MAX(ssp.latest_patrol_time), '') AS patrolStartTime,
             IFNULL(SUM(ssp.patrol_total), 0) AS patrolTotal,
             ssp.latest_patrol_status AS STATUS,
             IFNULL(SUM(ssp.report_project_count), 0) AS reportProjectCount,