Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
cfld-liyeyun-admin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
cfld-backend
cfld-liyeyun-admin
Commits
07831321
Commit
07831321
authored
Dec 13, 2023
by
yaobaizheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
载体查询
parent
ded7bbc7
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
73 additions
and
4 deletions
+73
-4
CarrierInfoController.java
...va/com/ruoyi/system/controller/CarrierInfoController.java
+12
-1
CarrierInfoMapper.java
.../main/java/com/ruoyi/system/mapper/CarrierInfoMapper.java
+3
-0
ICarrierInfoService.java
...in/java/com/ruoyi/system/service/ICarrierInfoService.java
+5
-0
CarrierInfoServiceImpl.java
...com/ruoyi/system/service/impl/CarrierInfoServiceImpl.java
+7
-0
CarrierInfoMapper.xml
...m/src/main/resources/mapper/carrier/CarrierInfoMapper.xml
+43
-0
info.html
...ystem/src/main/resources/templates/carrier/info/info.html
+3
-3
No files found.
ruoyi-system/src/main/java/com/ruoyi/system/controller/CarrierInfoController.java
View file @
07831321
...
@@ -44,13 +44,24 @@ public class CarrierInfoController extends BaseController
...
@@ -44,13 +44,24 @@ public class CarrierInfoController extends BaseController
/**
/**
* 查询载体信息列表
* 查询载体信息列表
*/
*/
// @RequiresPermissions("carrier:info:list")
// @PostMapping("/list")
// @ResponseBody
// public TableDataInfo list(CarrierInfo carrierInfo)
// {
// startPage();
// List<CarrierInfo> list = carrierInfoService.selectCarrierInfoList(carrierInfo);
// return getDataTable(list);
// }
@RequiresPermissions
(
"carrier:info:list"
)
@RequiresPermissions
(
"carrier:info:list"
)
@PostMapping
(
"/list"
)
@PostMapping
(
"/list"
)
@ResponseBody
@ResponseBody
public
TableDataInfo
list
(
CarrierInfo
carrierInfo
)
public
TableDataInfo
list
(
CarrierInfo
carrierInfo
)
{
{
startPage
();
startPage
();
List
<
CarrierInfo
>
list
=
carrierInfoService
.
selectCarrierInfoList
(
carrierInfo
);
List
<
CarrierInfo
>
list
=
carrierInfoService
.
selectCarrierInfo
Vo
List
(
carrierInfo
);
return
getDataTable
(
list
);
return
getDataTable
(
list
);
}
}
...
...
ruoyi-system/src/main/java/com/ruoyi/system/mapper/CarrierInfoMapper.java
View file @
07831321
...
@@ -27,6 +27,9 @@ public interface CarrierInfoMapper
...
@@ -27,6 +27,9 @@ public interface CarrierInfoMapper
*/
*/
public
List
<
CarrierInfo
>
selectCarrierInfoList
(
CarrierInfo
carrierInfo
);
public
List
<
CarrierInfo
>
selectCarrierInfoList
(
CarrierInfo
carrierInfo
);
public
List
<
CarrierInfo
>
selectCarrierInfoVoList
(
CarrierInfo
carrierInfo
);
/**
/**
* 新增载体信息
* 新增载体信息
*
*
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/ICarrierInfoService.java
View file @
07831321
...
@@ -27,6 +27,11 @@ public interface ICarrierInfoService
...
@@ -27,6 +27,11 @@ public interface ICarrierInfoService
*/
*/
public
List
<
CarrierInfo
>
selectCarrierInfoList
(
CarrierInfo
carrierInfo
);
public
List
<
CarrierInfo
>
selectCarrierInfoList
(
CarrierInfo
carrierInfo
);
public
List
<
CarrierInfo
>
selectCarrierInfoVoList
(
CarrierInfo
carrierInfo
);
/**
/**
* 新增载体信息
* 新增载体信息
*
*
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarrierInfoServiceImpl.java
View file @
07831321
...
@@ -45,6 +45,13 @@ public class CarrierInfoServiceImpl implements ICarrierInfoService
...
@@ -45,6 +45,13 @@ public class CarrierInfoServiceImpl implements ICarrierInfoService
return
carrierInfoMapper
.
selectCarrierInfoList
(
carrierInfo
);
return
carrierInfoMapper
.
selectCarrierInfoList
(
carrierInfo
);
}
}
@Override
public
List
<
CarrierInfo
>
selectCarrierInfoVoList
(
CarrierInfo
carrierInfo
)
{
return
carrierInfoMapper
.
selectCarrierInfoVoList
(
carrierInfo
);
}
/**
/**
* 新增载体信息
* 新增载体信息
*
*
...
...
ruoyi-system/src/main/resources/mapper/carrier/CarrierInfoMapper.xml
View file @
07831321
...
@@ -72,6 +72,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -72,6 +72,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</where>
</select>
</select>
<sql
id=
"selectCarrierInfoVo1"
>
select ci.id, ci.create_time, ci.update_time, ci.group_id, ci.group_name,
ci.zone_id, ci.zone_name, ci.park_id, pi.name park_name, ci.building_number,
ci.structure, ci.type, ci.area, ci.fire_protection_level, ci.has_crown_block,
ci.crown_block_high, ci.water, ci.electricity, ci.gas, ci.heating,
ci.wenjuanxingid, ci.floor_number, ci.floor_high,
ci.single_area, ci.distance, ci.elevator_type, ci.fire_resistant, ci.img_url,
ci.weight from carrier_info ci
LEFT JOIN park_info pi ON ci.park_id = pi.id
</sql>
<select
id=
"selectCarrierInfoVoList"
parameterType=
"CarrierInfo"
resultMap=
"CarrierInfoResult"
>
<include
refid=
"selectCarrierInfoVo1"
/>
<where>
<if
test=
"groupId != null "
>
and ci.group_id = #{groupId}
</if>
<if
test=
"groupName != null and groupName != ''"
>
and ci.group_name like concat('%', #{groupName}, '%')
</if>
<if
test=
"zoneId != null "
>
and ci.zone_id = #{zoneId}
</if>
<if
test=
"zoneName != null and zoneName != ''"
>
and ci.zone_name like concat('%', #{zoneName}, '%')
</if>
<if
test=
"parkId != null "
>
and ci.park_id = #{parkId}
</if>
<if
test=
"parkName != null and parkName != ''"
>
and pi.name like concat('%', #{parkName}, '%')
</if>
<if
test=
"buildingNumber != null and buildingNumber != ''"
>
and ci.building_number = #{buildingNumber}
</if>
<if
test=
"structure != null and structure != ''"
>
and ci.structure = #{structure}
</if>
<if
test=
"type != null and type != ''"
>
and ci.type = #{type}
</if>
<if
test=
"area != null "
>
and ci.area = #{area}
</if>
<if
test=
"fireProtectionLevel != null and fireProtectionLevel != ''"
>
and ci.fire_protection_level = #{fireProtectionLevel}
</if>
<if
test=
"hasCrownBlock != null "
>
and ci.has_crown_block = #{hasCrownBlock}
</if>
<if
test=
"crownBlockHigh != null "
>
and ci.crown_block_high = #{crownBlockHigh}
</if>
<if
test=
"water != null and water != ''"
>
and ci.water = #{water}
</if>
<if
test=
"electricity != null and electricity != ''"
>
and ci.electricity = #{electricity}
</if>
<if
test=
"gas != null "
>
and ci.gas = #{gas}
</if>
<if
test=
"heating != null "
>
and ci.heating = #{heating}
</if>
<if
test=
"wenjuanxingid != null "
>
and ci.wenjuanxingid = #{wenjuanxingid}
</if>
<if
test=
"floorNumber != null "
>
and ci.floor_number = #{floorNumber}
</if>
<if
test=
"floorHigh != null "
>
and ci.floor_high = #{floorHigh}
</if>
<if
test=
"singleArea != null "
>
and ci.single_area = #{singleArea}
</if>
<if
test=
"distance != null "
>
and ci.distance = #{distance}
</if>
<if
test=
"elevatorType != null and elevatorType != ''"
>
and ci.elevator_type = #{elevatorType}
</if>
<if
test=
"fireResistant != null and fireResistant != ''"
>
and ci.fire_resistant = #{fireResistant}
</if>
<if
test=
"imgUrl != null and imgUrl != ''"
>
and ci.img_url = #{imgUrl}
</if>
<if
test=
"weight != null "
>
and ci.weight = #{weight}
</if>
</where>
</select>
<select
id=
"selectCarrierInfoById"
parameterType=
"Long"
resultMap=
"CarrierInfoResult"
>
<select
id=
"selectCarrierInfoById"
parameterType=
"Long"
resultMap=
"CarrierInfoResult"
>
<include
refid=
"selectCarrierInfoVo"
/>
<include
refid=
"selectCarrierInfoVo"
/>
where id = #{id}
where id = #{id}
...
...
ruoyi-system/src/main/resources/templates/carrier/info/info.html
View file @
07831321
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
<ul>
<ul>
<li
style=
"display: none"
>
<li
style=
"display: none"
>
<label>
所属园区id:
</label>
<label>
所属园区id:
</label>
<input
type=
"text"
name=
"parkId"
/>
<input
type=
"text"
id=
"parkId"
name=
"parkId"
/>
</li>
</li>
<!-- <li>-->
<!-- <li>-->
<!-- <label>所属园区名称:</label>-->
<!-- <label>所属园区名称:</label>-->
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<!-- </li>-->
<!-- </li>-->
<li>
<li>
<label>
所属园区:
</label>
<label>
所属园区:
</label>
<input
type=
"text"
id=
"parkName
"
name=
"parkName
"
onclick=
"selectType()"
>
<input
type=
"text"
id=
"parkName
ForShow"
name=
"parkNameForShow
"
onclick=
"selectType()"
>
</li>
</li>
<li>
<li>
<label>
楼号:
</label>
<label>
楼号:
</label>
...
@@ -138,7 +138,7 @@
...
@@ -138,7 +138,7 @@
$
.
modal
.
alertWarning
(
"请至少选择一条记录"
);
$
.
modal
.
alertWarning
(
"请至少选择一条记录"
);
return
;
return
;
}
}
$
(
'#parkName'
).
val
(
rows
.
name
);
$
(
'#parkName
ForShow
'
).
val
(
rows
.
name
);
$
(
'#parkId'
).
val
(
rows
.
id
);
$
(
'#parkId'
).
val
(
rows
.
id
);
$
.
modal
.
close
(
index
);
$
.
modal
.
close
(
index
);
}
}
...
...
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