认证企业列表返回企业是否vip，限制台量，公司id

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

@@ -13,6 +13,15 @@ import java.time.LocalDateTime;
  */
 @Data
 public class ConfirmCompanyResponse {
+    /**
+     * 公司id
+     */
+    private Long CompanyId;
+
+    /**
+     * 是否vip
+     */
+    private Integer vipFlag;
     /**
      * 公司名称
      */
@@ -76,9 +85,10 @@ public class ConfirmCompanyResponse {
      */
     private LocalDateTime lastActiveTime;
 
-    public ConfirmCompanyResponse(){}
+    public ConfirmCompanyResponse() {
+    }
 
-    public ConfirmCompanyResponse(MaintenanceCompany maintenanceCompany){
+    public ConfirmCompanyResponse(MaintenanceCompany maintenanceCompany) {
         this.companyName = maintenanceCompany.getName();
         this.limitedNum = maintenanceCompany.getLimitedNum();
         this.teamNum = Long.valueOf(maintenanceCompany.getUserNum());

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

@@ -317,12 +317,16 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
             Map<Long, Long> mtCompanyIdToEmergencyRecordNum = mtCompanyIdToNum(
                     commonDataMapper.getMtCompanyIdToEmergencyRecord(new MaintenanceCompanyRequest(companyIdList)));
 
-            //获取公司合同开始和结束日期
-            HashMap<Long, LocalDate> contractStartDate = new HashMap<>();
-            HashMap<Long, LocalDate> contractEndDate = new HashMap<>();
+            //获取公司合同开始和结束日期,是否vip，限制台量
+            Map<Long, LocalDate> contractStartDate = new HashMap<>();
+            Map<Long, LocalDate> contractEndDate = new HashMap<>();
+            Map<Long, Integer> vipFlags = new HashMap<>();
+            Map<Long, Integer> limitedNums = new HashMap<>();
             for (MaintenanceCompany maintenanceCompany : maintenanceCompanyList) {
                 contractStartDate.put(maintenanceCompany.getId(), maintenanceCompany.getContractStartDate());
                 contractEndDate.put(maintenanceCompany.getId(), maintenanceCompany.getContractEndDate());
+                vipFlags.put(maintenanceCompany.getId(), maintenanceCompany.getVipFlag());
+                limitedNums.put(maintenanceCompany.getId(), maintenanceCompany.getLimitedNum());
             }
 
             //循环设置认证公司信息
@@ -330,7 +334,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
                 //设置认证企业信息
                 setConfirmCompany(confirmCompanyResponseList, companyIdToDealTime, mtCompanyIdToProjectNum,
                         companyIdToLiftData, mtCompanyIdToMtRecordNum, mtCompanyIdToEmergencyRecordNum,
-                        companyToActiveTime, maintenanceCompany, contractStartDate, contractEndDate);
+                        companyToActiveTime, maintenanceCompany, contractStartDate, contractEndDate, vipFlags, limitedNums);
             }
         }
     }
@@ -351,9 +355,13 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
                                    Map<Long, Long> mtCompanyIdToEmergencyRecordNum,
                                    Map<Long, LocalDateTime> companyToActiveTime,
                                    MaintenanceCompany maintenanceCompany,
-                                   HashMap<Long, LocalDate> contractStartDate,
-                                   HashMap<Long, LocalDate> contractEndDate) {
+                                   Map<Long, LocalDate> contractStartDate,
+                                   Map<Long, LocalDate> contractEndDate,
+                                   Map<Long, Integer> vipFlags,
+                                   Map<Long, Integer> limitedNums) {
         ConfirmCompanyResponse confirmCompanyResponse = new ConfirmCompanyResponse(maintenanceCompany);
+        //设置公司id
+        confirmCompanyResponse.setCompanyId(maintenanceCompany.getId());
         //设置认证时间
         if (companyIdToDealTime.size() > 0) {
             confirmCompanyResponse.setConfirmTime(companyIdToDealTime.get(maintenanceCompany.getId()));
@@ -383,6 +391,14 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         if (contractEndDate != null && contractEndDate.size() > 0) {
             confirmCompanyResponse.setContractEndDate(contractEndDate.get(maintenanceCompany.getId()));
         }
+        //设置企业是否是Vip
+        if (vipFlags != null && vipFlags.size() > 0) {
+            confirmCompanyResponse.setVipFlag(vipFlags.get(maintenanceCompany.getId()));
+        }
+        //设置企业限制台量
+        if (limitedNums != null && limitedNums.size() > 0) {
+            confirmCompanyResponse.setLimitedNum(limitedNums.get(maintenanceCompany.getId()));
+        }
         confirmCompanyResponseList.add(confirmCompanyResponse);
     }