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
38f26da1
Commit
38f26da1
authored
Mar 13, 2024
by
tianbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
登记类修改并发问题-维保备案提交按钮处理
parent
cae9636d
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
33 additions
and
8 deletions
+33
-8
JgMaintenanceContractMapper.xml
...src/main/resources/mapper/JgMaintenanceContractMapper.xml
+2
-1
JgChangeRegistrationTransferController.java
...iz/controller/JgChangeRegistrationTransferController.java
+1
-1
JgEnableDisableController.java
...t/module/jg/biz/controller/JgEnableDisableController.java
+1
-1
JgScrapCancelController.java
...oot/module/jg/biz/controller/JgScrapCancelController.java
+1
-1
JgChangeRegistrationReformServiceImpl.java
...z/service/impl/JgChangeRegistrationReformServiceImpl.java
+10
-3
JgChangeRegistrationTransferServiceImpl.java
...service/impl/JgChangeRegistrationTransferServiceImpl.java
+4
-0
JgChangeRegistrationUnitServiceImpl.java
...biz/service/impl/JgChangeRegistrationUnitServiceImpl.java
+5
-1
JgEnableDisableServiceImpl.java
...odule/jg/biz/service/impl/JgEnableDisableServiceImpl.java
+2
-0
JgMaintenanceContractServiceImpl.java
...jg/biz/service/impl/JgMaintenanceContractServiceImpl.java
+3
-0
JgScrapCancelServiceImpl.java
.../module/jg/biz/service/impl/JgScrapCancelServiceImpl.java
+4
-0
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintenanceContractMapper.xml
View file @
38f26da1
...
...
@@ -121,7 +121,8 @@
promoter,
next_execute_ids,
create_user_id,
next_execute_user_ids
next_execute_user_ids,
next_task_id
FROM
amos_tzs_biz.tzs_jg_maintenance_contract
<where>
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationTransferController.java
View file @
38f26da1
...
...
@@ -91,7 +91,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
jgChangeRegistrationTransferService
.
flowExecute
(
Long
.
valueOf
(
String
.
valueOf
(
map
.
get
(
"sequenceNbr"
))),
String
.
valueOf
(
map
.
get
(
"instanceId"
)),
String
.
valueOf
(
map
.
get
(
"operate"
)),
String
.
valueOf
(
map
.
get
(
"op
erate
"
)),
String
.
valueOf
(
map
.
get
(
"op
inion
"
)),
String
.
valueOf
(
map
.
get
(
"nextTaskId"
)));
return
ResponseHelper
.
buildResponse
(
"ok"
);
}
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgEnableDisableController.java
View file @
38f26da1
...
...
@@ -67,7 +67,7 @@ public class JgEnableDisableController extends BaseController {
jgEnableDisableServiceImpl
.
flowExecute
(
Long
.
valueOf
(
String
.
valueOf
(
map
.
get
(
"sequenceNbr"
))),
String
.
valueOf
(
map
.
get
(
"instanceId"
)),
String
.
valueOf
(
map
.
get
(
"operate"
)),
String
.
valueOf
(
map
.
get
(
"
operate
"
)),
String
.
valueOf
(
map
.
get
(
"
comment
"
)),
String
.
valueOf
(
map
.
get
(
"nextTaskId"
)));
return
ResponseHelper
.
buildResponse
(
"ok"
);
}
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgScrapCancelController.java
View file @
38f26da1
...
...
@@ -82,7 +82,7 @@ public class JgScrapCancelController extends BaseController {
Long
.
valueOf
(
String
.
valueOf
(
jgScrapCancelDto
.
getSequenceNbr
())),
jgScrapCancelDto
.
getInstanceId
(),
String
.
valueOf
(
map
.
get
(
"operate"
)),
String
.
valueOf
(
map
.
get
(
"op
erate
"
)),
String
.
valueOf
(
map
.
get
(
"op
inion
"
)),
String
.
valueOf
(
map
.
get
(
"nextTaskId"
)));
return
ResponseHelper
.
buildResponse
(
"ok"
);
}
...
...
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/JgChangeRegistrationReformServiceImpl.java
View file @
38f26da1
...
...
@@ -162,9 +162,16 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
if
(
map
.
containsKey
(
"receiveCompanyCode"
))
{
String
receiveCompanyCode
=
String
.
valueOf
(
map
.
getString
(
"receiveCompanyCode"
));
// jgChangeRegistrationReform.setReceiveCompanyCode(receiveCompanyCode);
jgChangeRegistrationReform
.
setReceiveCompanyCode
(
receiveCompanyCode
.
split
(
"_"
)[
0
]);
jgChangeRegistrationReform
.
setReceiveOrgCode
(
receiveCompanyCode
.
split
(
"_"
)[
0
]);
jgChangeRegistrationReform
.
setReceiveOrgName
(
receiveCompanyCode
.
split
(
"_"
)[
1
]);
String
[]
receiveCompany
=
receiveCompanyCode
.
split
(
"_"
);
if
(!
ValidationUtil
.
isEmpty
(
receiveCompany
))
{
jgChangeRegistrationReform
.
setReceiveCompanyCode
(
receiveCompanyCode
.
split
(
"_"
)[
0
]);
jgChangeRegistrationReform
.
setReceiveOrgCode
(
receiveCompanyCode
.
split
(
"_"
)[
0
]);
if
(
receiveCompany
.
length
>
1
)
{
jgChangeRegistrationReform
.
setReceiveOrgName
(
receiveCompanyCode
.
split
(
"_"
)[
1
]);
}
else
{
jgChangeRegistrationReform
.
setReceiveOrgName
(
String
.
valueOf
(
map
.
get
(
"receiveOrgName"
)));
}
}
}
else
{
jgChangeRegistrationReform
.
setReceiveCompanyCode
(
"610000"
);
...
...
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/JgChangeRegistrationTransferServiceImpl.java
View file @
38f26da1
...
...
@@ -584,6 +584,10 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
if
(!
ValidationUtil
.
isEmpty
(
historyData
))
{
Map
<
String
,
Object
>
newPosition
=
JSON
.
parseObject
(
historyData
.
getChangeData
(),
Map
.
class
);
resultDataMap
.
putAll
(
newPosition
);
if
(!
ValidationUtil
.
isEmpty
(
transferById
))
{
Map
<
String
,
Object
>
transferToMap
=
Bean
.
BeantoMap
(
transferById
);
resultDataMap
.
putAll
(
transferToMap
);
}
// String record = newPosition.getString("record");
// String receiveOrgCode = newPosition.getString("receiveOrgCode");
...
...
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/JgChangeRegistrationUnitServiceImpl.java
View file @
38f26da1
...
...
@@ -257,6 +257,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
JgChangeRegistrationUnitMapper
.
updateById
(
notice
);
commonServiceImpl
.
deleteTaskModel
(
notice
.
getSequenceNbr
()+
""
);
createTaskModel
(
notice
,
taskname
,
"1"
,
nextUserIds
);
commonServiceImpl
.
saveExecuteFlowData2Redis
(
notice
.
getInstanceId
(),
buildInstanceRuntimeData
(
notice
));
}
else
{
ArrayList
<
String
>
roleList
=
new
ArrayList
<>();
String
taskId
=
noticeDto
.
getNextTaskId
();
...
...
@@ -301,7 +302,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
executeOneStep
(
bean
,
taskName1
,
nextUserIds
,
op
);
bean
.
setNextExecuteUserIds
(
nextUserIds
);
JgChangeRegistrationUnitMapper
.
updateById
(
bean
);
}
commonServiceImpl
.
saveExecuteFlowData2Redis
(
bean
.
getInstanceId
(),
buildInstanceRuntimeData
(
bean
));
}
}
else
{
JgChangeRegistrationUnit
bean
=
new
JgChangeRegistrationUnit
();
BeanUtils
.
copyProperties
(
noticeDto
,
bean
);
...
...
@@ -560,6 +562,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
dto
.
setStartDate
(
new
Date
());
dto
.
setNextExecuteUser
(
workflowResultDtos
.
get
(
0
).
getNextExecutorRoleIds
());
modelDtos
.
add
(
dto
);
commonServiceImpl
.
saveExecuteFlowData2Redis
(
obj
.
getInstanceId
(),
buildInstanceRuntimeData
(
obj
));
}
}
else
{
for
(
JgChangeRegistrationUnit
obj
:
list
)
{
...
...
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/JgEnableDisableServiceImpl.java
View file @
38f26da1
...
...
@@ -184,6 +184,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
//业务数据组装等
businessData
(
submit
,
reginParams
,
jgEnableDisable
,
map
,
workflowResultList
);
}
commonService
.
saveExecuteFlowData2Redis
(
jgEnableDisable
.
getInstanceId
(),
buildInstanceRuntimeData
(
jgEnableDisable
));
}
else
{
jgEnableDisable
.
setNextExecuteUserIds
(
reginParams
.
getUserModel
().
getUserId
());
jgEnableDisable
.
setCreateUserId
(
reginParams
.
getUserModel
().
getUserId
());
...
...
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 @
38f26da1
...
...
@@ -665,6 +665,9 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
BeanUtil
.
copyProperties
(
contract
,
taskMessageDto
);
taskModelDto
.
setModel
(
taskMessageDto
);
commonService
.
buildTaskModel
(
Collections
.
singletonList
(
taskModelDto
));
// redis流程实时数据更新
commonService
.
saveExecuteFlowData2Redis
(
contract
.
getInstanceId
(),
this
.
buildInstanceRuntimeData
(
contract
));
}
}
...
...
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/JgScrapCancelServiceImpl.java
View file @
38f26da1
...
...
@@ -255,6 +255,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
String
equListName
=
EquipmentClassifityEnum
.
getNameByCode
(
jgScrapCancel
.
getEquList
());
jgScrapCancel
.
setEquListDesc
(
equListName
);
jgScrapCancel
.
setCancelTypeDesc
(
"1"
.
equals
(
jgScrapCancel
.
getCancelType
())
?
"报废注销"
:
"移装注销"
);
commonService
.
saveExecuteFlowData2Redis
(
instanceId
,
buildInstanceRuntimeData
(
jgScrapCancel
));
return
jgScrapCancel
;
}
...
...
@@ -413,6 +415,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
JgScrapCancelEq
jgScrapCancelEq
=
new
JgScrapCancelEq
();
jgScrapCancelEq
.
setEquId
(
jgScrapCancelDto
.
getRecord
());
jgScrapCancelEqMapper
.
update
(
jgScrapCancelEq
,
updateWrapper
);
commonService
.
saveExecuteFlowData2Redis
(
jgScrapCancel
.
getInstanceId
(),
buildInstanceRuntimeData
(
jgScrapCancel
));
}
else
{
if
(!
ObjectUtils
.
isEmpty
(
jgScrapCancelDto
.
getSEQUENCE_NBR
())
&&
!
"null"
.
equals
(
jgScrapCancelDto
.
getSEQUENCE_NBR
()))
{
LambdaQueryWrapper
<
OtherInfo
>
otherLambda
=
new
QueryWrapper
<
OtherInfo
>().
lambda
();
...
...
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