认证企业统计-最后活跃时间

lift-system-service/pom.xml

@@ -18,10 +18,10 @@
             <artifactId>xwy-spring-boot</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>cn.com.xwy</groupId>-->
-<!--            <artifactId>xwy-cloud-dependencies</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>cn.com.xwy</groupId>
+            <artifactId>xwy-cloud-dependencies</artifactId>
+        </dependency>
 
         <!-- 添加公共模块依赖 -->
         <dependency>

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/dao/mapper/CommonDataMapper.java

@@ -4,6 +4,7 @@ import cn.com.ty.lift.system.homepage.dao.dto.request.DataStatisticsRequest;
 import cn.com.ty.lift.system.homepage.dao.dto.request.LiftDataRequest;
 import cn.com.ty.lift.system.homepage.dao.dto.request.PlatformCalendarRequest;
 import cn.com.ty.lift.system.homepage.dao.model.*;
+import cn.com.ty.lift.system.settings.dao.entity.model.CompanyActiveVo;
 import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest;
 import cn.com.xwy.boot.mybatis.MyBatisMapper;
 
@@ -135,4 +136,13 @@ public interface CommonDataMapper {
      * @date 2020/4/24 3:52 下午
      */
     List<CountDataModel> getEveryYearCapitalCount(DataStatisticsRequest dataStatisticsRequest);
+
+    /**
+     * @return 企业的最近获取时间
+     * @methodName getCompanyLastActiveTime
+     * @Desc 获取企业的最近活跃时间
+     * @Author huangyuan
+     * @Date 2020/6/24 2:17 下午
+     */
+    List<CompanyActiveVo> getCompanyLastActiveTime();
 }

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

@@ -11,6 +11,7 @@ import cn.com.ty.lift.system.homepage.dao.model.CountDataModel;
 import cn.com.ty.lift.system.homepage.dao.model.LiftMapDataModel;
 import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import cn.com.ty.lift.system.settings.dao.entity.MtCompanyAttestation;
+import cn.com.ty.lift.system.settings.dao.entity.model.CompanyActiveVo;
 import cn.com.ty.lift.system.settings.dao.entity.model.ConfirmCompanyResponse;
 import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest;
 import cn.com.ty.lift.system.settings.dao.entity.model.TeamInfoResponse;
@@ -278,6 +279,15 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
             //获取公司id集合
             List<Long> companyIdList = maintenanceCompanyList.stream()
                     .map(MaintenanceCompany::getId).collect(Collectors.toList());
+
+            //获取企业对应的最近活跃时间
+            List<CompanyActiveVo> companyActiveVoList = commonDataMapper.getCompanyLastActiveTime();
+            Map<Long, LocalDateTime> companyToActiveTime = new HashMap<>();
+            if (companyActiveVoList != null && companyActiveVoList.size() > 0) {
+                companyToActiveTime = companyActiveVoList.stream().collect(Collectors.
+                        toMap(CompanyActiveVo::getCompanyId, CompanyActiveVo::getActiveTime));
+            }
+
             //设置企业团队人数
             setCompanyUserNum(maintenanceCompanyList);
 
@@ -304,7 +314,8 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
             for (MaintenanceCompany maintenanceCompany : maintenanceCompanyList) {
                 //设置认证企业信息
                 setConfirmCompany(confirmCompanyResponseList, companyIdToDealTime, mtCompanyIdToProjectNum,
-                        companyIdToLiftData, mtCompanyIdToMtRecordNum, mtCompanyIdToEmergencyRecordNum, maintenanceCompany);
+                        companyIdToLiftData, mtCompanyIdToMtRecordNum, mtCompanyIdToEmergencyRecordNum,
+                        companyToActiveTime, maintenanceCompany);
             }
         }
     }
@@ -320,7 +331,9 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
                                    Map<Long, Long> mtCompanyIdToProjectNum,
                                    Map<Long, List<LiftMapDataModel>> companyIdToLiftData,
                                    Map<Long, Long> mtCompanyIdToMtRecordNum,
-                                   Map<Long, Long> mtCompanyIdToEmergencyRecordNum, MaintenanceCompany maintenanceCompany) {
+                                   Map<Long, Long> mtCompanyIdToEmergencyRecordNum,
+                                   Map<Long, LocalDateTime> companyToActiveTime,
+                                   MaintenanceCompany maintenanceCompany) {
         ConfirmCompanyResponse confirmCompanyResponse = new ConfirmCompanyResponse(maintenanceCompany);
         //设置认证时间
         if (companyIdToDealTime.size() > 0) {
@@ -340,6 +353,10 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
             confirmCompanyResponse.setEmergencyNum(getLong(mtCompanyIdToEmergencyRecordNum.get(maintenanceCompany.getId())));
         }
         //设置最后活跃时间
+        if (companyToActiveTime != null && companyToActiveTime.size() > 0) {
+            confirmCompanyResponse.setLastActiveTime(companyToActiveTime.get(maintenanceCompany.getId()));
+        }
+
         confirmCompanyResponseList.add(confirmCompanyResponse);
     }
 
@@ -373,7 +390,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
             List<LiftMapDataModel> liftMapDataModels = companyIdToLiftData.get(maintenanceCompany.getId());
             if (liftMapDataModels != null && liftMapDataModels.size() > 0) {
                 //总台量
-                long totalLiftNum = liftMapDataModels.stream().count();
+                long totalLiftNum = liftMapDataModels.size();
                 //总停保台量
                 long totalStopLiftNum = liftMapDataModels.stream()
                         .filter(liftMapDataModel -> {

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/LoginController.java

@@ -73,7 +73,7 @@ public class LoginController {
     /**
      * @param userRequest mobile 用户手机号
      * @return
-     * @description app 卫星登录绑定用户手机号
+     * @description app 微信登录绑定用户手机号
      * @date 2020/5/7 10:43 上午
      */
     @PostMapping("/appBindMobile")

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

@@ -329,4 +329,15 @@
             SUBSTR(create_date, 1, 4)
     </select>
 
+    <!-- 获取企业的最近活跃时间 -->
+    <select id="getCompanyLastActiveTime" resultType="cn.com.ty.lift.system.settings.dao.entity.model.CompanyActiveVo">
+        select
+            mr.mt_company_id as companyId,
+            max(mr.create_date) as activeTime
+        from
+            maintenance_record mr
+        group by
+            mr.mt_company_id;
+    </select>
+
 </mapper>