Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java

@@ -237,10 +237,18 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
         if (Objects.nonNull(region)) {
             userIds.addAll(region.members());
         }
+        //获取企业管理员到推送列表
         List<PushUserInfo> director = pushUserService.listEnterpriseAdmin(mtCompanyId);
+        //获取企业总经理
+        List<PushUserInfo> highDirectors = pushUserService.listHighDirector(mtCompanyId);
+        //添加企业管理员到推送列表
         List<PushUserInfo> pushUserInfos = new ArrayList<>(director);
+        //添加总经理到推送列表
+        pushUserInfos.addAll(highDirectors);
         if (!userIds.isEmpty()) {
+            //获取区域关联人员
             List<PushUserInfo> userInfos = pushUserService.listByUserIds(mtCompanyId, userIds);
+            //添加区域关联人员到推送列表
             pushUserInfos.addAll(userInfos);
         }
         log.info("新增电梯推送人员：" + pushUserInfos.toString());

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

@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 
@@ -213,6 +214,16 @@ public class MaintenanceCompany implements Serializable {
     @TableField(exist = false)
     private Integer userNum;
 
+    /**
+     * 合同开始时间
+     */
+    private LocalDate contractStartDate;
+
+    /**
+     * 合同结束时间
+     */
+    private LocalDate contractEndDate;
+
     /**
      * 是否当前团队 true表示是当前团队 false表示不是
      */

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

@@ -2,6 +2,7 @@ package cn.com.ty.lift.system.settings.dao.entity.model;
 
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -134,6 +135,16 @@ public class CompanyAttestationRequest {
      */
     private int defaultAssign = 0;
 
+    /**
+     * 合同开始时间
+     */
+    private LocalDate contractStartDate;
+
+    /**
+     * 合同结束时间
+     */
+    private LocalDate contractEndDate;
+
     /**
      * 每页的条数
      */

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

@@ -3,6 +3,7 @@ package cn.com.ty.lift.system.settings.dao.entity.model;
 import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -61,7 +62,15 @@ public class ConfirmCompanyResponse {
      * 急修次数
      */
     private Long emergencyNum = 0L;
+    /**
+     * 合同开始时间
+     */
+    private LocalDate contractStartDate;
 
+    /**
+     * 合同结束时间
+     */
+    private LocalDate contractEndDate;
     /**
      * 最后活跃时间
      */

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

@@ -2,6 +2,7 @@ package cn.com.ty.lift.system.settings.dao.entity.model;
 
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -27,6 +28,8 @@ public class MaintenanceCompanyRequest {
     private String menuIds;//菜单id集合
     private String provinceCode;//省份编码
     private Integer isCertificated;
+    private LocalDate contractStartDate;//合同开始时间
+    private LocalDate contractEndDate;//合同结束时间
     private int pageSize;//每页的条数
     private int pageNum;//第几页
 

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

@@ -34,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -155,6 +156,10 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         maintenanceCompany.setVipFlag(maintenanceCompanyRequest.getVipFlag());
         //更新电梯台量
         maintenanceCompany.setLimitedNum(maintenanceCompanyRequest.getLimitedNum());
+        //更新合同开始时间
+        maintenanceCompany.setContractStartDate(maintenanceCompanyRequest.getContractStartDate());
+        //更新合同结束时间
+        maintenanceCompany.setContractEndDate(maintenanceCompanyRequest.getContractEndDate());
         //更新企业菜单信息
         menuService.companyMenu(new MenuRequest(companyId, maintenanceCompanyRequest.getMenuIds()));
         this.updateById(maintenanceCompany);
@@ -312,18 +317,28 @@ 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<>();
+            for (MaintenanceCompany maintenanceCompany : maintenanceCompanyList) {
+                contractStartDate.put(maintenanceCompany.getId(), maintenanceCompany.getContractStartDate());
+                contractEndDate.put(maintenanceCompany.getId(), maintenanceCompany.getContractEndDate());
+            }
+
             //循环设置认证公司信息
             for (MaintenanceCompany maintenanceCompany : maintenanceCompanyList) {
                 //设置认证企业信息
                 setConfirmCompany(confirmCompanyResponseList, companyIdToDealTime, mtCompanyIdToProjectNum,
                         companyIdToLiftData, mtCompanyIdToMtRecordNum, mtCompanyIdToEmergencyRecordNum,
-                        companyToActiveTime, maintenanceCompany);
+                        companyToActiveTime, maintenanceCompany, contractStartDate, contractEndDate);
             }
         }
     }
 
     /**
      * @param
+     * @param contractStartDate
+     * @param contractEndDate
      * @return
      * @description 设置认证企业信息
      * @date 2020/2/19 6:53 下午
@@ -335,7 +350,9 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
                                    Map<Long, Long> mtCompanyIdToMtRecordNum,
                                    Map<Long, Long> mtCompanyIdToEmergencyRecordNum,
                                    Map<Long, LocalDateTime> companyToActiveTime,
-                                   MaintenanceCompany maintenanceCompany) {
+                                   MaintenanceCompany maintenanceCompany,
+                                   HashMap<Long, LocalDate> contractStartDate,
+                                   HashMap<Long, LocalDate> contractEndDate) {
         ConfirmCompanyResponse confirmCompanyResponse = new ConfirmCompanyResponse(maintenanceCompany);
         //设置认证时间
         if (companyIdToDealTime.size() > 0) {
@@ -358,7 +375,14 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         if (companyToActiveTime != null && companyToActiveTime.size() > 0) {
             confirmCompanyResponse.setLastActiveTime(companyToActiveTime.get(maintenanceCompany.getId()));
         }
-
+        //设置合同开始时间
+        if (contractStartDate != null && contractStartDate.size() > 0) {
+            confirmCompanyResponse.setContractStartDate(contractStartDate.get(maintenanceCompany.getId()));
+        }
+        //设置合同结束时间
+        if (contractEndDate != null && contractEndDate.size() > 0) {
+            confirmCompanyResponse.setContractEndDate(contractEndDate.get(maintenanceCompany.getId()));
+        }
         confirmCompanyResponseList.add(confirmCompanyResponse);
     }
 

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

@@ -150,7 +150,10 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "操作失败");
         }
-        //保存公司消息
+        //设置合同开始和截止日期
+        maintenanceCompany.setContractStartDate(companyAttestationRequest.getContractStartDate());
+        maintenanceCompany.setContractEndDate(companyAttestationRequest.getContractEndDate());
+        //保存公司信息
         if (!maintenanceCompanyService.updateById(maintenanceCompany)) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "操作失败");