|
@@ -9,6 +9,7 @@
|
|
<result column="projectId" property="projectId"/>
|
|
<result column="projectId" property="projectId"/>
|
|
<result column="projectItemId" property="projectItemId"/>
|
|
<result column="projectItemId" property="projectItemId"/>
|
|
<result column="projectItemTargetId" property="projectItemTargetId"/>
|
|
<result column="projectItemTargetId" property="projectItemTargetId"/>
|
|
|
|
+ <result column="name" property="name"/>
|
|
<result column="roomTypeId" property="roomTypeId"/>
|
|
<result column="roomTypeId" property="roomTypeId"/>
|
|
<result column="roomNumber" property="roomNumber"/>
|
|
<result column="roomNumber" property="roomNumber"/>
|
|
<result column="area" property="area"/>
|
|
<result column="area" property="area"/>
|
|
@@ -48,6 +49,9 @@
|
|
<if test="projectItemTargetId != 0">
|
|
<if test="projectItemTargetId != 0">
|
|
and projectItemTargetId = #{projectItemTargetId}
|
|
and projectItemTargetId = #{projectItemTargetId}
|
|
</if>
|
|
</if>
|
|
|
|
+ <if test="name != null">
|
|
|
|
+ and name = #{name}
|
|
|
|
+ </if>
|
|
<if test="roomTypeId != 0">
|
|
<if test="roomTypeId != 0">
|
|
and roomTypeId = #{roomTypeId}
|
|
and roomTypeId = #{roomTypeId}
|
|
</if>
|
|
</if>
|
|
@@ -81,9 +85,9 @@
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<insert id="insert" useGeneratedKeys="true" keyProperty="id">
|
|
<insert id="insert" useGeneratedKeys="true" keyProperty="id">
|
|
- INSERT INTO project_item_target_room(`projectId`, `projectItemId`, `projectItemTargetId`, `roomTypeId`, `roomNumber`, `area`, `roomState`, `investmentState`,
|
|
|
|
|
|
+ INSERT INTO project_item_target_room(`projectId`, `projectItemId`, `projectItemTargetId`,`name`, `roomTypeId`, `roomNumber`, `area`, `roomState`, `investmentState`,
|
|
`invocationDate`, `decoration`, `propertyCertificateNumber`, `picture`, `video`, `tagIds`, `openState`, `data`)
|
|
`invocationDate`, `decoration`, `propertyCertificateNumber`, `picture`, `video`, `tagIds`, `openState`, `data`)
|
|
- VALUES (#{projectId}, #{projectItemId}, #{projectItemTargetId}, #{roomTypeId}, #{roomNumber}, #{area}, #{roomState}, #{investmentState},
|
|
|
|
|
|
+ VALUES (#{projectId}, #{projectItemId}, #{projectItemTargetId}, #{name}, #{roomTypeId}, #{roomNumber}, #{area}, #{roomState}, #{investmentState},
|
|
#{invocationDate}, #{decoration}, #{propertyCertificateNumber}, #{picture}, #{video}, #{tagIds}, #{openState}, #{data})
|
|
#{invocationDate}, #{decoration}, #{propertyCertificateNumber}, #{picture}, #{video}, #{tagIds}, #{openState}, #{data})
|
|
</insert>
|
|
</insert>
|
|
|
|
|
|
@@ -107,6 +111,9 @@
|
|
<if test="projectItemTargetId != 0">
|
|
<if test="projectItemTargetId != 0">
|
|
and projectItemTargetId = #{projectItemTargetId}
|
|
and projectItemTargetId = #{projectItemTargetId}
|
|
</if>
|
|
</if>
|
|
|
|
+ <if test="name != null">
|
|
|
|
+ and name = #{name}
|
|
|
|
+ </if>
|
|
<if test="roomTypeId != 0">
|
|
<if test="roomTypeId != 0">
|
|
and roomTypeId = #{roomTypeId}
|
|
and roomTypeId = #{roomTypeId}
|
|
</if>
|
|
</if>
|
|
@@ -151,6 +158,9 @@
|
|
<if test="p.projectItemTargetId != 0">
|
|
<if test="p.projectItemTargetId != 0">
|
|
and projectItemTargetId = #{p.projectItemTargetId}
|
|
and projectItemTargetId = #{p.projectItemTargetId}
|
|
</if>
|
|
</if>
|
|
|
|
+ <if test="p.name != null">
|
|
|
|
+ and name = #{p.name}
|
|
|
|
+ </if>
|
|
<if test="p.roomTypeId != 0">
|
|
<if test="p.roomTypeId != 0">
|
|
and roomTypeId = #{p.roomTypeId}
|
|
and roomTypeId = #{p.roomTypeId}
|
|
</if>
|
|
</if>
|
|
@@ -190,6 +200,7 @@
|
|
<if test="projectId!=0">projectId=#{projectId},</if>
|
|
<if test="projectId!=0">projectId=#{projectId},</if>
|
|
<if test="projectItemId!=0">projectItemId=#{projectItemId},</if>
|
|
<if test="projectItemId!=0">projectItemId=#{projectItemId},</if>
|
|
<if test="projectItemTargetId!=0">projectItemTargetId=#{projectItemTargetId},</if>
|
|
<if test="projectItemTargetId!=0">projectItemTargetId=#{projectItemTargetId},</if>
|
|
|
|
+ <if test="name!=null">name=#{name},</if>
|
|
<if test="roomTypeId!=0">roomTypeId=#{roomTypeId},</if>
|
|
<if test="roomTypeId!=0">roomTypeId=#{roomTypeId},</if>
|
|
<if test="roomNumber!=null">roomNumber=#{roomNumber},</if>
|
|
<if test="roomNumber!=null">roomNumber=#{roomNumber},</if>
|
|
<if test="area!=null">area=#{area},</if>
|
|
<if test="area!=null">area=#{area},</if>
|