首页待办数据调整

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/model/ConfirmCompanyResponse.java

@@ -25,37 +25,37 @@ public class ConfirmCompanyResponse {
     /**
      * 团队人数
      */
-    private Long teamNum;
+    private Long teamNum = 0L;
 
     /**
      * 项目数
      */
-    private Long projectNum;
+    private Long projectNum = 0L;
 
     /**
      * 总台量
      */
-    private Long totalLiftNum;
+    private Long totalLiftNum = 0L;
 
     /**
      * 活跃台量
      */
-    private Long activeLiftNum;
+    private Long activeLiftNum = 0L;
 
     /**
      * 停止服务台量
      */
-    private Long stopLiftNum;
+    private Long stopLiftNum = 0L;
 
     /**
      * 维保次数
      */
-    private Long maintenanceNum;
+    private Long maintenanceNum = 0L;
 
     /**
      * 急修次数
      */
-    private Long emergencyNum;
+    private Long emergencyNum = 0L;
 
     /**
      * 最后活跃时间

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MaintenanceCompanyServiceImpl.java

@@ -228,7 +228,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         if (maintenanceCompanyList != null && maintenanceCompanyList.size() > 0) {
             provinceCodeToMaintenanceCompany = maintenanceCompanyList.stream()
                     .collect(Collectors.groupingBy(maintenanceCompany -> {
-                        if(StringUtils.isNotBlank(maintenanceCompany.getProvinceCode())){
+                        if (StringUtils.isNotBlank(maintenanceCompany.getProvinceCode())) {
                             return maintenanceCompany.getProvinceCode();
                         }
                         return "0001";
@@ -298,16 +298,16 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         }
         //设置公司项目数
         if (mtCompanyIdToProjectNum != null && mtCompanyIdToProjectNum.size() > 0) {
-            confirmCompanyResponse.setProjectNum(mtCompanyIdToProjectNum.get(maintenanceCompany.getId()));
+            confirmCompanyResponse.setProjectNum(getLong(mtCompanyIdToProjectNum.get(maintenanceCompany.getId())));
         }
         setLiftUnitsNum(companyIdToLiftData, maintenanceCompany, confirmCompanyResponse);
         //设置公司维保数
         if (mtCompanyIdToMtRecordNum != null && mtCompanyIdToMtRecordNum.size() > 0) {
-            confirmCompanyResponse.setMaintenanceNum(mtCompanyIdToMtRecordNum.get(maintenanceCompany.getId()));
+            confirmCompanyResponse.setMaintenanceNum(getLong(mtCompanyIdToMtRecordNum.get(maintenanceCompany.getId())));
         }
         //设置公司急修数
         if (mtCompanyIdToEmergencyRecordNum != null && mtCompanyIdToEmergencyRecordNum.size() > 0) {
-            confirmCompanyResponse.setEmergencyNum(mtCompanyIdToEmergencyRecordNum.get(maintenanceCompany.getId()));
+            confirmCompanyResponse.setEmergencyNum(getLong(mtCompanyIdToEmergencyRecordNum.get(maintenanceCompany.getId())));
         }
         //设置最后活跃时间
         confirmCompanyResponseList.add(confirmCompanyResponse);
@@ -368,12 +368,20 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
     private Map<Long, Long> mtCompanyIdToNum(List<CountDataModel> countDataModelList) {
         Map<Long, Long> mtCompanyIdToNum = new HashMap<>();
         //将list转化为map
-        if(countDataModelList != null && countDataModelList.size() > 0) {
+        if (countDataModelList != null && countDataModelList.size() > 0) {
             countDataModelList.forEach(countDataModel -> {
-                mtCompanyIdToNum.put(countDataModel.getMtCompanyId(), countDataModel.getDataCount());
+                long count = countDataModel.getDataCount() != null ? countDataModel.getDataCount() : 0L;
+                mtCompanyIdToNum.put(countDataModel.getMtCompanyId(), count);
             });
         }
         return mtCompanyIdToNum;
     }
 
+    private long getLong(Long longValue) {
+        if(longValue != null) {
+            return longValue;
+        }
+        return 0L;
+    }
+
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MtCompanyAttestationServiceImpl.java

@@ -36,7 +36,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -260,9 +259,9 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
         //将信息封装为 mtCompanyId(公司id) -> dealTime(处理时间)
         Map<Long, LocalDateTime> companyIdToDealTime = new HashMap<>();
         if (mtCompanyAttestationList != null && mtCompanyAttestationList.size() > 0) {
-            companyIdToDealTime = mtCompanyAttestationList.stream()
-                    .collect(Collectors.toMap(MtCompanyAttestation::getMtCompanyId,
-                            MtCompanyAttestation::getDealTime));
+            mtCompanyAttestationList.forEach(mtCompanyAttestation -> {
+                companyIdToDealTime.put(mtCompanyAttestation.getMtCompanyId(), mtCompanyAttestation.getDealTime());
+            });
         }
         return companyIdToDealTime;
     }

lift-system-service/src/main/resources/mapper/TodoDataMapper.xml

@@ -2,6 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.com.ty.lift.system.homepage.dao.mapper.TodoDataMapper">
 
+    <!-- 分页查询sql -->
+    <sql id="pageQuerySql">
+        limit #{pageNum} , #{pageSize}
+    </sql>
+
     <!-- 获取团队申请待办信息 -->
     <select id="getCompanyApplyTodo" parameterType="cn.com.ty.lift.system.homepage.dao.dto.request.TodoRequest"
             resultType="cn.com.ty.lift.system.homepage.dao.dto.response.CompanyApplyResponse">