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
a369c570
Commit
a369c570
authored
Jul 08, 2024
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.报检申请自测bug
parent
1eb2574c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
4 deletions
+11
-4
JyjcInspectionApplicationServiceImpl.java
...iz/service/impl/JyjcInspectionApplicationServiceImpl.java
+11
-4
No files found.
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java
View file @
a369c570
...
@@ -229,10 +229,19 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
...
@@ -229,10 +229,19 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
model
.
setPromoter
(
RequestContext
.
getExeUserId
());
model
.
setPromoter
(
RequestContext
.
getExeUserId
());
model
.
setNextExecuteUserIds
(
nextUserIds
);
model
.
setNextExecuteUserIds
(
nextUserIds
);
model
.
setStatus
(
String
.
valueOf
(
FlowStatusEnum
.
TO_SUBMITTED
.
getCode
()));
//6611 对应数据字典 检验流程状态 待受理
model
.
setStatus
(
String
.
valueOf
(
FlowStatusEnum
.
TO_SUBMITTED
.
getCode
()));
//6611 对应数据字典 检验流程状态 待受理
model
.
setStatusName
(
FlowStatusEnum
.
TO_SUBMITTED
.
getName
());
commonService
.
saveExecuteFlowData2Redis
(
model
.
getProcessInstanceId
(),
this
.
buildInstanceRuntimeData
(
model
));
commonService
.
saveExecuteFlowData2Redis
(
model
.
getProcessInstanceId
(),
this
.
buildInstanceRuntimeData
(
model
));
}
else
if
(
"1"
.
equals
(
model
.
getOperationType
()))
{
// 工作台暂存、详情保存逻辑
}
else
if
(
"1"
.
equals
(
model
.
getOperationType
()))
{
// 工作台暂存、详情保存逻辑
if
(
null
==
model
.
getSequenceNbr
()){
// 工作台暂存
model
.
setStatus
(
String
.
valueOf
(
FlowStatusEnum
.
TO_BE_SUBMITTED
.
getCode
()));
model
.
setStatusName
(
FlowStatusEnum
.
TO_BE_SUBMITTED
.
getName
());
}
else
{
// 详情保存
log
.
info
(
"详情保存,不修改业务状态"
);
}
setNameAndIsMustAccept
(
model
);
setNameAndIsMustAccept
(
model
);
model
.
setStatus
(
String
.
valueOf
(
FlowStatusEnum
.
TO_BE_SUBMITTED
.
getCode
()));
}
}
LambdaQueryWrapper
<
JyjcOpeningApplication
>
wa
=
new
LambdaQueryWrapper
<
JyjcOpeningApplication
>().
eq
(
JyjcOpeningApplication:
:
getUnitCode
,
model
.
getInspectionUnitCode
()).
eq
(
JyjcOpeningApplication:
:
getStatus
,
FlowStatusEnum
.
TO_BE_FINISHED
.
getCode
());
LambdaQueryWrapper
<
JyjcOpeningApplication
>
wa
=
new
LambdaQueryWrapper
<
JyjcOpeningApplication
>().
eq
(
JyjcOpeningApplication:
:
getUnitCode
,
model
.
getInspectionUnitCode
()).
eq
(
JyjcOpeningApplication:
:
getStatus
,
FlowStatusEnum
.
TO_BE_FINISHED
.
getCode
());
...
@@ -249,8 +258,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
...
@@ -249,8 +258,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
model
.
setApplicationDate
(
new
Date
());
model
.
setApplicationDate
(
new
Date
());
model
.
setPromoter
(
reginParams
.
getUserModel
().
getUserId
());
model
.
setPromoter
(
reginParams
.
getUserModel
().
getUserId
());
model
.
setApplicationUnitName
(
reginParams
.
getCompany
().
getCompanyName
());
model
.
setApplicationUnitName
(
reginParams
.
getCompany
().
getCompanyName
());
jyjcInspectionApplicationEquipService
.
getBaseMapper
().
deleteByApplicationSeq
(
model
.
getSequenceNbr
());
List
<
JyjcInspectionApplicationEquip
>
equipInfos
=
new
ArrayList
<>();
List
<
JyjcInspectionApplicationEquip
>
equipInfos
=
new
ArrayList
<>();
if
(
null
!=
model
.
getEquip
()
&&
model
.
getEquip
().
size
()
>
0
)
{
if
(
null
!=
model
.
getEquip
()
&&
model
.
getEquip
().
size
()
>
0
)
{
List
<
JyjcInspectionApplicationEquipDto
>
equips
=
JSONObject
.
parseArray
(
JSON
.
toJSONString
(
model
.
getEquip
()),
JyjcInspectionApplicationEquipDto
.
class
);
List
<
JyjcInspectionApplicationEquipDto
>
equips
=
JSONObject
.
parseArray
(
JSON
.
toJSONString
(
model
.
getEquip
()),
JyjcInspectionApplicationEquipDto
.
class
);
...
@@ -298,8 +305,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
...
@@ -298,8 +305,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
taskModelService
.
buildTaskModel
(
Arrays
.
asList
(
dto
));
taskModelService
.
buildTaskModel
(
Arrays
.
asList
(
dto
));
}
}
}
else
{
}
else
{
jyjcInspectionApplicationEquipService
.
getBaseMapper
().
deleteByApplicationSeq
(
model
.
getSequenceNbr
());
model
=
this
.
updateWithModel
(
model
);
model
=
this
.
updateWithModel
(
model
);
if
(
StringUtils
.
isNotBlank
(
model
.
getProcessInstanceId
())
&&
model
.
getOperationType
().
equals
(
"0"
))
{
if
(
StringUtils
.
isNotBlank
(
model
.
getProcessInstanceId
())
&&
model
.
getOperationType
().
equals
(
"0"
))
{
taskModelService
.
deleteTaskModel
(
model
.
getSequenceNbr
()
+
""
);
taskModelService
.
deleteTaskModel
(
model
.
getSequenceNbr
()
+
""
);
this
.
createdTaskModel
(
model
);
this
.
createdTaskModel
(
model
);
...
...
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