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
03d9ae5c
Commit
03d9ae5c
authored
Jul 24, 2024
by
王果
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修改:21260
parent
ab457eb6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+2
-2
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 @
03d9ae5c
...
...
@@ -2135,8 +2135,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
*/
private
void
fillHistoryDataWithNewEquip
(
JSONObject
jsonObject
,
JgUseRegistration
jgUseRegistration
,
String
record
)
{
// 非已完成、非作废时显示设备最新信息。前置需求:一个设备只能同时发起一个流程
if
(!(
jgUseRegistration
.
getStatus
().
equals
(
FlowStatusEnum
.
TO_BE_FINISHED
.
getName
())
||
jgUseRegistration
.
getStatus
().
equals
(
FlowStatusEnum
.
TO_BE_DISCARD
.
getName
()))
if
(!(
FlowStatusEnum
.
TO_BE_FINISHED
.
getName
().
equals
(
jgUseRegistration
.
getStatus
())
||
FlowStatusEnum
.
TO_BE_DISCARD
.
getName
().
equals
(
jgUseRegistration
.
getStatus
()))
||
"1"
.
equals
(
jgUseRegistration
.
getRegType
()))
{
// 基本信息 + 制造信息
Map
<
String
,
Object
>
detail
=
this
.
baseMapper
.
getDetail
(
record
);
...
...
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