dcs 1 jaar geleden
bovenliggende
commit
a8d1527d48

+ 6 - 6
virgo.api/src/main/java/com/bosshand/virgo/api/model/ProjectItemTargetRoom.java

@@ -58,12 +58,12 @@ public class ProjectItemTargetRoom {
     /**
      * 房源状态
      */
-    private int roomState;
+    private Integer roomState;
 
     /**
      * 招商状态
      */
-    private int investmentState;
+    private Integer investmentState;
 
     /**
      * 启用日期
@@ -232,19 +232,19 @@ public class ProjectItemTargetRoom {
         this.area = area;
     }
 
-    public int getRoomState() {
+    public Integer getRoomState() {
         return roomState;
     }
 
-    public void setRoomState(int roomState) {
+    public void setRoomState(Integer roomState) {
         this.roomState = roomState;
     }
 
-    public int getInvestmentState() {
+    public Integer getInvestmentState() {
         return investmentState;
     }
 
-    public void setInvestmentState(int investmentState) {
+    public void setInvestmentState(Integer investmentState) {
         this.investmentState = investmentState;
     }
 

+ 1 - 1
virgo.api/src/main/resources/mapper/FollowUpRecordMapper.xml

@@ -22,7 +22,7 @@
     </insert>
 
     <delete id="delete">
-        DELETE from look_record where id=#{id}
+        DELETE from follow_up_record where id=#{id}
     </delete>
 
     <update id="update" parameterType="com.bosshand.virgo.api.model.FollowUpRecord">

+ 8 - 8
virgo.api/src/main/resources/mapper/ProjectItemTargetRoomMapper.xml

@@ -72,10 +72,10 @@
             <if test="roomNumber != null">
                 and roomNumber = #{roomNumber}
             </if>
-            <if test="roomState == 0 or roomState == 1">
+            <if test="roomState != null">
                 and roomState = #{roomState}
             </if>
-            <if test="investmentState == 0 or investmentState == 1">
+            <if test="investmentState != null">
                 and investmentState = #{investmentState}
             </if>
             <if test="invocationDate != null">
@@ -149,10 +149,10 @@
             <if test="roomNumber != null">
                 and roomNumber = #{roomNumber}
             </if>
-            <if test="roomState == 0 or roomState == 1">
+            <if test="roomState != null">
                 and roomState = #{roomState}
             </if>
-            <if test="investmentState == 0 or investmentState == 1">
+            <if test="investmentState != null">
                 and investmentState = #{investmentState}
             </if>
             <if test="invocationDate != null">
@@ -211,10 +211,10 @@
             <if test="p.roomNumber != null">
                 and roomNumber = #{p.roomNumber}
             </if>
-            <if test="p.roomState == 0 or p.roomState == 1">
+            <if test="p.roomState != null">
                 and roomState = #{p.roomState}
             </if>
-            <if test="p.investmentState == 0 or p.investmentState == 1">
+            <if test="p.investmentState != null">
                 and investmentState = #{p.investmentState}
             </if>
             <if test="p.invocationDate != null">
@@ -260,8 +260,8 @@
             <if test="roomTypeId!=0">roomTypeId=#{roomTypeId},</if>
             <if test="roomNumber!=null">roomNumber=#{roomNumber},</if>
             <if test="area!=null">area=#{area},</if>
-            <if test="roomState!=0">roomState=#{roomState},</if>
-            <if test="investmentState!=0">investmentState=#{investmentState},</if>
+            <if test="roomState!=null">roomState=#{roomState},</if>
+            <if test="investmentState!=null">investmentState=#{investmentState},</if>
             <if test="invocationDate!=null">invocationDate=#{invocationDate},</if>
             <if test="decoration!=0">decoration=#{decoration},</if>
             <if test="propertyCertificateNumber!=null">propertyCertificateNumber=#{propertyCertificateNumber},</if>