修复 包租客商无法添加车牌

src/main/java/com/qmrb/system/pojo/vo/ContractVO.java

@@ -50,13 +50,13 @@ public class ContractVO {
      * 开始日期
      */
 	@Schema(description = "开始日期",type="Date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startDate;
     /**
      * 结束日期
      */
 	@Schema(description = "结束日期",type="Date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate;
     /**
      * 联系人姓名

src/main/java/com/qmrb/system/service/impl/ContractPlaceNumberRelServiceImpl.java

@@ -1,6 +1,7 @@
 package com.qmrb.system.service.impl;
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -92,13 +93,28 @@ public class ContractPlaceNumberRelServiceImpl extends ServiceImpl<ContractPlace
         Page<ContractPlaceNumberRelVO> pageResult = converter.entity2Page(dictItemPage);
         // 获取车位上限
         Contract contract = contractService.getOne(new LambdaQueryWrapper<Contract>().eq(Contract::getId, sysUser.getContractId()));
-        for (ContractPlaceNumberRelVO record : pageResult.getRecords()) {
-            record.setAbledNum(String.valueOf(list.size()));
+        List<ContractPlaceNumberRelVO> records = pageResult.getRecords();
+        // 空值创建一个信息
+        if (CollectionUtil.isEmpty(records)) {
+            ContractPlaceNumberRelVO contractPlaceNumberRelVO = new ContractPlaceNumberRelVO();
+            contractPlaceNumberRelVO.setContractId(sysUser.getContractId());
+            contractPlaceNumberRelVO.setAbledNum("1");
+            contractPlaceNumberRelVO.setStatus("1");
             // 车位上限 大型车位 小型车位
-            record.setMaxParkingLotNum(contract.getMaxParkingLotNum());
-            record.setBigParkingLotNum(contract.getBigParkingLotNum());
-            record.setSmallParkingLotNum(contract.getSmallParkingLotNum());
+            contractPlaceNumberRelVO.setMaxParkingLotNum(contract.getMaxParkingLotNum());
+            contractPlaceNumberRelVO.setBigParkingLotNum(contract.getBigParkingLotNum());
+            contractPlaceNumberRelVO.setSmallParkingLotNum(contract.getSmallParkingLotNum());
+            records.add(contractPlaceNumberRelVO);
+        }else{
+            for (ContractPlaceNumberRelVO record : records) {
+                record.setAbledNum(String.valueOf(list.size()));
+                // 车位上限 大型车位 小型车位
+                record.setMaxParkingLotNum(contract.getMaxParkingLotNum());
+                record.setBigParkingLotNum(contract.getBigParkingLotNum());
+                record.setSmallParkingLotNum(contract.getSmallParkingLotNum());
+            }
         }
+
         return pageResult;
     }
 
@@ -110,6 +126,7 @@ public class ContractPlaceNumberRelServiceImpl extends ServiceImpl<ContractPlace
     public ContractPlaceNumberRelForm saveForm(@Valid ContractPlaceNumberRelForm form) {
         // 实体对象转换 form->entity
         ContractPlaceNumberRel entity = converter.form2Entity(form);
+
         // 持久化
         boolean save = this.save(entity);
         if (save) {