Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
5fe57328
Commit
5fe57328
authored
Jan 17, 2025
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):BUG26747 + 打印汇总表只打印状态为【在用】的设备
parent
9e689c92
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
0 deletions
+15
-0
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+15
-0
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
View file @
5fe57328
...
@@ -2399,6 +2399,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -2399,6 +2399,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
for
(
int
i
=
0
;
i
<
equipmentLists
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
equipmentLists
.
size
();
i
++)
{
JSONObject
equipmentItem
=
equipmentLists
.
getJSONObject
(
i
);
JSONObject
equipmentItem
=
equipmentLists
.
getJSONObject
(
i
);
equipmentItem
.
put
(
"useDate"
,
timeToMonths
(
useDateValue
));
equipmentItem
.
put
(
"useDate"
,
timeToMonths
(
useDateValue
));
// 过滤出目前在用的设备
if
(!
this
.
checkEquStatusInUse
(
equipmentItem
.
getString
(
"record"
))){
equipmentLists
.
remove
(
i
);
}
}
}
allEquipment
.
addAll
(
equipmentLists
);
allEquipment
.
addAll
(
equipmentLists
);
}
}
...
@@ -2449,6 +2453,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -2449,6 +2453,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
}
return
futureList
;
return
futureList
;
}
}
/**
* 根据record判断设备状态是否为【在用】
* @param record
* @return
*/
private
boolean
checkEquStatusInUse
(
String
record
)
{
IdxBizJgUseInfo
useInfo
=
idxBizJgUseInfoService
.
lambdaQuery
().
select
(
IdxBizJgUseInfo:
:
getEquState
).
eq
(
IdxBizJgUseInfo:
:
getRecord
,
record
).
one
();
return
EquimentEnum
.
ZAIYONG
.
getCode
().
toString
().
equals
(
useInfo
.
getEquState
());
}
/**
/**
* 导出基本信息汇总表(工业管道/气瓶)
* 导出基本信息汇总表(工业管道/气瓶)
*
*
...
...
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