企业设置 / 团队申请管理

默认已审核用户名/手机号信息为当前公司企管员信息

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/mapper/MaintenanceCompanyMapper.java

@@ -2,6 +2,9 @@ package cn.com.ty.lift.system.settings.dao.mapper;
 
 import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MaintenanceCompanyMapper extends BaseMapper<MaintenanceCompany> {
 
+
+    /**
+     * 维保公司ID查询维保公司信息,默认查询企业管理员为公司的创建者
+     *
+     * @param ids
+     * @return
+     */
+    List<MaintenanceCompany> getList(@Param("ids") List<Long> ids);
+
 }

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

@@ -12,6 +12,7 @@ import cn.com.ty.lift.system.settings.dao.entity.model.CompanyAttestationRequest
 import cn.com.ty.lift.system.settings.dao.entity.model.CompanyAttestationResponse;
 import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest;
 import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyResponse;
+import cn.com.ty.lift.system.settings.dao.mapper.MaintenanceCompanyMapper;
 import cn.com.ty.lift.system.settings.dao.mapper.MtCompanyAttestationMapper;
 import cn.com.ty.lift.system.settings.service.GlobalSetService;
 import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
@@ -74,6 +75,9 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
     @Resource
     private IUserApplicationService userApplicationService;
 
+    @Resource
+    private MaintenanceCompanyMapper maintenanceCompanyMapper;
+
     @Override
     @Transactional
     public RestResponse applyAudit(CompanyAttestationRequest companyAttestationRequest) {
@@ -213,6 +217,8 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
                         .or()
                         .like("contacts_tel", companyAttestationRequest.getQueryCondition())
                 )
+                .orderByDesc("create_time")
+
         );
         List<CompanyAttestationResponse> companyAttestationResponseList = new ArrayList<>();
         List<MtCompanyAttestation> mtCompanyAttestationList = mtCompanyAttestationPage.getRecords();
@@ -226,8 +232,13 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
             //获取公司信息
             List<Long> companyIdList = ProjectUtils.getAttrList(mtCompanyAttestationList,
                     "mtCompanyId", null);
-            List<MaintenanceCompany> maintenanceCompanyList = (List<MaintenanceCompany>)
-                    maintenanceCompanyService.listByIds(companyIdList);
+
+            /**
+             *查询维保公司,顺便查询公司的企管员
+             */
+            List<MaintenanceCompany> maintenanceCompanyList =
+                    maintenanceCompanyMapper.getList(companyIdList);
+
             Map<Long, MaintenanceCompany> companyIdToMaintenanceCompany = ProjectUtils.attrToObjMap(maintenanceCompanyList, "id", null);
             for (MtCompanyAttestation mtCompanyAttestation : mtCompanyAttestationList) {
                 CompanyAttestationResponse companyAttestationResponse = new CompanyAttestationResponse(mtCompanyAttestation);
@@ -246,6 +257,14 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
                     Integer limitedNum = maintenanceCompany.getLimitedNum() != null ? maintenanceCompany.getLimitedNum() : 0;
                     companyAttestationResponse.setVipFlag(vipFlag);
                     companyAttestationResponse.setLimitedNum(limitedNum);
+
+                    //判断是否是 已审核查询
+                    if (companyAttestationRequest.getIsCertificated() == ApiConstants.CompanyConstants.MAINTENANCE_PASS) {
+                        //设置用户名手机号为当前企业企管员信息
+                        companyAttestationResponse.setContactsName(maintenanceCompany.getCorporator());
+                        companyAttestationResponse.setContactsTel(maintenanceCompany.getTelephone());
+                    }
+
                 }
                 companyAttestationResponseList.add(companyAttestationResponse);
             }

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

@@ -0,0 +1,37 @@
+<?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.settings.dao.mapper.MaintenanceCompanyMapper">
+
+
+    <select id="getList" parameterType="list" resultType="cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany">
+        SELECT
+            mc.id,
+            mc.`name`,
+            mc.limited_num as limitedNum,
+            mc.vip_flag as vipFlag,
+            mm.mobile as telephone,
+            mm.`name` as corporator
+        FROM
+            maintenance_company AS mc
+        LEFT  JOIN (
+            SELECT
+                ui.mobile,
+                ui.`name`,
+                ur.company_id
+            FROM
+                user_role AS ur
+            RIGHT JOIN role AS r ON ur.company_id = r.company_id
+            AND ur.role_id = r.id
+            LEFT JOIN user_info AS ui ON ur.user_id = ui.user_id
+            WHERE
+                r.`code` = "ENTERPRISE_ADMIN"
+        ) AS mm ON mc.id = mm.company_id
+        WHERE
+            mc.id in
+        <foreach collection="ids" item="id" index="index" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+
+    </select>
+
+</mapper>