Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
RuoYi-Vue-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
融通安全管理系统
RuoYi-Vue-master
Commits
c6e45ac6
Commit
c6e45ac6
authored
Aug 09, 2023
by
周昊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、修改app端详情页面接口,添加逻辑删除和状态筛选
parent
7b8a0c03
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
4 deletions
+18
-4
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerFloorServiceImpl.java
.../censoftrongtong/service/impl/LedgerFloorServiceImpl.java
+1
-0
censoft-rongtong/src/main/resources/mapper/system/LedgerBuildingMapper.xml
...src/main/resources/mapper/system/LedgerBuildingMapper.xml
+2
-0
censoft-rongtong/src/main/resources/mapper/system/LedgerFloorMapper.xml
...ng/src/main/resources/mapper/system/LedgerFloorMapper.xml
+1
-0
censoft-rongtong/src/main/resources/mapper/system/RiskPlanInherentListMapper.xml
...in/resources/mapper/system/RiskPlanInherentListMapper.xml
+7
-0
censoft-rongtong/src/main/resources/mapper/system/RiskPlanMapper.xml
...gtong/src/main/resources/mapper/system/RiskPlanMapper.xml
+7
-4
No files found.
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerFloorServiceImpl.java
View file @
c6e45ac6
...
@@ -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
);
}
}
...
...
censoft-rongtong/src/main/resources/mapper/system/LedgerBuildingMapper.xml
View file @
c6e45ac6
...
@@ -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"
>
...
...
censoft-rongtong/src/main/resources/mapper/system/LedgerFloorMapper.xml
View file @
c6e45ac6
...
@@ -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>
...
...
censoft-rongtong/src/main/resources/mapper/system/RiskPlanInherentListMapper.xml
View file @
c6e45ac6
...
@@ -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
...
...
censoft-rongtong/src/main/resources/mapper/system/RiskPlanMapper.xml
View file @
c6e45ac6
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment