Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
张雷
/
skboot-zhongye
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
构建
提交
问题看板
文件
提交
网络
比较
分支
标签
c51112b3
由
sonin
编写于
2025-03-25 16:56:53 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
设备查询 修改
1 个父辈
0ac65a92
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
4 行增加
和
3 行删除
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentController.java
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentController.java
查看文件 @
c51112b
...
...
@@ -212,9 +212,9 @@ public class EquipmentController {
if
(
equipmentStatisticDTO
.
getShowDepartId
())
{
List
<
Map
<
String
,
Object
>>
departIdMapList
=
WrapperFactory
.
joinWrapper
()
.
select
(
"count(*) as total"
,
"depart_id as departId"
)
.
from
(
Equipment
Asset
.
class
)
.
innerJoin
(
EquipmentInfo
.
class
,
EquipmentInfo
.
class
.
getDeclaredField
(
"assetId"
),
EquipmentAsset
.
class
.
getDeclaredField
(
"id"
))
.
inner
Join
(
EquipmentExt
.
class
,
EquipmentExt
.
class
.
getDeclaredField
(
"infoId"
),
EquipmentInfo
.
class
.
getDeclaredField
(
"id"
))
.
from
(
Equipment
Info
.
class
)
.
leftJoin
(
EquipmentAsset
.
class
,
EquipmentInfo
.
class
.
getDeclaredField
(
"assetId"
),
EquipmentAsset
.
class
.
getDeclaredField
(
"id"
))
.
left
Join
(
EquipmentExt
.
class
,
EquipmentExt
.
class
.
getDeclaredField
(
"infoId"
),
EquipmentInfo
.
class
.
getDeclaredField
(
"id"
))
.
where
()
.
eq
(
StringUtils
.
isNotEmpty
(
equipmentStatisticDTO
.
getIsSpecial
()),
"is_special"
,
equipmentStatisticDTO
.
getIsSpecial
())
.
in
(
true
,
"depart_id"
,
Arrays
.
asList
(
departs
.
split
(
","
)))
...
...
@@ -359,6 +359,7 @@ public class EquipmentController {
.
groupBy
(
"EquipmentInfo_equipmentStatus"
);
//EquipmentInfo_isSpecial
sql
=
sql
.
replace
(
"EquipmentInfo.maintenance_cost as EquipmentInfo_maintenanceCost,"
,
""
)
.
replace
(
"EquipmentInfo.gz_count as EquipmentInfo_gzCount,"
,
""
);
sql
=
sql
.
replaceAll
(
"inner join"
,
"left join"
);
List
<
Map
<
String
,
Object
>>
countMapList
=
iCommonSqlService
.
queryWrapperForList
(
sql
,
queryWrapper
);
for
(
Map
<
String
,
Object
>
item
:
countMapList
)
{
String
key
=
""
+
item
.
get
(
"EquipmentInfo_equipmentStatus"
);
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论