Commit c6e45ac6 authored by 周昊's avatar 周昊

1、修改app端详情页面接口,添加逻辑删除和状态筛选

parent 7b8a0c03
...@@ -103,6 +103,7 @@ public class LedgerFloorServiceImpl extends MPJBaseServiceImpl<LedgerFloorMapper ...@@ -103,6 +103,7 @@ public class LedgerFloorServiceImpl extends MPJBaseServiceImpl<LedgerFloorMapper
LedgerFloor query = new LedgerFloor(); LedgerFloor query = new LedgerFloor();
query.setBuildingId(buildingId); query.setBuildingId(buildingId);
query.setStatus("0"); query.setStatus("0");
query.setDelFlag("0");
List<LedgerFloor> ledgerFloors = selectLedgerFloorList(query); List<LedgerFloor> ledgerFloors = selectLedgerFloorList(query);
return getLedgerFloorDtoListByLedgerFloor(ledgerFloors); return getLedgerFloorDtoListByLedgerFloor(ledgerFloors);
} }
......
...@@ -57,6 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -57,6 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<foreach item="id" collection="ids" open="(" separator="," close=")"> <foreach item="id" collection="ids" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
AND del_flag = '0'
AND `status` = '0'
</select> </select>
<insert id="insertLedgerBuilding" parameterType="com.censoft.censoftrongtong.domain.LedgerBuilding" useGeneratedKeys="true" keyProperty="id"> <insert id="insertLedgerBuilding" parameterType="com.censoft.censoftrongtong.domain.LedgerBuilding" useGeneratedKeys="true" keyProperty="id">
......
...@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="type != null and type != ''"> and tt.type = #{type}</if> <if test="type != null and type != ''"> and tt.type = #{type}</if>
<if test="roomNumber != null "> and tt.room_number = #{roomNumber}</if> <if test="roomNumber != null "> and tt.room_number = #{roomNumber}</if>
<if test="status != null and status != ''"> and tt.status = #{status}</if> <if test="status != null and status != ''"> and tt.status = #{status}</if>
<if test="delFlag != null and delFlag != ''"> and tt.del_flag = #{delFlag}</if>
</where> </where>
</select> </select>
......
...@@ -289,6 +289,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -289,6 +289,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="buildingId != null"> AND lf.building_id = #{buildingId}</if> <if test="buildingId != null"> AND lf.building_id = #{buildingId}</if>
<if test="floorId != null"> AND lf.id = #{floorId}</if> <if test="floorId != null"> AND lf.id = #{floorId}</if>
<if test="roomId != null"> AND lr.id = #{roomId}</if> <if test="roomId != null"> AND lr.id = #{roomId}</if>
AND rpil.del_flag = '0'
AND lr.del_flag = '0'
AND lr.`status` = '0'
AND lf.del_flag = '0'
AND lf.`status` = '0'
AND lb.del_flag = '0'
AND lb.`status` = '0'
</where> </where>
ORDER BY ORDER BY
sdd.dict_sort DESC sdd.dict_sort DESC
......
...@@ -187,10 +187,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -187,10 +187,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND rpel.plan_id = rp.id AND rpel.plan_id = rp.id
WHERE WHERE
rp.id = #{planId} rp.id = #{planId}
AND lf.`status` = '0' AND rpil.del_flag = '0'
AND lf.del_flag = '0' AND lr.del_flag = '0'
AND lr.`status` = '0' AND lr.`status` = '0'
AND lr.del_flag = '0' AND lf.del_flag = '0'
AND lf.`status` = '0'
AND lb.del_flag = '0'
AND lb.`status` = '0'
<if test="buildingId != null"> <if test="buildingId != null">
AND lb.id = #{buildingId} AND lb.id = #{buildingId}
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment