Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-wcz

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

@@ -39,6 +39,6 @@ public class PlatformCalendarRequest {
         if(StringUtils.isNotBlank(requestDateStr)) {
             return requestDateStr + "-01";
         }
-        return requestDateStr;
+        return requestDateDayStr;
     }
 }

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

@@ -106,7 +106,7 @@ public class PlatformCalendarService {
                 platformCalendarRequest);
         //获取请求日期的天数
         int monthDayNum = CommonUtil.getLastDayNumOfMonthFromDateStr(
-                platformCalendarRequest.getRequestDateDayStr(), CommonConstants.PlatformCalendarConstants.REQUEST_DATE_FORMAT);
+                platformCalendarRequest.getRequestDateStr(), CommonConstants.PlatformCalendarConstants.REQUEST_DATE_FORMAT);
         //循环设置每日的数据
         for (int day = 1; day <= monthDayNum; day++) {
             addCalendarLift(dayToCalendarLift, dayToMtRecord, dayToMtPlan, dayToEmergencyRecord, dayToAnnualInspection, day);

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

@@ -156,6 +156,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         //获取关联关系
         List<MtCompanyUser> mtCompanyUserList = mtCompanyUserService.list(new QueryWrapper<MtCompanyUser>()
                 .eq("user_id", maintenanceCompanyRequest.getUserId())
+                .eq("status", ApiConstants.ApplicationConstants.APPLY_PASS)
         );
         //获取所在的团队信息
         if (mtCompanyUserList != null && mtCompanyUserList.size() > 0) {

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserApplicationService.java

@@ -222,7 +222,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
             MtCompanyUser mtCompanyUser = mtCompanyUserService.getOne(new QueryWrapper<MtCompanyUser>()
                     .eq("mt_company_id", userApplyRequest.getCompanyId())
                     .eq("user_id", userApplyRequest.getUserId())
-                    .eq("status", ApiConstants.ApplicationConstants.APPLY_FAIL)
+                    .ne("status", ApiConstants.ApplicationConstants.APPLY_FAIL)
             );
             if (mtCompanyUser != null) {
                 return RestResponse.fail(ApiConstants.RESULT_ERROR, "用户已经在团队中了");

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserService.java

@@ -169,6 +169,7 @@ public class UserService implements IUserService {
         userResponse.setToken(IdUtil.fastSimpleUUID());
         List<MtCompanyUser> mtCompanyUserList = mtCompanyUserService.list(new QueryWrapper<MtCompanyUser>()
                 .eq("user_id", userId)
+                .eq("status", ApiConstants.ApplicationConstants.APPLY_PASS)
                 .eq("delete_flag", ApiConstants.DELETE_NO)
         );
         //获取用户所在公司的id列表

lift-system-service/src/main/java/cn/com/ty/lift/system/utils/CommonUtil.java

@@ -120,11 +120,7 @@ public class CommonUtil {
         if (transDate != null) {
             int dayNum = getLastDayNumOfMonth(transDate);
             for (int monthDay = 1; monthDay <= dayNum; monthDay++) {
-                Map<Integer, Long> liftStatusToNum = new HashMap<>();
-                for (int liftStatus : CommonConstants.PlatformCalendarConstants.LIFT_STATUS_ARRAY) {
-                    liftStatusToNum.put(liftStatus, 0L);
-                }
-                dayToLiftStatusToNum.put(monthDay, liftStatusToNum);
+                dayToLiftStatusToNum.put(monthDay, new HashMap<>());
             }
         }
         return dayToLiftStatusToNum;