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
a1c84ba0
Commit
a1c84ba0
authored
Dec 18, 2023
by
H2T
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):维保设备关系更新
parent
303433a5
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
JgMaintenanceContractServiceImpl.java
...jg/biz/service/impl/JgMaintenanceContractServiceImpl.java
+11
-5
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/JgMaintenanceContractServiceImpl.java
View file @
a1c84ba0
...
@@ -66,14 +66,17 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
...
@@ -66,14 +66,17 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
*/
*/
private
DataDictionary
getDict
(
String
dictType
,
String
dictCode
)
{
private
DataDictionary
getDict
(
String
dictType
,
String
dictCode
)
{
HashMap
<
String
,
String
>
dictMap
=
new
HashMap
<>();
HashMap
<
String
,
String
>
dictMap
=
new
HashMap
<>();
LambdaQueryWrapper
<
DataDictionary
>
queryWrapper
=
new
LambdaQueryWrapper
<
DataDictionary
>().
eq
(
DataDictionary:
:
getType
,
dictType
).
eq
(
DataDictionary:
:
getCode
,
dictCode
);
LambdaQueryWrapper
<
DataDictionary
>
queryWrapper
=
new
LambdaQueryWrapper
<
DataDictionary
>()
.
eq
(
DataDictionary:
:
getType
,
dictType
)
.
eq
(
DataDictionary:
:
getCode
,
dictCode
);
return
iDataDictionaryService
.
getOne
(
queryWrapper
);
return
iDataDictionaryService
.
getOne
(
queryWrapper
);
}
}
/**
/**
* 分页查询
* 分页查询
*/
*/
public
Page
<
JgMaintenanceContractVo
>
queryForPage
(
Page
<
JgMaintenanceContract
>
page
,
int
phase
,
JgMaintenanceContractDto
dto
,
ReginParams
reginParams
)
{
public
Page
<
JgMaintenanceContractVo
>
queryForPage
(
Page
<
JgMaintenanceContract
>
page
,
int
phase
,
JgMaintenanceContractDto
dto
,
ReginParams
reginParams
)
{
Page
<
JgMaintenanceContractDto
>
contractList
=
new
Page
<>();
Page
<
JgMaintenanceContractDto
>
contractList
=
new
Page
<>();
Page
<
JgMaintenanceContractVo
>
result
=
new
Page
<>();
Page
<
JgMaintenanceContractVo
>
result
=
new
Page
<>();
CompanyBo
company
=
reginParams
.
getCompany
();
CompanyBo
company
=
reginParams
.
getCompany
();
...
@@ -161,7 +164,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
...
@@ -161,7 +164,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
String
[]
split
=
dto
.
getApplyFlow
().
split
(
"-"
);
String
[]
split
=
dto
.
getApplyFlow
().
split
(
"-"
);
String
lastFlowName
=
split
[
split
.
length
-
1
];
String
lastFlowName
=
split
[
split
.
length
-
1
];
String
applyFlow
=
dto
.
getApplyFlow
()
+
"-"
+
MaintenanceEnum
.
getMsgByCode
(
Objects
.
requireNonNull
(
MaintenanceEnum
.
getEnumByMsg
(
lastFlowName
)).
getCode
()
+
1
);
String
applyFlow
=
dto
.
getApplyFlow
()
+
"-"
+
MaintenanceEnum
.
getMsgByCode
(
Objects
.
requireNonNull
(
MaintenanceEnum
.
getEnumByMsg
(
lastFlowName
)).
getCode
()
+
1
);
dto
.
setApplyFlow
(
applyFlow
);
dto
.
setApplyFlow
(
applyFlow
);
dto
.
setApplyStatus
(
FlowStatusEnum
.
TO_BE_PROCESSED
.
getName
());
dto
.
setApplyStatus
(
FlowStatusEnum
.
TO_BE_PROCESSED
.
getName
());
dto
.
setInstanceId
(
instanceId
);
dto
.
setInstanceId
(
instanceId
);
...
@@ -175,7 +179,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
...
@@ -175,7 +179,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
public
Boolean
revocation
(
JgMaintenanceContractDto
dto
)
{
public
Boolean
revocation
(
JgMaintenanceContractDto
dto
)
{
String
[]
split
=
dto
.
getApplyFlow
().
split
(
"-"
);
String
[]
split
=
dto
.
getApplyFlow
().
split
(
"-"
);
String
lastFlowName
=
split
[
split
.
length
-
1
];
String
lastFlowName
=
split
[
split
.
length
-
1
];
String
applyFlow
=
dto
.
getApplyFlow
()
+
"-"
+
MaintenanceEnum
.
getMsgByCode
(
Objects
.
requireNonNull
(
MaintenanceEnum
.
getEnumByMsg
(
lastFlowName
)).
getCode
()
-
1
);
String
applyFlow
=
dto
.
getApplyFlow
()
+
"-"
+
MaintenanceEnum
.
getMsgByCode
(
Objects
.
requireNonNull
(
MaintenanceEnum
.
getEnumByMsg
(
lastFlowName
)).
getCode
()
-
1
);
dto
.
setApplyFlow
(
applyFlow
);
dto
.
setApplyFlow
(
applyFlow
);
dto
.
setApplyStatus
(
FlowStatusEnum
.
TO_BE_SUBMITTED
.
getName
());
dto
.
setApplyStatus
(
FlowStatusEnum
.
TO_BE_SUBMITTED
.
getName
());
workFlowFeginService
.
rollBack
(
dto
.
getInstanceId
());
workFlowFeginService
.
rollBack
(
dto
.
getInstanceId
());
...
@@ -282,7 +287,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
...
@@ -282,7 +287,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
List
<
Integer
>
collect
=
EquipmentLists
.
stream
().
filter
(
Objects:
:
nonNull
).
collect
(
Collectors
.
toList
());
List
<
Integer
>
collect
=
EquipmentLists
.
stream
().
filter
(
Objects:
:
nonNull
).
collect
(
Collectors
.
toList
());
if
(!
collect
.
isEmpty
())
{
if
(!
collect
.
isEmpty
())
{
//先删除原先设备对应关系
//先删除原先设备对应关系
LambdaQueryWrapper
<
JgMaintenanceContractEq
>
queryWrapper
=
new
LambdaQueryWrapper
<
JgMaintenanceContractEq
>().
eq
(
JgMaintenanceContractEq:
:
getBusinessId
,
dto
.
getApplyNo
()).
eq
(
JgMaintenanceContractEq:
:
getIsDelete
,
false
);
LambdaQueryWrapper
<
JgMaintenanceContractEq
>
queryWrapper
=
new
LambdaQueryWrapper
<
JgMaintenanceContractEq
>()
.
eq
(
JgMaintenanceContractEq:
:
getIsDelete
,
false
);
List
<
Long
>
list
=
jgMaintenanceContractEqService
.
list
(
queryWrapper
).
stream
().
map
(
JgMaintenanceContractEq:
:
getSequenceNbr
).
collect
(
Collectors
.
toList
());
List
<
Long
>
list
=
jgMaintenanceContractEqService
.
list
(
queryWrapper
).
stream
().
map
(
JgMaintenanceContractEq:
:
getSequenceNbr
).
collect
(
Collectors
.
toList
());
jgMaintenanceContractEqService
.
deleteBatchSeq
(
list
);
jgMaintenanceContractEqService
.
deleteBatchSeq
(
list
);
//重新生成关系表
//重新生成关系表
...
...
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