瀏覽代碼

电梯上限数量查询条件修改

别傲 5 年之前
父節點
當前提交
4104d4e52c

+ 5 - 0
lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/PlatformCompanyLiftRelevance.java

@@ -35,4 +35,9 @@ public class PlatformCompanyLiftRelevance extends BaseEntity {
      * 电梯公司状态 1:停保,2:正常,3:保养中 4:维修中,5:年检中,6:大修中
      */
     private String liftCompanyStatus;
+
+    /**
+     * 删除标识
+     */
+    private String deleteFlag;
 }

+ 2 - 0
lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/PlatformCompanyLiftRelevanceService.java

@@ -158,6 +158,8 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
         QueryWrapper<PlatformCompanyLiftRelevance> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<PlatformCompanyLiftRelevance> lambdaQueryWrapper = queryWrapper.lambda();
         lambdaQueryWrapper.eq(PlatformCompanyLiftRelevance::getMtCompanyId, mtCompanyId);
+        lambdaQueryWrapper.ne(PlatformCompanyLiftRelevance::getLiftCompanyStatus, CommonEnum.LiftStatus.STOP_INSURANCE.getCode());
+        lambdaQueryWrapper.eq(PlatformCompanyLiftRelevance::getDeleteFlag, '0');
         return count(lambdaQueryWrapper);
     }
 

+ 1 - 1
lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenanceRecordService.java

@@ -226,7 +226,7 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         } else {
             return RestResponse.fail(MessageUtils.get("msg.add.fail"));
         }
-        return RestResponse.success(record.getId(), MessageUtils.get("msg.add.success"));
+        return RestResponse.success(null, MessageUtils.get("msg.add.success"));
     }
 
     /**