Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
张雷
/
skboot-zhongye
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
构建
提交
问题看板
文件
提交
网络
比较
分支
标签
2886aea9
由
qiukui
编写于
2025-03-20 15:50:55 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
设备台账列表,根据所选字段排序
1 个父辈
af3c0bae
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
10 行增加
和
3 行删除
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentController.java
sk-module-equipment/src/main/java/com/skua/modules/equipment/dto/EquipmentDTO.java
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentController.java
查看文件 @
2886aea
...
...
@@ -514,6 +514,8 @@ public class EquipmentController {
String
energyLevel
=
equipmentDTO
.
getEquipmentInfo
().
getEnergyLevel
();
//能耗等级
//Integer isSpecial = equipmentDTO.getEquipmentInfo().getIsSpecial();
String
isMeterage
=
equipmentDTO
.
getEquipmentInfo
().
getIsMeterage
();
//是否计量设备
String
orderFiled
=
equipmentDTO
.
getOrderFiled
();
boolean
orderType
=
equipmentDTO
.
isOrderType
();
List
<
String
>
equipmentLevelList
=
null
;
Base
base
=
BaseFactory
.
JOIN
().
select
(
EquipmentAsset
.
class
).
select
(
EquipmentInfo
.
class
).
select
(
EquipmentBrand
.
class
).
select
(
EquipmentCategory
.
class
)
...
...
@@ -540,8 +542,12 @@ public class EquipmentController {
.
like
(
StringUtils
.
isNotEmpty
(
equipmentCode
),
"equipment_code"
,
equipmentCode
)
.
eq
(
StringUtils
.
isNotEmpty
(
equipmentStatus
),
"equipment_status"
,
equipmentStatus
)
.
like
(
StringUtils
.
isNotEmpty
(
installPosition
),
EquipmentInfo:
:
getInstallPosition
,
installPosition
)
.
eq
(
StringUtils
.
isNotEmpty
(
equipmentDTO
.
getEquipmentInfo
().
getId
()),
"equipment_info.id"
,
equipmentDTO
.
getEquipmentInfo
().
getId
())
.
orderBy
(
true
,
false
,
"equipment_info.create_time"
);
.
eq
(
StringUtils
.
isNotEmpty
(
equipmentDTO
.
getEquipmentInfo
().
getId
()),
"equipment_info.id"
,
equipmentDTO
.
getEquipmentInfo
().
getId
());
if
(
StringUtils
.
isNotEmpty
(
orderFiled
))
{
base
.
orderBy
(
true
,
orderType
,
"equipment_info."
+
orderFiled
);
}
else
{
base
.
orderBy
(
true
,
false
,
"equipment_info.create_time"
);
}
Page
<
Map
<
String
,
Object
>>
mapPage
=
(
Page
<
Map
<
String
,
Object
>>)
base
.
queryForPage
(
new
Page
<>(
equipmentDTO
.
getPageNo
(),
equipmentDTO
.
getPageSize
()));
// 转义
...
...
sk-module-equipment/src/main/java/com/skua/modules/equipment/dto/EquipmentDTO.java
查看文件 @
2886aea
...
...
@@ -19,8 +19,9 @@ public class EquipmentDTO {
private
EquipmentAsset
equipmentAsset
=
new
EquipmentAsset
();
private
EquipmentInfo
equipmentInfo
=
new
EquipmentInfo
();
private
List
<
EquipmentInfoExtParam
>
equipmentInfoExtParams
=
new
ArrayList
<
EquipmentInfoExtParam
>();
private
Long
pageNo
=
1L
;
private
Long
pageSize
=
10L
;
private
String
orderFiled
;
//排序字段
private
boolean
orderType
;
//排序类型,true:升序,false:降序
}
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论