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
9eafd313
Commit
9eafd313
authored
Jul 18, 2023
by
xixinzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
审核修改
parent
af537682
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
29 deletions
+20
-29
IPowerStationService.java
...os/boot/module/hygf/api/service/IPowerStationService.java
+2
-1
PowerStationServiceImpl.java
...module/hygf/biz/service/impl/PowerStationServiceImpl.java
+17
-27
SurveyInformationServiceImpl.java
...e/hygf/biz/service/impl/SurveyInformationServiceImpl.java
+1
-1
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IPowerStationService.java
View file @
9eafd313
...
...
@@ -16,9 +16,10 @@ public interface IPowerStationService {
/**
* 保存审核实例
* @param powerStation 审核对象
* @param flag 是否是最后一个节点
* @return 状态
*/
boolean
savePowerStation
(
PowerStation
powerStation
);
boolean
savePowerStation
(
PowerStation
powerStation
,
boolean
flag
);
/**
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java
View file @
9eafd313
...
...
@@ -77,23 +77,20 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
@Override
@Transactional
public
boolean
savePowerStation
(
PowerStation
powerStation
)
{
try
{
//流程节点code
String
flowTaskIdnext
=
this
.
getTaskNoAuth
(
powerStation
.
getProcessInstanceId
());
WorkDto
workDto
=
this
.
getNodeInfoCode
(
flowTaskIdnext
);
powerStation
.
setNextProcessNode
(
workDto
.
getNextProcessNode
());
powerStation
.
setNodeRole
(
workDto
.
getNodeRole
());
powerStation
.
setNodeRouting
(
workDto
.
getNodeRouting
());
return
this
.
saveOrUpdate
(
powerStation
);
}
catch
(
Exception
e
){
throw
new
BaseException
(
"获取工作流节点失败!"
,
"400"
,
"获取工作流节点失败!"
);
}
public
boolean
savePowerStation
(
PowerStation
powerStation
,
boolean
flag
)
{
try
{
//流程节点code
if
(
flag
)
{
String
flowTaskIdnext
=
this
.
getTaskNoAuth
(
powerStation
.
getProcessInstanceId
());
WorkDto
workDto
=
this
.
getNodeInfoCode
(
flowTaskIdnext
);
powerStation
.
setNextProcessNode
(
workDto
.
getNextProcessNode
());
powerStation
.
setNodeRole
(
workDto
.
getNodeRole
());
powerStation
.
setNodeRouting
(
workDto
.
getNodeRouting
());
}
return
this
.
saveOrUpdate
(
powerStation
);
}
catch
(
Exception
e
){
throw
new
BaseException
(
"获取工作流节点失败!"
,
"400"
,
"获取工作流节点失败!"
);
}
}
@Override
...
...
@@ -110,10 +107,9 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
// 1. 业务相关数据落表
PowerStation
powerStation
=
this
.
baseMapper
.
selectById
(
stationId
);
PowerStationNodeEnum
nodeByCode
=
PowerStationNodeEnum
.
getNodeByCode
(
nodeCode
);
boolean
flag
=
true
;
if
(
PowerStationNodeEnum
.
设计上传图纸
.
getCode
().
equals
(
nodeCode
)||
PowerStationNodeEnum
.
经销商上传图纸
.
getCode
().
equals
(
nodeCode
))
{
this
.
updateSeve
(
powerStation
.
getPeasantHouseholdId
(),
kv
);
}
else
{
String
result
=
String
.
valueOf
(
kv
.
get
(
"VERIFY_RESULT"
));
if
(
VERIFY_RESULT_NO
.
equals
(
result
))
{
...
...
@@ -132,6 +128,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
break
;
case
文件审核
:
if
(
VERIFY_RESULT_YES
.
equals
(
result
))
{
flag
=
false
;
powerStation
.
setProcessStatus
(
PowerStationProcessStateEnum
.
完成
.
getName
());
}
powerStation
.
setDrawingReview
(
resultObj
.
getName
());
...
...
@@ -155,15 +152,8 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
JSONObject
resultObj
=
record
.
getResult
();
String
flowTaskId
=
String
.
valueOf
(
resultObj
.
get
(
"flowTaskId"
));
powerStation
.
setFlowTaskId
(
flowTaskId
);
//流程节点code
String
flowTaskIdnext
=
this
.
getTaskNoAuth
(
planInstanceId
);
WorkDto
workDto
=
this
.
getNodeInfoCode
(
flowTaskIdnext
);
powerStation
.
setNextProcessNode
(
workDto
.
getNextProcessNode
());
powerStation
.
setNodeRole
(
workDto
.
getNodeRole
());
powerStation
.
setNodeRouting
(
workDto
.
getNodeRouting
());
}
powerStationService
.
savePowerStation
(
powerStation
);
powerStationService
.
savePowerStation
(
powerStation
,
flag
);
}
}
catch
(
Exception
e
){
throw
new
BaseException
(
"获取工作流节点失败!"
,
"400"
,
"获取工作流节点失败!"
);
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java
View file @
9eafd313
...
...
@@ -233,7 +233,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
powerStation
.
setFlowTaskId
(
flowTaskId
);
powerStation
.
setNextProcessNode
(
PowerStationNodeEnum
.
设计审核
.
getCode
());
}
powerStationService
.
savePowerStation
(
powerStation
);
powerStationService
.
savePowerStation
(
powerStation
,
true
);
}
}
catch
(
Exception
e
){
throw
new
BaseException
(
"获取工作流节点失败!"
,
"400"
,
"获取工作流节点失败!"
);
...
...
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