新增载体排序

pro-base/src/main/java/com/idea/buildManage/controller/MnpBuildingController.java

@@ -78,6 +78,8 @@ public class MnpBuildingController extends BaseController {
             }
             record.setCreatedId(ShiroUtils.getUser().getId());
             record.setCreatedAt(new Date());
+            String orderNum = modelService.getOrderNum(record);
+            record.setOrderNum(orderNum);
             int result = modelService.insertSelective(record);
             return result(result);
         } catch (Exception e) {

pro-base/src/main/java/com/idea/buildManage/controller/ParkRoomController.java

@@ -77,6 +77,8 @@ public class ParkRoomController extends BaseController {
         record.setCreatedId(ShiroUtils.getUserId());
         // 默认待售
         record.setSoldStatus(1);
+        String orderNum = modelService.getOrderNum(record);
+        record.setOrderNum(orderNum);
         int result = modelService.insert(record);
         return result(result);
     }

pro-base/src/main/java/com/idea/buildManage/model/MnpBuilding.java

@@ -1,8 +1,11 @@
 package com.idea.buildManage.model;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 
+@Data
 public class MnpBuilding implements Serializable {
     private String id;
 
@@ -14,7 +17,7 @@ public class MnpBuilding implements Serializable {
 
     private String discName;
 
-    private Integer orderNum;
+    private String orderNum;
 
     private String buildNum;
 
@@ -60,219 +63,4 @@ public class MnpBuilding implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId == null ? null : groupId.trim();
-    }
-
-    public String getGroupName() {
-        return groupName;
-    }
-
-    public void setGroupName(String groupName) {
-        this.groupName = groupName == null ? null : groupName.trim();
-    }
-
-    public String getDiscId() {
-        return discId;
-    }
-
-    public void setDiscId(String discId) {
-        this.discId = discId == null ? null : discId.trim();
-    }
-
-    public String getDiscName() {
-        return discName;
-    }
-
-    public void setDiscName(String discName) {
-        this.discName = discName == null ? null : discName.trim();
-    }
-
-    public Integer getOrderNum() {
-        return orderNum;
-    }
-
-    public void setOrderNum(Integer orderNum) {
-        this.orderNum = orderNum;
-    }
-
-    public String getBuildNum() {
-        return buildNum;
-    }
-
-    public void setBuildNum(String buildNum) {
-        this.buildNum = buildNum == null ? null : buildNum.trim();
-    }
-
-    public String getConstructionNum() {
-        return constructionNum;
-    }
-
-    public void setConstructionNum(String constructionNum) {
-        this.constructionNum = constructionNum == null ? null : constructionNum.trim();
-    }
-
-    public Double getArea() {
-        return area;
-    }
-
-    public void setArea(Double area) {
-        this.area = area;
-    }
-
-    public Double getResidentialArea() {
-        return residentialArea;
-    }
-
-    public void setResidentialArea(Double residentialArea) {
-        this.residentialArea = residentialArea;
-    }
-
-    public Double getUnResidentialArea() {
-        return unResidentialArea;
-    }
-
-    public void setUnResidentialArea(Double unResidentialArea) {
-        this.unResidentialArea = unResidentialArea;
-    }
-
-    public Double getCoverAnArea() {
-        return coverAnArea;
-    }
-
-    public void setCoverAnArea(Double coverAnArea) {
-        this.coverAnArea = coverAnArea;
-    }
-
-    public Double getUndergroundArea() {
-        return undergroundArea;
-    }
-
-    public void setUndergroundArea(Double undergroundArea) {
-        this.undergroundArea = undergroundArea;
-    }
-
-    public String getRoomNum() {
-        return roomNum;
-    }
-
-    public void setRoomNum(String roomNum) {
-        this.roomNum = roomNum == null ? null : roomNum.trim();
-    }
-
-    public String getNumberInfo() {
-        return numberInfo;
-    }
-
-    public void setNumberInfo(String numberInfo) {
-        this.numberInfo = numberInfo == null ? null : numberInfo.trim();
-    }
-
-    public Integer getFloors() {
-        return floors;
-    }
-
-    public void setFloors(Integer floors) {
-        this.floors = floors;
-    }
-
-    public Integer getOvergroundFloors() {
-        return overgroundFloors;
-    }
-
-    public void setOvergroundFloors(Integer overgroundFloors) {
-        this.overgroundFloors = overgroundFloors;
-    }
-
-    public Integer getUndergroundFloors() {
-        return undergroundFloors;
-    }
-
-    public void setUndergroundFloors(Integer undergroundFloors) {
-        this.undergroundFloors = undergroundFloors;
-    }
-
-    public String getStructure() {
-        return structure;
-    }
-
-    public void setStructure(String structure) {
-        this.structure = structure == null ? null : structure.trim();
-    }
-
-    public String getRegionalismCode() {
-        return regionalismCode;
-    }
-
-    public void setRegionalismCode(String regionalismCode) {
-        this.regionalismCode = regionalismCode == null ? null : regionalismCode.trim();
-    }
-
-    public String getLandCode() {
-        return landCode;
-    }
-
-    public void setLandCode(String landCode) {
-        this.landCode = landCode == null ? null : landCode.trim();
-    }
-
-    public String getCreatedId() {
-        return createdId;
-    }
-
-    public void setCreatedId(String createdId) {
-        this.createdId = createdId == null ? null : createdId.trim();
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public String getUpdatedId() {
-        return updatedId;
-    }
-
-    public void setUpdatedId(String updatedId) {
-        this.updatedId = updatedId == null ? null : updatedId.trim();
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
-    public String getPriceRemark() {
-        return priceRemark;
-    }
-
-    public void setPriceRemark(String priceRemark) {
-        this.priceRemark = priceRemark == null ? null : priceRemark.trim();
-    }
 }

pro-base/src/main/java/com/idea/buildManage/model/MnpBuildingExample.java

@@ -465,52 +465,62 @@ public class MnpBuildingExample {
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumEqualTo(Integer value) {
+        public Criteria andOrderNumEqualTo(String value) {
             addCriterion("order_num =", value, "orderNum");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumNotEqualTo(Integer value) {
+        public Criteria andOrderNumNotEqualTo(String value) {
             addCriterion("order_num <>", value, "orderNum");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumGreaterThan(Integer value) {
+        public Criteria andOrderNumGreaterThan(String value) {
             addCriterion("order_num >", value, "orderNum");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumGreaterThanOrEqualTo(Integer value) {
+        public Criteria andOrderNumGreaterThanOrEqualTo(String value) {
             addCriterion("order_num >=", value, "orderNum");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumLessThan(Integer value) {
+        public Criteria andOrderNumLessThan(String value) {
             addCriterion("order_num <", value, "orderNum");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumLessThanOrEqualTo(Integer value) {
+        public Criteria andOrderNumLessThanOrEqualTo(String value) {
             addCriterion("order_num <=", value, "orderNum");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumIn(List<Integer> values) {
+        public Criteria andOrderNumLike(String value) {
+            addCriterion("order_num like", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumNotLike(String value) {
+            addCriterion("order_num not like", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumIn(List<String> values) {
             addCriterion("order_num in", values, "orderNum");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumNotIn(List<Integer> values) {
+        public Criteria andOrderNumNotIn(List<String> values) {
             addCriterion("order_num not in", values, "orderNum");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumBetween(Integer value1, Integer value2) {
+        public Criteria andOrderNumBetween(String value1, String value2) {
             addCriterion("order_num between", value1, value2, "orderNum");
             return (Criteria) this;
         }
 
-        public Criteria andOrderNumNotBetween(Integer value1, Integer value2) {
+        public Criteria andOrderNumNotBetween(String value1, String value2) {
             addCriterion("order_num not between", value1, value2, "orderNum");
             return (Criteria) this;
         }

pro-base/src/main/java/com/idea/buildManage/model/ParkFloorDisc.java

@@ -1,9 +1,12 @@
 package com.idea.buildManage.model;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+@Data
 public class ParkFloorDisc implements Serializable {
     private String id;
 
@@ -31,109 +34,9 @@ public class ParkFloorDisc implements Serializable {
 
     private Date updatedAt;
 
-    private static final long serialVersionUID = 1L;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId == null ? null : groupId.trim();
-    }
-
-    public BigDecimal getUnitPrice() {
-        return unitPrice;
-    }
-
-    public void setUnitPrice(BigDecimal unitPrice) {
-        this.unitPrice = unitPrice;
-    }
-
-    public BigDecimal getPropertyUnitPrice() {
-        return propertyUnitPrice;
-    }
-
-    public void setPropertyUnitPrice(BigDecimal propertyUnitPrice) {
-        this.propertyUnitPrice = propertyUnitPrice;
-    }
-
-    public BigDecimal getMaintenanceFunds() {
-        return maintenanceFunds;
-    }
+    private String orderNum;
 
-    public void setMaintenanceFunds(BigDecimal maintenanceFunds) {
-        this.maintenanceFunds = maintenanceFunds;
-    }
-
-    public BigDecimal getSubscriptionFunds() {
-        return subscriptionFunds;
-    }
-
-    public void setSubscriptionFunds(BigDecimal subscriptionFunds) {
-        this.subscriptionFunds = subscriptionFunds;
-    }
-
-    public Double getProportion() {
-        return proportion;
-    }
-
-    public void setProportion(Double proportion) {
-        this.proportion = proportion;
-    }
-
-    public Integer getPaymentMethods() {
-        return paymentMethods;
-    }
-
-    public void setPaymentMethods(Integer paymentMethods) {
-        this.paymentMethods = paymentMethods;
-    }
-
-    public String getCreatedId() {
-        return createdId;
-    }
-
-    public void setCreatedId(String createdId) {
-        this.createdId = createdId == null ? null : createdId.trim();
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public String getUpdatedId() {
-        return updatedId;
-    }
-
-    public void setUpdatedId(String updatedId) {
-        this.updatedId = updatedId == null ? null : updatedId.trim();
-    }
+    private static final long serialVersionUID = 1L;
 
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
 
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
 }

pro-base/src/main/java/com/idea/buildManage/model/ParkFloorDiscExample.java

@@ -935,6 +935,76 @@ public class ParkFloorDiscExample {
             addCriterion("updated_at not between", value1, value2, "updatedAt");
             return (Criteria) this;
         }
+
+        public Criteria andOrderNumIsNull() {
+            addCriterion("order_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumIsNotNull() {
+            addCriterion("order_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumEqualTo(String value) {
+            addCriterion("order_num =", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumNotEqualTo(String value) {
+            addCriterion("order_num <>", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumGreaterThan(String value) {
+            addCriterion("order_num >", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumGreaterThanOrEqualTo(String value) {
+            addCriterion("order_num >=", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumLessThan(String value) {
+            addCriterion("order_num <", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumLessThanOrEqualTo(String value) {
+            addCriterion("order_num <=", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumLike(String value) {
+            addCriterion("order_num like", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumNotLike(String value) {
+            addCriterion("order_num not like", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumIn(List<String> values) {
+            addCriterion("order_num in", values, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumNotIn(List<String> values) {
+            addCriterion("order_num not in", values, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumBetween(String value1, String value2) {
+            addCriterion("order_num between", value1, value2, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumNotBetween(String value1, String value2) {
+            addCriterion("order_num not between", value1, value2, "orderNum");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

pro-base/src/main/java/com/idea/buildManage/model/ParkInfo.java

@@ -1,9 +1,12 @@
 package com.idea.buildManage.model;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+@Data
 public class ParkInfo implements Serializable {
     private String id;
 
@@ -55,205 +58,9 @@ public class ParkInfo implements Serializable {
 
     private String introduction;
 
-    private static final long serialVersionUID = 1L;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId == null ? null : groupId.trim();
-    }
-
-    public String getGroupName() {
-        return groupName;
-    }
-
-    public void setGroupName(String groupName) {
-        this.groupName = groupName == null ? null : groupName.trim();
-    }
-
-    public String getCreatedId() {
-        return createdId;
-    }
-
-    public void setCreatedId(String createdId) {
-        this.createdId = createdId == null ? null : createdId.trim();
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public String getNature() {
-        return nature;
-    }
-
-    public void setNature(String nature) {
-        this.nature = nature == null ? null : nature.trim();
-    }
-
-    public String getPreSalesLicenseNumber() {
-        return preSalesLicenseNumber;
-    }
-
-    public void setPreSalesLicenseNumber(String preSalesLicenseNumber) {
-        this.preSalesLicenseNumber = preSalesLicenseNumber == null ? null : preSalesLicenseNumber.trim();
-    }
-
-    public String getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(String companyId) {
-        this.companyId = companyId == null ? null : companyId.trim();
-    }
-
-    public Double getBuildArea() {
-        return buildArea;
-    }
-
-    public void setBuildArea(Double buildArea) {
-        this.buildArea = buildArea;
-    }
-
-    public Double getLandArea() {
-        return landArea;
-    }
-
-    public void setLandArea(Double landArea) {
-        this.landArea = landArea;
-    }
-
-    public String getProjectApprovalDocument() {
-        return projectApprovalDocument;
-    }
+    private String orderNum;
 
-    public void setProjectApprovalDocument(String projectApprovalDocument) {
-        this.projectApprovalDocument = projectApprovalDocument == null ? null : projectApprovalDocument.trim();
-    }
-
-    public String getEngineeringPlanningPermit() {
-        return engineeringPlanningPermit;
-    }
-
-    public void setEngineeringPlanningPermit(String engineeringPlanningPermit) {
-        this.engineeringPlanningPermit = engineeringPlanningPermit == null ? null : engineeringPlanningPermit.trim();
-    }
-
-    public String getConstructionPermit() {
-        return constructionPermit;
-    }
-
-    public void setConstructionPermit(String constructionPermit) {
-        this.constructionPermit = constructionPermit == null ? null : constructionPermit.trim();
-    }
-
-    public String getLandCertificateNumber() {
-        return landCertificateNumber;
-    }
-
-    public void setLandCertificateNumber(String landCertificateNumber) {
-        this.landCertificateNumber = landCertificateNumber == null ? null : landCertificateNumber.trim();
-    }
-
-    public String getLandUsePermitNumber() {
-        return landUsePermitNumber;
-    }
-
-    public void setLandUsePermitNumber(String landUsePermitNumber) {
-        this.landUsePermitNumber = landUsePermitNumber == null ? null : landUsePermitNumber.trim();
-    }
-
-    public Double getVolumeRatio() {
-        return volumeRatio;
-    }
-
-    public void setVolumeRatio(Double volumeRatio) {
-        this.volumeRatio = volumeRatio;
-    }
-
-    public Double getGreenRatio() {
-        return greenRatio;
-    }
-
-    public void setGreenRatio(Double greenRatio) {
-        this.greenRatio = greenRatio;
-    }
-
-    public BigDecimal getPrice() {
-        return price;
-    }
-
-    public void setPrice(BigDecimal price) {
-        this.price = price;
-    }
-
-    public BigDecimal getExceededPrice() {
-        return exceededPrice;
-    }
-
-    public void setExceededPrice(BigDecimal exceededPrice) {
-        this.exceededPrice = exceededPrice;
-    }
-
-    public Integer getAreaStatus() {
-        return areaStatus;
-    }
-
-    public void setAreaStatus(Integer areaStatus) {
-        this.areaStatus = areaStatus;
-    }
-
-    public Integer getSaleStatus() {
-        return saleStatus;
-    }
-
-    public void setSaleStatus(Integer saleStatus) {
-        this.saleStatus = saleStatus;
-    }
-
-    public String getRegionalismCode() {
-        return regionalismCode;
-    }
-
-    public void setRegionalismCode(String regionalismCode) {
-        this.regionalismCode = regionalismCode == null ? null : regionalismCode.trim();
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address == null ? null : address.trim();
-    }
+    private static final long serialVersionUID = 1L;
 
-    public String getIntroduction() {
-        return introduction;
-    }
 
-    public void setIntroduction(String introduction) {
-        this.introduction = introduction == null ? null : introduction.trim();
-    }
 }

pro-base/src/main/java/com/idea/buildManage/model/ParkInfoExample.java

@@ -1685,6 +1685,76 @@ public class ParkInfoExample {
             addCriterion("address not between", value1, value2, "address");
             return (Criteria) this;
         }
+
+        public Criteria andOrderNumIsNull() {
+            addCriterion("order_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumIsNotNull() {
+            addCriterion("order_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumEqualTo(String value) {
+            addCriterion("order_num =", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumNotEqualTo(String value) {
+            addCriterion("order_num <>", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumGreaterThan(String value) {
+            addCriterion("order_num >", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumGreaterThanOrEqualTo(String value) {
+            addCriterion("order_num >=", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumLessThan(String value) {
+            addCriterion("order_num <", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumLessThanOrEqualTo(String value) {
+            addCriterion("order_num <=", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumLike(String value) {
+            addCriterion("order_num like", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumNotLike(String value) {
+            addCriterion("order_num not like", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumIn(List<String> values) {
+            addCriterion("order_num in", values, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumNotIn(List<String> values) {
+            addCriterion("order_num not in", values, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumBetween(String value1, String value2) {
+            addCriterion("order_num between", value1, value2, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumNotBetween(String value1, String value2) {
+            addCriterion("order_num not between", value1, value2, "orderNum");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

pro-base/src/main/java/com/idea/buildManage/model/ParkRoom.java

@@ -1,8 +1,11 @@
 package com.idea.buildManage.model;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 
+@Data
 public class ParkRoom implements Serializable {
     private String id;
 
@@ -58,221 +61,8 @@ public class ParkRoom implements Serializable {
 
     private String remark;
 
-    private static final long serialVersionUID = 1L;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
-    public String getBuildId() {
-        return buildId;
-    }
-
-    public void setBuildId(String buildId) {
-        this.buildId = buildId == null ? null : buildId.trim();
-    }
-
-    public String getDiscId() {
-        return discId;
-    }
-
-    public void setDiscId(String discId) {
-        this.discId = discId == null ? null : discId.trim();
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId == null ? null : groupId.trim();
-    }
-
-    public String getRoomNo() {
-        return roomNo;
-    }
-
-    public void setRoomNo(String roomNo) {
-        this.roomNo = roomNo == null ? null : roomNo.trim();
-    }
-
-    public String getFloor() {
-        return floor;
-    }
-
-    public void setFloor(String floor) {
-        this.floor = floor == null ? null : floor.trim();
-    }
-
-    public Double getPredictionInternalArea() {
-        return predictionInternalArea;
-    }
-
-    public void setPredictionInternalArea(Double predictionInternalArea) {
-        this.predictionInternalArea = predictionInternalArea;
-    }
-
-    public Double getPredictionShareArea() {
-        return predictionShareArea;
-    }
-
-    public void setPredictionShareArea(Double predictionShareArea) {
-        this.predictionShareArea = predictionShareArea;
-    }
-
-    public Double getPredictionBuildArea() {
-        return predictionBuildArea;
-    }
-
-    public void setPredictionBuildArea(Double predictionBuildArea) {
-        this.predictionBuildArea = predictionBuildArea;
-    }
-
-    public Double getPredictionLandArea() {
-        return predictionLandArea;
-    }
-
-    public void setPredictionLandArea(Double predictionLandArea) {
-        this.predictionLandArea = predictionLandArea;
-    }
-
-    public Double getActualInternalArea() {
-        return actualInternalArea;
-    }
-
-    public void setActualInternalArea(Double actualInternalArea) {
-        this.actualInternalArea = actualInternalArea;
-    }
-
-    public Double getActualShareArea() {
-        return actualShareArea;
-    }
-
-    public void setActualShareArea(Double actualShareArea) {
-        this.actualShareArea = actualShareArea;
-    }
-
-    public Double getActualBuildArea() {
-        return actualBuildArea;
-    }
-
-    public void setActualBuildArea(Double actualBuildArea) {
-        this.actualBuildArea = actualBuildArea;
-    }
+    private String orderNum;
 
-    public Double getActualLandArea() {
-        return actualLandArea;
-    }
-
-    public void setActualLandArea(Double actualLandArea) {
-        this.actualLandArea = actualLandArea;
-    }
-
-    public Integer getRoomUse() {
-        return roomUse;
-    }
-
-    public void setRoomUse(Integer roomUse) {
-        this.roomUse = roomUse;
-    }
-
-    public String getRoomNumber() {
-        return roomNumber;
-    }
-
-    public void setRoomNumber(String roomNumber) {
-        this.roomNumber = roomNumber == null ? null : roomNumber.trim();
-    }
-
-    public Integer getDecorationSituation() {
-        return decorationSituation;
-    }
-
-    public void setDecorationSituation(Integer decorationSituation) {
-        this.decorationSituation = decorationSituation;
-    }
-
-    public String getHouseTypeId() {
-        return houseTypeId;
-    }
-
-    public void setHouseTypeId(String houseTypeId) {
-        this.houseTypeId = houseTypeId == null ? null : houseTypeId.trim();
-    }
-
-    public String getHouseTypePicture() {
-        return houseTypePicture;
-    }
-
-    public void setHouseTypePicture(String houseTypePicture) {
-        this.houseTypePicture = houseTypePicture == null ? null : houseTypePicture.trim();
-    }
-
-    public String getCreatedId() {
-        return createdId;
-    }
-
-    public void setCreatedId(String createdId) {
-        this.createdId = createdId == null ? null : createdId.trim();
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public String getUpdatedId() {
-        return updatedId;
-    }
-
-    public void setUpdatedId(String updatedId) {
-        this.updatedId = updatedId == null ? null : updatedId.trim();
-    }
-
-    public Integer getSaleStatus() {
-        return saleStatus;
-    }
-
-    public void setSaleStatus(Integer saleStatus) {
-        this.saleStatus = saleStatus;
-    }
-
-    public Integer getSoldStatus() {
-        return soldStatus;
-    }
-
-    public void setSoldStatus(Integer soldStatus) {
-        this.soldStatus = soldStatus;
-    }
-
-    public String getTwoPointTwo() {
-        return twoPointTwo;
-    }
-
-    public void setTwoPointTwo(String twoPointTwo) {
-        this.twoPointTwo = twoPointTwo == null ? null : twoPointTwo.trim();
-    }
-
-    public String getRemark() {
-        return remark;
-    }
+    private static final long serialVersionUID = 1L;
 
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
 }

pro-base/src/main/java/com/idea/buildManage/model/ParkRoomExample.java

@@ -1784,6 +1784,76 @@ public class ParkRoomExample {
             addCriterion("two_point_two not between", value1, value2, "twoPointTwo");
             return (Criteria) this;
         }
+
+        public Criteria andOrderNumIsNull() {
+            addCriterion("order_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumIsNotNull() {
+            addCriterion("order_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumEqualTo(String value) {
+            addCriterion("order_num =", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumNotEqualTo(String value) {
+            addCriterion("order_num <>", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumGreaterThan(String value) {
+            addCriterion("order_num >", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumGreaterThanOrEqualTo(String value) {
+            addCriterion("order_num >=", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumLessThan(String value) {
+            addCriterion("order_num <", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumLessThanOrEqualTo(String value) {
+            addCriterion("order_num <=", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumLike(String value) {
+            addCriterion("order_num like", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumNotLike(String value) {
+            addCriterion("order_num not like", value, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumIn(List<String> values) {
+            addCriterion("order_num in", values, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumNotIn(List<String> values) {
+            addCriterion("order_num not in", values, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumBetween(String value1, String value2) {
+            addCriterion("order_num between", value1, value2, "orderNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNumNotBetween(String value1, String value2) {
+            addCriterion("order_num not between", value1, value2, "orderNum");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

pro-base/src/main/java/com/idea/buildManage/service/MnpBuildingService.java

@@ -179,5 +179,19 @@ public class MnpBuildingService implements BaseService<MnpBuilding, MnpBuildingE
         return deleteByPrimaryKey(id);
     }
 
+    public String getOrderNum(MnpBuilding model){
+        MnpBuildingExample example = new MnpBuildingExample();
+        example.createCriteria().andDiscIdEqualTo(model.getDiscId());
+        Long count = countByExample(example);
+        String number = "";
+        if(count.doubleValue() == 0){
+            number = "001";
+        }else {
+            count++;
+            number = String.format("%03d", count);
+        }
+        return number;
+    }
+
 
 }

pro-base/src/main/java/com/idea/buildManage/service/ParkFloorDiscService.java

@@ -171,6 +171,8 @@ public class ParkFloorDiscService implements BaseService<ParkFloorDisc, ParkFloo
             houseType.setDiscId(id);
             houseTypeService.insertSelective(houseType);
         }
+        String orderNum = getOrderNum(model);
+        model.setOrderNum(orderNum);
         model.setCreatedId(ShiroUtils.getUserId());
         return insertWithoutId(model);
     }
@@ -242,4 +244,21 @@ public class ParkFloorDiscService implements BaseService<ParkFloorDisc, ParkFloo
         return deleteByPrimaryKey(id);
     }
 
+
+    public String getOrderNum(ParkFloorDisc floorDisc){
+
+        ParkFloorDiscExample example = new ParkFloorDiscExample();
+        example.createCriteria().andGroupIdEqualTo(floorDisc.getGroupId());
+        Long count = countByExample(example);
+        String number = "";
+        if(count.doubleValue() == 0){
+            number = "01";
+        }else {
+            count++;
+            number = String.format("%02d", count);
+        }
+        return number;
+    }
+
+
 }

pro-base/src/main/java/com/idea/buildManage/service/ParkInfoService.java

@@ -167,8 +167,6 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
     public int insertModel(ParkInfo record) {
         if (StringUtils.isNotEmpty(record.getId())) {
             record.setUpdatedAt(new Date());
-            System.err.println("修改——：" + record.getGroupName());
-//            updateByPrimaryKeySelective(record);
             modelMapper.updateByPrimaryKeyWithBLOBs(record);
             SysGroup group = sysGroupMapper.selectByPrimaryKey(record.getGroupId());
             group.setName(record.getGroupName());
@@ -186,6 +184,9 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
             record.setId(id);
             record.setGroupId(id);
             record.setCreatedId(user.getId());
+            String orderNum = getOrderNum(record);
+            record.setOrderNum(orderNum);
+            record.setUpdatedAt(new Date());
             insertWithoutId(record);
         }
         return 1;
@@ -382,9 +383,24 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
         return deleteByPrimaryKey(id);
     }
 
-
-
-
+    /**
+     * 获取排序号
+     * @param model
+     * @return
+     */
+    private String getOrderNum(ParkInfo model){
+
+        // 排序号
+        Long count = countByExample(new ParkInfoExample());
+        String number = "";
+        if(count.doubleValue() == 0){
+            number = "01";
+        }else {
+            count++;
+            number = String.format("%02d", count);
+        }
+        return number;
+    }
 
 
 

pro-base/src/main/java/com/idea/buildManage/service/ParkRoomService.java

@@ -210,4 +210,18 @@ public class ParkRoomService implements BaseService<ParkRoom, ParkRoomExample> {
         return response;
     }
 
+    public String getOrderNum(ParkRoom model) {
+        ParkRoomExample example = new ParkRoomExample();
+        example.createCriteria().andBuildIdEqualTo(model.getBuildId());
+        Long count = countByExample(example);
+        String number = "";
+        if(count.doubleValue() == 0){
+            number = "001";
+        }else {
+            count++;
+            number = String.format("%03d", count);
+        }
+        return number;
+    }
+
 }

pro-base/src/main/java/com/idea/customerManagement/service/IntentionalDepositService.java

@@ -109,7 +109,7 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
             number = "00001";
         }else {
             count ++;
-            number = String.format(count.toString(), "%05d", 1);
+            number = String.format("%05d", count);
         }
         ParkInfo parkInfo = parkInfoMapper.selectByPrimaryKey(groupId);
         ParkFloorDisc parkFloorDisc = parkFloorDiscMapper.selectByPrimaryKey(discId);

pro-base/src/main/java/com/idea/customerManagement/service/RoomSelectionInfoService.java

@@ -167,7 +167,7 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
             number = "00001";
         }else {
             count ++;
-            number = String.format(count.toString(), "%05d", 1);
+            number = String.format("%05d", count);
         }
         String serialNumber = response.getGroupName()+ response.getDiscName() + "-DJ" + number;
         return serialNumber;

pro-base/src/main/resources/mybatis/buildManage/MnpBuildingMapper.xml

@@ -7,7 +7,7 @@
     <result column="group_name" jdbcType="VARCHAR" property="groupName" />
     <result column="disc_id" jdbcType="VARCHAR" property="discId" />
     <result column="disc_name" jdbcType="VARCHAR" property="discName" />
-    <result column="order_num" jdbcType="INTEGER" property="orderNum" />
+    <result column="order_num" jdbcType="VARCHAR" property="orderNum" />
     <result column="build_num" jdbcType="VARCHAR" property="buildNum" />
     <result column="construction_num" jdbcType="VARCHAR" property="constructionNum" />
     <result column="area" jdbcType="DOUBLE" property="area" />
@@ -91,9 +91,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, group_id, group_name, disc_id, disc_name, order_num, build_num, construction_num, 
-    area, residential_area, un_residential_area, cover_an_area, underground_area, room_num, 
-    number_info, floors, overground_floors, underground_floors, structure, regionalism_code, 
+    id, group_id, group_name, disc_id, disc_name, order_num, build_num, construction_num,
+    area, residential_area, un_residential_area, cover_an_area, underground_area, room_num,
+    number_info, floors, overground_floors, underground_floors, structure, regionalism_code,
     land_code, created_id, created_at, updated_at, updated_id
   </sql>
   <sql id="Blob_Column_List">
@@ -159,7 +159,7 @@
                               updated_id, remark, price_remark
     )
     values (#{id,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{groupName,jdbcType=VARCHAR},
-            #{discId,jdbcType=VARCHAR}, #{discName,jdbcType=VARCHAR}, #{orderNum,jdbcType=INTEGER},
+            #{discId,jdbcType=VARCHAR}, #{discName,jdbcType=VARCHAR}, #{orderNum,jdbcType=VARCHAR},
             #{buildNum,jdbcType=VARCHAR}, #{constructionNum,jdbcType=VARCHAR}, #{area,jdbcType=DOUBLE},
             #{residentialArea,jdbcType=DOUBLE}, #{unResidentialArea,jdbcType=DOUBLE}, #{coverAnArea,jdbcType=DOUBLE},
             #{undergroundArea,jdbcType=DOUBLE}, #{roomNum,jdbcType=VARCHAR}, #{numberInfo,jdbcType=VARCHAR},
@@ -271,7 +271,7 @@
         #{discName,jdbcType=VARCHAR},
       </if>
       <if test="orderNum != null">
-        #{orderNum,jdbcType=INTEGER},
+        #{orderNum,jdbcType=VARCHAR},
       </if>
       <if test="buildNum != null">
         #{buildNum,jdbcType=VARCHAR},
@@ -363,7 +363,7 @@
         disc_name = #{record.discName,jdbcType=VARCHAR},
       </if>
       <if test="record.orderNum != null">
-        order_num = #{record.orderNum,jdbcType=INTEGER},
+        order_num = #{record.orderNum,jdbcType=VARCHAR},
       </if>
       <if test="record.buildNum != null">
         build_num = #{record.buildNum,jdbcType=VARCHAR},
@@ -440,7 +440,7 @@
     group_name = #{record.groupName,jdbcType=VARCHAR},
     disc_id = #{record.discId,jdbcType=VARCHAR},
     disc_name = #{record.discName,jdbcType=VARCHAR},
-    order_num = #{record.orderNum,jdbcType=INTEGER},
+    order_num = #{record.orderNum,jdbcType=VARCHAR},
     build_num = #{record.buildNum,jdbcType=VARCHAR},
     construction_num = #{record.constructionNum,jdbcType=VARCHAR},
     area = #{record.area,jdbcType=DOUBLE},
@@ -473,7 +473,7 @@
     group_name = #{record.groupName,jdbcType=VARCHAR},
     disc_id = #{record.discId,jdbcType=VARCHAR},
     disc_name = #{record.discName,jdbcType=VARCHAR},
-    order_num = #{record.orderNum,jdbcType=INTEGER},
+    order_num = #{record.orderNum,jdbcType=VARCHAR},
     build_num = #{record.buildNum,jdbcType=VARCHAR},
     construction_num = #{record.constructionNum,jdbcType=VARCHAR},
     area = #{record.area,jdbcType=DOUBLE},
@@ -513,7 +513,7 @@
         disc_name = #{discName,jdbcType=VARCHAR},
       </if>
       <if test="orderNum != null">
-        order_num = #{orderNum,jdbcType=INTEGER},
+        order_num = #{orderNum,jdbcType=VARCHAR},
       </if>
       <if test="buildNum != null">
         build_num = #{buildNum,jdbcType=VARCHAR},
@@ -587,7 +587,7 @@
         group_name = #{groupName,jdbcType=VARCHAR},
         disc_id = #{discId,jdbcType=VARCHAR},
         disc_name = #{discName,jdbcType=VARCHAR},
-        order_num = #{orderNum,jdbcType=INTEGER},
+        order_num = #{orderNum,jdbcType=VARCHAR},
         build_num = #{buildNum,jdbcType=VARCHAR},
         construction_num = #{constructionNum,jdbcType=VARCHAR},
         area = #{area,jdbcType=DOUBLE},
@@ -617,7 +617,7 @@
         group_name = #{groupName,jdbcType=VARCHAR},
         disc_id = #{discId,jdbcType=VARCHAR},
         disc_name = #{discName,jdbcType=VARCHAR},
-        order_num = #{orderNum,jdbcType=INTEGER},
+        order_num = #{orderNum,jdbcType=VARCHAR},
         build_num = #{buildNum,jdbcType=VARCHAR},
         construction_num = #{constructionNum,jdbcType=VARCHAR},
         area = #{area,jdbcType=DOUBLE},

pro-base/src/main/resources/mybatis/buildManage/ParkFloorDiscMapper.xml

@@ -15,6 +15,7 @@
         <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
         <result column="updated_id" jdbcType="VARCHAR" property="updatedId" />
         <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+        <result column="order_num" jdbcType="VARCHAR" property="orderNum" />
     </resultMap>
     <sql id="Example_Where_Clause">
         <where>
@@ -76,7 +77,7 @@
     </sql>
     <sql id="Base_Column_List">
         id, name, group_id, unit_price, property_unit_price, maintenance_funds, subscription_funds,
-    proportion, payment_methods, created_id, created_at, updated_id, updated_at
+    proportion, payment_methods, created_id, created_at, updated_id, updated_at, order_num
     </sql>
     <select id="selectByExample" parameterType="com.idea.buildManage.model.ParkFloorDiscExample" resultMap="BaseResultMap">
         select
@@ -113,12 +114,12 @@
                                      unit_price, property_unit_price, maintenance_funds,
                                      subscription_funds, proportion, payment_methods,
                                      created_id, created_at, updated_id,
-                                     updated_at)
+                                     updated_at, order_num)
         values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR},
                 #{unitPrice,jdbcType=DECIMAL}, #{propertyUnitPrice,jdbcType=DECIMAL}, #{maintenanceFunds,jdbcType=DECIMAL},
                 #{subscriptionFunds,jdbcType=DECIMAL}, #{proportion,jdbcType=DOUBLE}, #{paymentMethods,jdbcType=INTEGER},
                 #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR},
-                #{updatedAt,jdbcType=TIMESTAMP})
+                #{updatedAt,jdbcType=TIMESTAMP}, #{orderNum,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.idea.buildManage.model.ParkFloorDisc">
         insert into park_floor_disc
@@ -162,6 +163,9 @@
             <if test="updatedAt != null">
                 updated_at,
             </if>
+            <if test="orderNum != null">
+                order_num,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -203,6 +207,9 @@
             <if test="updatedAt != null">
                 #{updatedAt,jdbcType=TIMESTAMP},
             </if>
+            <if test="orderNum != null">
+                #{orderNum,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <select id="countByExample" parameterType="com.idea.buildManage.model.ParkFloorDiscExample" resultType="java.lang.Long">
@@ -253,6 +260,9 @@
             <if test="record.updatedAt != null">
                 updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
             </if>
+            <if test="record.orderNum != null">
+                order_num = #{record.orderNum,jdbcType=VARCHAR},
+            </if>
         </set>
         <if test="_parameter != null">
             <include refid="Update_By_Example_Where_Clause" />
@@ -272,7 +282,8 @@
         created_id = #{record.createdId,jdbcType=VARCHAR},
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
         updated_id = #{record.updatedId,jdbcType=VARCHAR},
-        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+        order_num = #{record.orderNum,jdbcType=VARCHAR}
         <if test="_parameter != null">
             <include refid="Update_By_Example_Where_Clause" />
         </if>
@@ -316,6 +327,9 @@
             <if test="updatedAt != null">
                 updated_at = #{updatedAt,jdbcType=TIMESTAMP},
             </if>
+            <if test="orderNum != null">
+                order_num = #{orderNum,jdbcType=VARCHAR},
+            </if>
         </set>
         where id = #{id,jdbcType=VARCHAR}
     </update>
@@ -332,7 +346,8 @@
             created_id = #{createdId,jdbcType=VARCHAR},
             created_at = #{createdAt,jdbcType=TIMESTAMP},
             updated_id = #{updatedId,jdbcType=VARCHAR},
-            updated_at = #{updatedAt,jdbcType=TIMESTAMP}
+            updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+            order_num = #{orderNum,jdbcType=VARCHAR}
         where id = #{id,jdbcType=VARCHAR}
     </update>
 </mapper>

pro-base/src/main/resources/mybatis/buildManage/ParkInfoMapper.xml

@@ -26,6 +26,7 @@
     <result column="sale_status" jdbcType="INTEGER" property="saleStatus" />
     <result column="regionalism_code" jdbcType="VARCHAR" property="regionalismCode" />
     <result column="address" jdbcType="VARCHAR" property="address" />
+    <result column="order_num" jdbcType="VARCHAR" property="orderNum" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.buildManage.model.ParkInfo">
     <result column="introduction" jdbcType="LONGVARCHAR" property="introduction" />
@@ -92,7 +93,8 @@
     id, group_id, group_name, created_id, created_at, updated_at, nature, pre_sales_license_number,
     company_id, build_area, land_area, project_approval_document, engineering_planning_permit,
     construction_permit, land_certificate_number, land_use_permit_number, volume_ratio,
-    green_ratio, price, exceeded_price, area_status, sale_status, regionalism_code, address
+    green_ratio, price, exceeded_price, area_status, sale_status, regionalism_code, address,
+    order_num
   </sql>
   <sql id="Blob_Column_List">
     introduction
@@ -154,8 +156,8 @@
                            land_certificate_number, land_use_permit_number,
                            volume_ratio, green_ratio, price,
                            exceeded_price, area_status, sale_status,
-                           regionalism_code, address, introduction
-    )
+                           regionalism_code, address, order_num,
+                           introduction)
     values (#{id,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{groupName,jdbcType=VARCHAR},
             #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
             #{nature,jdbcType=VARCHAR}, #{preSalesLicenseNumber,jdbcType=VARCHAR}, #{companyId,jdbcType=VARCHAR},
@@ -164,8 +166,8 @@
             #{landCertificateNumber,jdbcType=VARCHAR}, #{landUsePermitNumber,jdbcType=VARCHAR},
             #{volumeRatio,jdbcType=DOUBLE}, #{greenRatio,jdbcType=DOUBLE}, #{price,jdbcType=DECIMAL},
             #{exceededPrice,jdbcType=DECIMAL}, #{areaStatus,jdbcType=INTEGER}, #{saleStatus,jdbcType=INTEGER},
-            #{regionalismCode,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{introduction,jdbcType=LONGVARCHAR}
-           )
+            #{regionalismCode,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{orderNum,jdbcType=VARCHAR},
+            #{introduction,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.idea.buildManage.model.ParkInfo">
     insert into park_info
@@ -242,6 +244,9 @@
       <if test="address != null">
         address,
       </if>
+      <if test="orderNum != null">
+        order_num,
+      </if>
       <if test="introduction != null">
         introduction,
       </if>
@@ -319,6 +324,9 @@
       <if test="address != null">
         #{address,jdbcType=VARCHAR},
       </if>
+      <if test="orderNum != null">
+        #{orderNum,jdbcType=VARCHAR},
+      </if>
       <if test="introduction != null">
         #{introduction,jdbcType=LONGVARCHAR},
       </if>
@@ -405,6 +413,9 @@
       <if test="record.address != null">
         address = #{record.address,jdbcType=VARCHAR},
       </if>
+      <if test="record.orderNum != null">
+        order_num = #{record.orderNum,jdbcType=VARCHAR},
+      </if>
       <if test="record.introduction != null">
         introduction = #{record.introduction,jdbcType=LONGVARCHAR},
       </if>
@@ -439,6 +450,7 @@
     sale_status = #{record.saleStatus,jdbcType=INTEGER},
     regionalism_code = #{record.regionalismCode,jdbcType=VARCHAR},
     address = #{record.address,jdbcType=VARCHAR},
+    order_num = #{record.orderNum,jdbcType=VARCHAR},
     introduction = #{record.introduction,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -469,7 +481,8 @@
     area_status = #{record.areaStatus,jdbcType=INTEGER},
     sale_status = #{record.saleStatus,jdbcType=INTEGER},
     regionalism_code = #{record.regionalismCode,jdbcType=VARCHAR},
-    address = #{record.address,jdbcType=VARCHAR}
+    address = #{record.address,jdbcType=VARCHAR},
+    order_num = #{record.orderNum,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -546,6 +559,9 @@
       <if test="address != null">
         address = #{address,jdbcType=VARCHAR},
       </if>
+      <if test="orderNum != null">
+        order_num = #{orderNum,jdbcType=VARCHAR},
+      </if>
       <if test="introduction != null">
         introduction = #{introduction,jdbcType=LONGVARCHAR},
       </if>
@@ -577,6 +593,7 @@
         sale_status = #{saleStatus,jdbcType=INTEGER},
         regionalism_code = #{regionalismCode,jdbcType=VARCHAR},
         address = #{address,jdbcType=VARCHAR},
+        order_num = #{orderNum,jdbcType=VARCHAR},
         introduction = #{introduction,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -604,7 +621,8 @@
         area_status = #{areaStatus,jdbcType=INTEGER},
         sale_status = #{saleStatus,jdbcType=INTEGER},
         regionalism_code = #{regionalismCode,jdbcType=VARCHAR},
-        address = #{address,jdbcType=VARCHAR}
+        address = #{address,jdbcType=VARCHAR},
+        order_num = #{orderNum,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

pro-base/src/main/resources/mybatis/buildManage/ParkRoomMapper.xml

@@ -28,6 +28,7 @@
     <result column="sale_status" jdbcType="INTEGER" property="saleStatus" />
     <result column="sold_status" jdbcType="INTEGER" property="soldStatus" />
     <result column="two_point_two" jdbcType="VARCHAR" property="twoPointTwo" />
+    <result column="order_num" jdbcType="VARCHAR" property="orderNum" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.buildManage.model.ParkRoom">
     <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
@@ -95,7 +96,7 @@
     prediction_build_area, prediction_land_area, actual_internal_area, actual_share_area,
     actual_build_area, actual_land_area, room_use, room_number, decoration_situation,
     house_type_id, house_type_picture, created_id, created_at, updated_at, updated_id,
-    sale_status, sold_status, two_point_two
+    sale_status, sold_status, two_point_two, order_num
   </sql>
   <sql id="Blob_Column_List">
     remark
@@ -158,7 +159,8 @@
                            decoration_situation, house_type_id, house_type_picture,
                            created_id, created_at, updated_at,
                            updated_id, sale_status, sold_status,
-                           two_point_two, remark)
+                           two_point_two, order_num, remark
+    )
     values (#{id,jdbcType=VARCHAR}, #{buildId,jdbcType=VARCHAR}, #{discId,jdbcType=VARCHAR},
             #{groupId,jdbcType=VARCHAR}, #{roomNo,jdbcType=VARCHAR}, #{floor,jdbcType=VARCHAR},
             #{predictionInternalArea,jdbcType=DOUBLE}, #{predictionShareArea,jdbcType=DOUBLE},
@@ -168,7 +170,8 @@
             #{decorationSituation,jdbcType=INTEGER}, #{houseTypeId,jdbcType=VARCHAR}, #{houseTypePicture,jdbcType=VARCHAR},
             #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
             #{updatedId,jdbcType=VARCHAR}, #{saleStatus,jdbcType=INTEGER}, #{soldStatus,jdbcType=INTEGER},
-            #{twoPointTwo,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR})
+            #{twoPointTwo,jdbcType=VARCHAR}, #{orderNum,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.idea.buildManage.model.ParkRoom">
     insert into park_room
@@ -251,6 +254,9 @@
       <if test="twoPointTwo != null">
         two_point_two,
       </if>
+      <if test="orderNum != null">
+        order_num,
+      </if>
       <if test="remark != null">
         remark,
       </if>
@@ -334,6 +340,9 @@
       <if test="twoPointTwo != null">
         #{twoPointTwo,jdbcType=VARCHAR},
       </if>
+      <if test="orderNum != null">
+        #{orderNum,jdbcType=VARCHAR},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -426,6 +435,9 @@
       <if test="record.twoPointTwo != null">
         two_point_two = #{record.twoPointTwo,jdbcType=VARCHAR},
       </if>
+      <if test="record.orderNum != null">
+        order_num = #{record.orderNum,jdbcType=VARCHAR},
+      </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=LONGVARCHAR},
       </if>
@@ -462,6 +474,7 @@
     sale_status = #{record.saleStatus,jdbcType=INTEGER},
     sold_status = #{record.soldStatus,jdbcType=INTEGER},
     two_point_two = #{record.twoPointTwo,jdbcType=VARCHAR},
+    order_num = #{record.orderNum,jdbcType=VARCHAR},
     remark = #{record.remark,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -494,7 +507,8 @@
     updated_id = #{record.updatedId,jdbcType=VARCHAR},
     sale_status = #{record.saleStatus,jdbcType=INTEGER},
     sold_status = #{record.soldStatus,jdbcType=INTEGER},
-    two_point_two = #{record.twoPointTwo,jdbcType=VARCHAR}
+    two_point_two = #{record.twoPointTwo,jdbcType=VARCHAR},
+    order_num = #{record.orderNum,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -577,6 +591,9 @@
       <if test="twoPointTwo != null">
         two_point_two = #{twoPointTwo,jdbcType=VARCHAR},
       </if>
+      <if test="orderNum != null">
+        order_num = #{orderNum,jdbcType=VARCHAR},
+      </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -610,6 +627,7 @@
         sale_status = #{saleStatus,jdbcType=INTEGER},
         sold_status = #{soldStatus,jdbcType=INTEGER},
         two_point_two = #{twoPointTwo,jdbcType=VARCHAR},
+        order_num = #{orderNum,jdbcType=VARCHAR},
         remark = #{remark,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -639,7 +657,8 @@
         updated_id = #{updatedId,jdbcType=VARCHAR},
         sale_status = #{saleStatus,jdbcType=INTEGER},
         sold_status = #{soldStatus,jdbcType=INTEGER},
-        two_point_two = #{twoPointTwo,jdbcType=VARCHAR}
+        two_point_two = #{twoPointTwo,jdbcType=VARCHAR},
+        order_num = #{orderNum,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>