首页-待办

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/controller/TodoController.java

@@ -32,6 +32,28 @@ public class TodoController {
         return todoService.todoNum(todoRequest);
     }
 
+    /**
+     * @param
+     * @return
+     * @description 团队申请团队待办
+     * @date 2020/2/24 10:38 上午
+     */
+    @RequestMapping("/companyApplyTodo")
+    public RestResponse companyApplyTodo(@RequestBody TodoRequest todoRequest) {
+        return todoService.companyApplyTodo(todoRequest);
+    }
+
+    /**
+     * @param
+     * @return
+     * @description 用户申请加入团队待办
+     * @date 2020/2/24 11:30 上午
+     */
+    @RequestMapping("/companyUserApplyTodo")
+    public RestResponse companyUserApplyTodo(@RequestBody TodoRequest todoRequest) {
+        return todoService.companyApplyUserTodo(todoRequest);
+    }
+
     /**
      * @param
      * @return

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/dao/dto/request/LiftDataRequest.java

@@ -36,7 +36,7 @@ public class LiftDataRequest {
     /**
      * 终止时间-字符串
      */
-    private String endTimeStr;
+    private String endDateStr;
 
     /**
      * 公司id集合

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/dao/dto/request/TodoRequest.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.system.homepage.dao.dto.request;
 
+import cn.com.ty.lift.common.constants.ApiConstants;
 import lombok.Data;
 
 /**
@@ -13,4 +14,34 @@ public class TodoRequest {
      * 公司id
      */
     private Long mtCompanyId;
+
+    /**
+     * 页数
+     */
+    private Long pageNum;
+
+    /**
+     * 每页的条数
+     */
+    private Long pageSize;
+
+    /**
+     * 用户申请状态 获取待审核的用户申请信息
+     */
+    private Integer status = ApiConstants.ApplicationConstants.APPLY_WAIT;
+
+    /**
+     * 团队申请状态
+     */
+    private Integer isCertificated = ApiConstants.CompanyConstants.MAINTENANCE_WAIT_CERTIFICATE;
+
+    /**
+     * @param
+     * @return
+     * @description 获取页数 条数-1
+     * @date 2020/2/24 9:48 上午
+     */
+    public Long getPageNum() {
+        return pageNum - 1;
+    }
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/dao/dto/response/CompanyApplyResponse.java

@@ -0,0 +1,53 @@
+package cn.com.ty.lift.system.homepage.dao.dto.response;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * @author huangyuan
+ * @date 2020/2/24
+ * @description 企业申请待办
+ */
+@Data
+public class CompanyApplyResponse {
+    /**
+     * 申请id
+     */
+    private Long applyId;
+
+    /**
+     * 公司id
+     */
+    private Long mtCompanyId;
+
+    /**
+     * 团队名称
+     */
+    private String companyName;
+
+    /**
+     * 注册时间
+     */
+    private LocalDate createTime;
+
+    /**
+     * 团队人数
+     */
+    private Long companyUserNum = 0L;
+
+    /**
+     * 联系人名称
+     */
+    private String contactsName;
+
+    /**
+     * 联系人电话
+     */
+    private String contactsTel;
+
+    /**
+     * 团队描述
+     */
+    private String remarks;
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/dao/dto/response/CompanyUserApplyResponse.java

@@ -0,0 +1,50 @@
+package cn.com.ty.lift.system.homepage.dao.dto.response;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author huangyuan
+ * @date 2020/2/24
+ * @description 团队用户申请
+ */
+@Data
+public class CompanyUserApplyResponse {
+
+    /**
+     * 申请消息id
+     */
+    private Long userApplyId;
+
+    /**
+     * 头像路径
+     */
+    private String avatarUrl;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 用户类型
+     */
+    private Integer userType;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 申请事项 1 加入团队 2加入项目
+     */
+    private Integer type;
+
+    /**
+     * 申请时间
+     */
+    private LocalDateTime applyDate;
+
+}

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

@@ -2,15 +2,11 @@ package cn.com.ty.lift.system.homepage.dao.mapper;
 
 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.AnnualInspectionDataModel;
-import cn.com.ty.lift.system.homepage.dao.model.EmergencyRecordDataModel;
-import cn.com.ty.lift.system.homepage.dao.model.MtPlanDataModel;
-import cn.com.ty.lift.system.homepage.dao.model.MtRecordDataModel;
+import cn.com.ty.lift.system.homepage.dao.model.*;
 import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest;
 import cn.com.xwy.boot.mybatis.MyBatisMapper;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author huangyuan
@@ -49,7 +45,7 @@ public interface CommonDataMapper {
      * @description 获取公司项目数
      * @date 2020/2/19 12:22 下午
      */
-    Map<Long, Long> getMtCompanyIdToProjectNum(MaintenanceCompanyRequest maintenanceCompanyRequest);
+    List<CountDataModel> getMtCompanyIdToProjectNum(MaintenanceCompanyRequest maintenanceCompanyRequest);
 
     /**
      * @param
@@ -57,7 +53,7 @@ public interface CommonDataMapper {
      * @description 获取公司id -> 维保记录
      * @date 2020/2/19 2:28 下午
      */
-    Map<Long, Long> getMtCompanyIdToMtRecord(MaintenanceCompanyRequest maintenanceCompanyRequest);
+    List<CountDataModel> getMtCompanyIdToMtRecord(MaintenanceCompanyRequest maintenanceCompanyRequest);
 
     /**
      * @param
@@ -65,7 +61,7 @@ public interface CommonDataMapper {
      * @description 获取公司id -> 急修记录
      * @date 2020/2/19 3:07 下午
      */
-    Map<Long, Long> getMtCompanyIdToEmergencyRecord(MaintenanceCompanyRequest maintenanceCompanyRequest);
+    List<CountDataModel> getMtCompanyIdToEmergencyRecord(MaintenanceCompanyRequest maintenanceCompanyRequest);
 
     /**
      * @param

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

@@ -1,10 +1,7 @@
 package cn.com.ty.lift.system.homepage.dao.mapper;
 
 import cn.com.ty.lift.system.homepage.dao.dto.request.TodoRequest;
-import cn.com.ty.lift.system.homepage.dao.dto.response.AnnualInspectionResponse;
-import cn.com.ty.lift.system.homepage.dao.dto.response.CapitalRepairResponse;
-import cn.com.ty.lift.system.homepage.dao.dto.response.EmergencyResponse;
-import cn.com.ty.lift.system.homepage.dao.dto.response.MaintenanceTodoResponse;
+import cn.com.ty.lift.system.homepage.dao.dto.response.*;
 import cn.com.xwy.boot.mybatis.MyBatisMapper;
 
 import java.util.List;
@@ -80,4 +77,20 @@ public interface TodoDataMapper {
      * @date 2020/2/22 8:37 上午
      */
     List<AnnualInspectionResponse> getAnnualInspectionTodoData(TodoRequest todoRequest);
+
+    /**
+     * @param
+     * @return
+     * @description 获取团队申请待办信息
+     * @date 2020/2/24 10:41 上午
+     */
+    List<CompanyApplyResponse> getCompanyApplyTodo(TodoRequest todoRequest);
+
+    /**
+     * @param
+     * @return
+     * @description 获取团队成员申请待办信息
+     * @date 2020/2/24 10:41 上午
+     */
+    List<CompanyUserApplyResponse> getCompanyUserApplyTodo(TodoRequest todoRequest);
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/dao/model/CountDataModel.java

@@ -0,0 +1,21 @@
+package cn.com.ty.lift.system.homepage.dao.model;
+
+import lombok.Data;
+
+/**
+ * @author huangyuan
+ * @date 2020/2/24
+ * @description
+ */
+@Data
+public class CountDataModel {
+    /**
+     * 公司id
+     */
+    private Long mtCompanyId;
+
+    /**
+     * 数据条数
+     */
+    private Long dataCount;
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/service/LiftDataService.java

@@ -219,7 +219,7 @@ public class LiftDataService {
                 DateTimeFormatter.ofPattern(CommonConstants.PLAN_DATE_FORMAT));
         //设置时间段
         liftDataRequest.setStartDateStr(yesterdayStr);
-        liftDataRequest.setEndTimeStr(tomorrowStr);
+        liftDataRequest.setEndDateStr(tomorrowStr);
     }
 
     /**

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/service/TodoService.java

@@ -3,14 +3,13 @@ package cn.com.ty.lift.system.homepage.service;
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.system.constants.CommonConstants;
 import cn.com.ty.lift.system.homepage.dao.dto.request.TodoRequest;
-import cn.com.ty.lift.system.homepage.dao.dto.response.AnnualInspectionResponse;
-import cn.com.ty.lift.system.homepage.dao.dto.response.CapitalRepairResponse;
-import cn.com.ty.lift.system.homepage.dao.dto.response.EmergencyResponse;
-import cn.com.ty.lift.system.homepage.dao.dto.response.MaintenanceTodoResponse;
+import cn.com.ty.lift.system.homepage.dao.dto.response.*;
 import cn.com.ty.lift.system.homepage.dao.mapper.TodoDataMapper;
 import cn.com.ty.lift.system.settings.dao.entity.MtCompanyAttestation;
 import cn.com.ty.lift.system.settings.service.IMtCompanyAttestationService;
+import cn.com.ty.lift.system.user.dao.entity.MtCompanyUser;
 import cn.com.ty.lift.system.user.dao.entity.UserApplication;
+import cn.com.ty.lift.system.user.service.IMtCompanyUserService;
 import cn.com.ty.lift.system.user.service.IUserApplicationService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,6 +18,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author huangyuan
@@ -37,6 +37,9 @@ public class TodoService {
     @Resource
     private IUserApplicationService userApplicationService;
 
+    @Resource
+    private IMtCompanyUserService mtCompanyUserService;
+
     /**
      * @param todoRequest 公司id
      * @return
@@ -51,7 +54,7 @@ public class TodoService {
                 .eq("status", ApiConstants.ApplicationConstants.APPLY_WAIT)
         );
         //公司申请待办,平台公司才能有公司申请待办
-        if(todoRequest.getMtCompanyId() == ApiConstants.PLATFORM_COMPANY_ID){
+        if (todoRequest.getMtCompanyId() == ApiConstants.PLATFORM_COMPANY_ID) {
             long platCompanyTodoCount = mtCompanyAttestationService.count(new QueryWrapper<MtCompanyAttestation>()
                     .eq("is_certificated", ApiConstants.CompanyConstants.MAINTENANCE_WAIT_CERTIFICATE)
             );
@@ -117,4 +120,58 @@ public class TodoService {
                 .getAnnualInspectionTodoData(todoRequest);
         return RestResponse.success(annualInspectionResponseList, ApiConstants.RESULT_SUCCESS, "获取待办数据成功");
     }
+
+    /**
+     * @param
+     * @return
+     * @description 团队申请团队待办
+     * @date 2020/2/24 11:31 上午
+     */
+    public RestResponse companyApplyTodo(TodoRequest todoRequest) {
+        List<CompanyApplyResponse> companyApplyResponseList = todoDataMapper.getCompanyApplyTodo(todoRequest);
+        //设置团队人数
+        if (companyApplyResponseList != null && companyApplyResponseList.size() > 0) {
+            setCompanyUserNum(companyApplyResponseList);
+        }
+        return RestResponse.success(companyApplyResponseList, ApiConstants.RESULT_SUCCESS, "获取待办数据成功");
+    }
+
+    /**
+     * @param companyApplyResponseList 团队申请信息
+     * @return
+     * @description 设置团队人数
+     * @date 2020/2/24 12:05 下午
+     */
+    private void setCompanyUserNum(List<CompanyApplyResponse> companyApplyResponseList) {
+        List<Long> companyIdList = companyApplyResponseList.stream()
+                .map(CompanyApplyResponse::getMtCompanyId).collect(Collectors.toList());
+        //获取团队用户
+        List<MtCompanyUser> mtCompanyUserList = mtCompanyUserService.list(new QueryWrapper<MtCompanyUser>()
+                .in(companyIdList != null && companyIdList.size() > 0,
+                        "mt_company_id", companyIdList)
+        );
+        if (mtCompanyUserList != null && mtCompanyUserList.size() > 0) {
+            Map<Long, Long> companyIdToUserNum = mtCompanyUserList.stream()
+                    .collect(Collectors.groupingBy(MtCompanyUser::getMtCompanyId, Collectors.counting()));
+            //设置团队人数
+            companyApplyResponseList.forEach(companyApplyResponse -> {
+                if (companyIdToUserNum.size() > 0) {
+                    long userNum = companyIdToUserNum.get(companyApplyResponse.getMtCompanyId()) != null ?
+                            companyIdToUserNum.get(companyApplyResponse.getMtCompanyId()) : 0L;
+                    companyApplyResponse.setCompanyUserNum(userNum);
+                }
+            });
+        }
+    }
+
+    /**
+     * @param
+     * @return
+     * @description 用户申请加入团队待办
+     * @date 2020/2/24 11:31 上午
+     */
+    public RestResponse companyApplyUserTodo(TodoRequest todoRequest) {
+        List<CompanyUserApplyResponse> companyUserApplyResponseList = todoDataMapper.getCompanyUserApplyTodo(todoRequest);
+        return RestResponse.success(companyUserApplyResponseList, ApiConstants.RESULT_SUCCESS, "获取待办数据成功");
+    }
 }

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

@@ -7,6 +7,7 @@ import cn.com.ty.lift.system.homepage.dao.dto.request.LiftDataRequest;
 import cn.com.ty.lift.system.homepage.dao.dto.response.LiftDataResponse;
 import cn.com.ty.lift.system.homepage.dao.mapper.CommonDataMapper;
 import cn.com.ty.lift.system.homepage.dao.mapper.HomeLiftDataMapper;
+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;
@@ -225,7 +226,12 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         //将公司数据通过省份编码分组
         if (maintenanceCompanyList != null && maintenanceCompanyList.size() > 0) {
             provinceCodeToMaintenanceCompany = maintenanceCompanyList.stream()
-                    .collect(Collectors.groupingBy(MaintenanceCompany::getProvinceCode));
+                    .collect(Collectors.groupingBy(maintenanceCompany -> {
+                        if(StringUtils.isNotBlank(maintenanceCompany.getProvinceCode())){
+                            return maintenanceCompany.getProvinceCode();
+                        }
+                        return "0001";
+                    }));
         }
         return provinceCodeToMaintenanceCompany;
     }
@@ -250,19 +256,19 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
                     getMtCompanyIdToDealTime(companyIdList);
 
             //获取公司项目数
-            Map<Long, Long> mtCompanyIdToProjectNum = commonDataMapper.
-                    getMtCompanyIdToProjectNum(new MaintenanceCompanyRequest(companyIdList));
+            Map<Long, Long> mtCompanyIdToProjectNum = mtCompanyIdToNum(commonDataMapper.
+                    getMtCompanyIdToProjectNum(new MaintenanceCompanyRequest(companyIdList)));
 
             //获取公司电梯信息
             Map<Long, List<LiftMapDataModel>> companyIdToLiftData = getMtCompanyIdToLiftData(companyIdList);
 
             //获取公司维保记录数
-            Map<Long, Long> mtCompanyIdToMtRecordNum = commonDataMapper.getMtCompanyIdToMtRecord(
-                    new MaintenanceCompanyRequest(companyIdList));
+            Map<Long, Long> mtCompanyIdToMtRecordNum = mtCompanyIdToNum(commonDataMapper.getMtCompanyIdToMtRecord(
+                    new MaintenanceCompanyRequest(companyIdList)));
 
             //获取公司急修记录数
-            Map<Long, Long> mtCompanyIdToEmergencyRecordNum = commonDataMapper.getMtCompanyIdToEmergencyRecord(
-                    new MaintenanceCompanyRequest(companyIdList));
+            Map<Long, Long> mtCompanyIdToEmergencyRecordNum = mtCompanyIdToNum(
+                    commonDataMapper.getMtCompanyIdToEmergencyRecord(new MaintenanceCompanyRequest(companyIdList)));
 
             //循环设置认证公司信息
             for (MaintenanceCompany maintenanceCompany : maintenanceCompanyList) {
@@ -271,13 +277,19 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
             }
         }
     }
+
     /**
      * @param
      * @return
      * @description 设置认证企业信息
      * @date 2020/2/19 6:53 下午
      */
-    private void setConfirmCompany(List<ConfirmCompanyResponse> confirmCompanyResponseList, Map<Long, LocalDateTime> companyIdToDealTime, Map<Long, Long> mtCompanyIdToProjectNum, Map<Long, List<LiftMapDataModel>> companyIdToLiftData, Map<Long, Long> mtCompanyIdToMtRecordNum, Map<Long, Long> mtCompanyIdToEmergencyRecordNum, MaintenanceCompany maintenanceCompany) {
+    private void setConfirmCompany(List<ConfirmCompanyResponse> confirmCompanyResponseList,
+                                   Map<Long, LocalDateTime> companyIdToDealTime,
+                                   Map<Long, Long> mtCompanyIdToProjectNum,
+                                   Map<Long, List<LiftMapDataModel>> companyIdToLiftData,
+                                   Map<Long, Long> mtCompanyIdToMtRecordNum,
+                                   Map<Long, Long> mtCompanyIdToEmergencyRecordNum, MaintenanceCompany maintenanceCompany) {
         ConfirmCompanyResponse confirmCompanyResponse = new ConfirmCompanyResponse(maintenanceCompany);
         //设置认证时间
         if (companyIdToDealTime.size() > 0) {
@@ -346,5 +358,21 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         }
     }
 
+    /**
+     * @param
+     * @return
+     * @description 将条数集合转化为 公司id -> 条数
+     * @date 2020/2/24 2:06 下午
+     */
+    private Map<Long, Long> mtCompanyIdToNum(List<CountDataModel> countDataModelList) {
+        Map<Long, Long> mtCompanyIdToNum = new HashMap<>();
+        //将list转化为map
+        if(countDataModelList != null && countDataModelList.size() > 0) {
+            countDataModelList.forEach(countDataModel -> {
+                mtCompanyIdToNum.put(countDataModel.getMtCompanyId(), countDataModel.getDataCount());
+            });
+        }
+        return mtCompanyIdToNum;
+    }
 
 }

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

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!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.CommonDataMapper">
-
+    <!-- 公司id -> 数量sql -->
+    <sql id="companyIdToCountSql">
+        mt_company_id as mtCompanyId, count(mt_company_id) as dataCount
+    </sql>
     <!-- 公司id sql设置 -->
     <sql id="setCompanyId">
         <if test="companyIdList != null">
@@ -88,9 +91,9 @@
     <!-- 获取公司项目数 -->
     <select id="getMtCompanyIdToProjectNum"
             parameterType="cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest"
-            resultType="java.util.Map">
+            resultType="cn.com.ty.lift.system.homepage.dao.model.CountDataModel">
         select
-            mt_company_id,count(mt_company_id)
+            <include refid="companyIdToCountSql"></include>
         from
             project
         group by
@@ -104,9 +107,10 @@
 
     <!-- 获取公司维保记录 -->
     <select id="getMtCompanyIdToMtRecord"
-            parameterType="cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest">
+            parameterType="cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest"
+            resultType="cn.com.ty.lift.system.homepage.dao.model.CountDataModel">
         select
-            mt_company_id, count(mt_company_id)
+            <include refid="companyIdToCountSql"></include>
         from
             maintenance_record
         group by
@@ -120,9 +124,9 @@
     <!-- 获取公司急修记录 -->
     <select id="getMtCompanyIdToEmergencyRecord"
             parameterType="cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest"
-            resultType="java.util.Map">
+            resultType="cn.com.ty.lift.system.homepage.dao.model.CountDataModel">
         select
-            mt_company_id, count(mt_company_id)
+            <include refid="companyIdToCountSql"></include>
         from
             emergency_repair
         group by

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

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!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>
+
     <!-- 维保计划查询条件sql -->
     <sql id="maintenanceTodoQuerySql">
         where
@@ -25,6 +31,7 @@
             ai.mt_company_id = #{mtCompanyId}
     </sql>
 
+
     <!-- 获取维保计划待办事项 -->
     <select id="getMaintenanceTodoData"
             parameterType="cn.com.ty.lift.system.homepage.dao.dto.request.TodoRequest"
@@ -48,6 +55,7 @@
         on
             mp.worker_id = ui.user_id
         <include refid="maintenanceTodoQuerySql"></include>
+        <include refid="pageQuerySql"></include>
     </select>
 
     <!-- 获取急修待办数据 -->
@@ -81,6 +89,7 @@
         on
             er.worker_id = ui.user_id
         <include refid="emergencyTodoQuerySql"></include>
+        <include refid="pageQuerySql"></include>
     </select>
 
     <!-- 获取大修待办事项 -->
@@ -97,6 +106,7 @@
         from
             capital_repair cr
         <include refid="capitalTodoQuerySql"></include>
+        <include refid="pageQuerySql"></include>
     </select>
 
     <!-- 获取年检待办数据 -->
@@ -132,6 +142,53 @@
         on
             ui.user_id = plr.worker_id
         <include refid="annualInspectionTodoSql"></include>
+        <include refid="pageQuerySql"></include>
+    </select>
+
+    <!-- 获取团队申请待办信息 -->
+    <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">
+        select
+            mca.id as applyId,
+            mca.mt_company_id as mtCompanyId,
+            mca.attestation_name as companyName,
+            mca.contacts_name as contractsName,
+            mca.contacts_tel as contractsTel,
+            mca.remarks as remarks,
+            mca.create_time as createTime
+        from
+            mt_company_attestation mca
+        where
+            mca.is_certificated = #{isCertificated}
+        <include refid="pageQuerySql"></include>
+    </select>
+
+    <!-- 获取团队成员申请待办信息 -->
+    <select id="getCompanyUserApplyTodo" parameterType="cn.com.ty.lift.system.homepage.dao.dto.request.TodoRequest"
+            resultType="cn.com.ty.lift.system.homepage.dao.dto.response.CompanyUserApplyResponse">
+        select
+            ua.id as userApplyId,
+            ui.avatar_url as avatarUrl,
+            ui.name as userName,
+            u.type as userType,
+            u.mobile as mobile,
+            u.type as type,
+            u.create_date as applyDate
+        from
+            user_application ua
+        left join
+            user_info ui
+        on
+            ua.user_id = ui.user_id
+        left join
+            user_account u
+        on
+            ua.user_id = u.user_id
+        where
+            ua.mt_company_id = #{mtCompanyId}
+        and
+            ua.status = ${status}
+        <include refid="pageQuerySql"></include>
     </select>
 
     <!-- 获取急修待办条数 -->