LAPTOP-FO2T5SIU\35838 4 月之前
父节点
当前提交
e6feee14ee

+ 1 - 5
pro-base/src/main/java/com/idea/buildManage/dto/ProjectHouseAllVo.java

@@ -70,11 +70,7 @@ public class ProjectHouseAllVo extends ParkRoom {
     private String contractId;
 
     private String customerManagementId;
-
-    /**
-     * 房屋总价
-     */
-    private BigDecimal houseTotalPrice;
+    
 
 
 

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

@@ -1,6 +1,7 @@
 package com.idea.buildManage.model;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 public class ParkRoom implements Serializable {
@@ -76,8 +77,18 @@ public class ParkRoom implements Serializable {
 
     private String remark;
 
+    private BigDecimal houseTotalPrice;
+
     private static final long serialVersionUID = 1L;
 
+    public BigDecimal getHouseTotalPrice() {
+        return houseTotalPrice;
+    }
+
+    public void setHouseTotalPrice(BigDecimal houseTotalPrice) {
+        this.houseTotalPrice = houseTotalPrice;
+    }
+
     public String getId() {
         return id;
     }

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

@@ -1,5 +1,6 @@
 package com.idea.buildManage.model;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -1615,6 +1616,66 @@ public class ParkRoomExample {
             return (Criteria) this;
         }
 
+        public Criteria andHouseTotalPriceIsNull() {
+            addCriterion("house_total_price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceIsNotNull() {
+            addCriterion("house_total_price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceEqualTo(BigDecimal value) {
+            addCriterion("house_total_price =", value, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceNotEqualTo(BigDecimal value) {
+            addCriterion("house_total_price <>", value, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceGreaterThan(BigDecimal value) {
+            addCriterion("house_total_price >", value, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("house_total_price >=", value, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceLessThan(BigDecimal value) {
+            addCriterion("house_total_price <", value, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("house_total_price <=", value, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceIn(List<BigDecimal> values) {
+            addCriterion("house_total_price in", values, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceNotIn(List<BigDecimal> values) {
+            addCriterion("house_total_price not in", values, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("house_total_price between", value1, value2, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseTotalPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("house_total_price not between", value1, value2, "houseTotalPrice");
+            return (Criteria) this;
+        }
+
         public Criteria andCreatedIdIsNull() {
             addCriterion("created_id is null");
             return (Criteria) this;

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

@@ -25,6 +25,7 @@
         <result column="decoration_situation" jdbcType="INTEGER" property="decorationSituation" />
         <result column="house_type_id" jdbcType="VARCHAR" property="houseTypeId" />
         <result column="house_type_picture" jdbcType="VARCHAR" property="houseTypePicture" />
+        <result column="house_total_price" jdbcType="DECIMAL" property="houseTotalPrice" />
         <result column="created_id" jdbcType="VARCHAR" property="createdId" />
         <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
         <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
@@ -103,9 +104,9 @@
         id, build_id, build_name, disc_id, disc_name, group_id, group_name, room_no, nature,
     floor, prediction_internal_area, prediction_share_area, 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, order_num,
-    is_choose, ncid, nc_code, del_flag
+    room_number, decoration_situation, house_type_id, house_type_picture, house_total_price,
+    created_id, created_at, updated_at, updated_id, sale_status, sold_status, two_point_two,
+    order_num, is_choose, ncid, nc_code, del_flag
     </sql>
     <sql id="Blob_Column_List">
         remark
@@ -167,11 +168,11 @@
                                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, order_num, is_choose,
-                               ncid, nc_code, del_flag,
-                               remark)
+                               house_total_price, created_id, created_at,
+                               updated_at, updated_id, sale_status,
+                               sold_status, two_point_two, order_num,
+                               is_choose, ncid, nc_code,
+                               del_flag, remark)
         values (#{id,jdbcType=VARCHAR}, #{buildId,jdbcType=VARCHAR}, #{buildName,jdbcType=VARCHAR},
                 #{discId,jdbcType=VARCHAR}, #{discName,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR},
                 #{groupName,jdbcType=VARCHAR}, #{roomNo,jdbcType=VARCHAR}, #{nature,jdbcType=VARCHAR},
@@ -180,11 +181,11 @@
                 #{actualInternalArea,jdbcType=DOUBLE}, #{actualShareArea,jdbcType=DOUBLE}, #{actualBuildArea,jdbcType=DOUBLE},
                 #{actualLandArea,jdbcType=DOUBLE}, #{roomUse,jdbcType=INTEGER}, #{roomNumber,jdbcType=VARCHAR},
                 #{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}, #{orderNum,jdbcType=VARCHAR}, #{isChoose,jdbcType=INTEGER},
-                #{ncid,jdbcType=VARCHAR}, #{ncCode,jdbcType=VARCHAR}, #{delFlag,jdbcType=VARCHAR},
-                #{remark,jdbcType=LONGVARCHAR})
+                #{houseTotalPrice,jdbcType=DECIMAL}, #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
+                #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, #{saleStatus,jdbcType=INTEGER},
+                #{soldStatus,jdbcType=INTEGER}, #{twoPointTwo,jdbcType=VARCHAR}, #{orderNum,jdbcType=VARCHAR},
+                #{isChoose,jdbcType=INTEGER}, #{ncid,jdbcType=VARCHAR}, #{ncCode,jdbcType=VARCHAR},
+                #{delFlag,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.idea.buildManage.model.ParkRoom">
         insert into park_room
@@ -258,6 +259,9 @@
             <if test="houseTypePicture != null">
                 house_type_picture,
             </if>
+            <if test="houseTotalPrice != null">
+                house_total_price,
+            </if>
             <if test="createdId != null">
                 created_id,
             </if>
@@ -368,6 +372,9 @@
             <if test="houseTypePicture != null">
                 #{houseTypePicture,jdbcType=VARCHAR},
             </if>
+            <if test="houseTotalPrice != null">
+                #{houseTotalPrice,jdbcType=DECIMAL},
+            </if>
             <if test="createdId != null">
                 #{createdId,jdbcType=VARCHAR},
             </if>
@@ -487,6 +494,9 @@
             <if test="record.houseTypePicture != null">
                 house_type_picture = #{record.houseTypePicture,jdbcType=VARCHAR},
             </if>
+            <if test="record.houseTotalPrice != null">
+                house_total_price = #{record.houseTotalPrice,jdbcType=DECIMAL},
+            </if>
             <if test="record.createdId != null">
                 created_id = #{record.createdId,jdbcType=VARCHAR},
             </if>
@@ -556,6 +566,7 @@
         decoration_situation = #{record.decorationSituation,jdbcType=INTEGER},
         house_type_id = #{record.houseTypeId,jdbcType=VARCHAR},
         house_type_picture = #{record.houseTypePicture,jdbcType=VARCHAR},
+        house_total_price = #{record.houseTotalPrice,jdbcType=DECIMAL},
         created_id = #{record.createdId,jdbcType=VARCHAR},
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
         updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
@@ -598,6 +609,7 @@
         decoration_situation = #{record.decorationSituation,jdbcType=INTEGER},
         house_type_id = #{record.houseTypeId,jdbcType=VARCHAR},
         house_type_picture = #{record.houseTypePicture,jdbcType=VARCHAR},
+        house_total_price = #{record.houseTotalPrice,jdbcType=DECIMAL},
         created_id = #{record.createdId,jdbcType=VARCHAR},
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
         updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
@@ -683,6 +695,9 @@
             <if test="houseTypePicture != null">
                 house_type_picture = #{houseTypePicture,jdbcType=VARCHAR},
             </if>
+            <if test="houseTotalPrice != null">
+                house_total_price = #{houseTotalPrice,jdbcType=DECIMAL},
+            </if>
             <if test="createdId != null">
                 created_id = #{createdId,jdbcType=VARCHAR},
             </if>
@@ -749,6 +764,7 @@
             decoration_situation = #{decorationSituation,jdbcType=INTEGER},
             house_type_id = #{houseTypeId,jdbcType=VARCHAR},
             house_type_picture = #{houseTypePicture,jdbcType=VARCHAR},
+            house_total_price = #{houseTotalPrice,jdbcType=DECIMAL},
             created_id = #{createdId,jdbcType=VARCHAR},
             created_at = #{createdAt,jdbcType=TIMESTAMP},
             updated_at = #{updatedAt,jdbcType=TIMESTAMP},
@@ -788,6 +804,7 @@
             decoration_situation = #{decorationSituation,jdbcType=INTEGER},
             house_type_id = #{houseTypeId,jdbcType=VARCHAR},
             house_type_picture = #{houseTypePicture,jdbcType=VARCHAR},
+            house_total_price = #{houseTotalPrice,jdbcType=DECIMAL},
             created_id = #{createdId,jdbcType=VARCHAR},
             created_at = #{createdAt,jdbcType=TIMESTAMP},
             updated_at = #{updatedAt,jdbcType=TIMESTAMP},