Browse Source

新增车牌号

loemkie 1 day ago
parent
commit
81f378f5a1

+ 12 - 0
src/main/java/com/qmrb/system/pojo/entity/MonthlyParkingRegistration.java

@@ -60,6 +60,18 @@ public class MonthlyParkingRegistration extends BaseEntity {
     private String address;
 
     /**
+     * 车牌号
+     */
+    @TableField("plate_number")
+    private String plateNumber;
+
+    /**
+     * 车型 1大型 2小型
+     */
+    @TableField("car_type")
+    private String carType;
+
+    /**
      * 备注信息
      */
     @TableField("remark")

+ 10 - 0
src/main/java/com/qmrb/system/pojo/form/MonthlyParkingRegistrationForm.java

@@ -45,6 +45,16 @@ public class MonthlyParkingRegistrationForm {
 	@Schema(description = "居住地址",type="String")
     private String address;
     /**
+     * 车牌号
+     */
+	@Schema(description = "车牌号",type="String")
+    private String plateNumber;
+    /**
+     * 车型 1大型 2小型
+     */
+	@Schema(description = "车型 1大型 2小型",type="String")
+    private String carType;
+    /**
      * 备注信息
      */
 	@Schema(description = "备注信息",type="String")

+ 10 - 0
src/main/java/com/qmrb/system/pojo/query/MonthlyParkingRegistrationQuery.java

@@ -51,6 +51,16 @@ public class MonthlyParkingRegistrationQuery extends BasePageQuery{
 	@Schema(description = "居住地址",type="String")
     private String address;
     /**
+     * 车牌号
+     */
+	@Schema(description = "车牌号",type="String")
+    private String plateNumber;
+    /**
+     * 车型 1大型 2小型
+     */
+	@Schema(description = "车型 1大型 2小型",type="String")
+    private String carType;
+    /**
      * 备注信息
      */
 	@Schema(description = "备注信息",type="String")

+ 10 - 0
src/main/java/com/qmrb/system/pojo/vo/MonthlyParkingRegistrationVO.java

@@ -46,6 +46,16 @@ public class MonthlyParkingRegistrationVO {
 	@Schema(description = "居住地址",type="String")
     private String address;
     /**
+     * 车牌号
+     */
+	@Schema(description = "车牌号",type="String")
+    private String plateNumber;
+    /**
+     * 车型 1大型 2小型
+     */
+	@Schema(description = "车型 1大型 2小型",type="String")
+    private String carType;
+    /**
      * 备注信息
      */
 	@Schema(description = "备注信息",type="String")

+ 0 - 1
src/main/java/com/qmrb/system/service/impl/ContractPlaceNumberRelServiceImpl.java

@@ -9,7 +9,6 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmrb.parking.fee.ParkingFeeCalculator;
 import com.qmrb.system.converter.ContractPlaceNumberRelConverter;
 import com.qmrb.system.framework.security.util.SecurityUtils;
 import com.qmrb.system.mapper.BarnRecordMapper;

+ 0 - 10
src/main/java/com/qmrb/system/service/impl/MonthlyParkingRegistrationServiceImpl.java

@@ -1,16 +1,8 @@
 package com.qmrb.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qmrb.system.common.enums.StatusEnum;
-import com.qmrb.system.pojo.vo.Option;
 import com.qmrb.system.converter.MonthlyParkingRegistrationConverter;
 import com.qmrb.system.pojo.entity.MonthlyParkingRegistration;
 import com.qmrb.system.pojo.form.MonthlyParkingRegistrationForm;
@@ -21,8 +13,6 @@ import com.qmrb.system.service.IMonthlyParkingRegistrationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.lang.Assert;
 import jakarta.validation.Valid;