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
ee682228
Commit
ee682228
authored
Jul 17, 2023
by
tangwei
Browse files
Options
Browse Files
Download
Plain Diff
解决冲突
parents
fa32a87e
698d098d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
PowerStationNodeEnum.java
.../amos/boot/module/hygf/api/Enum/PowerStationNodeEnum.java
+2
-0
PowerStationServiceImpl.java
...module/hygf/biz/service/impl/PowerStationServiceImpl.java
+1
-1
SurveyInformationServiceImpl.java
...e/hygf/biz/service/impl/SurveyInformationServiceImpl.java
+2
-2
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/PowerStationNodeEnum.java
View file @
ee682228
...
@@ -12,6 +12,7 @@ import lombok.Getter;
...
@@ -12,6 +12,7 @@ import lombok.Getter;
@AllArgsConstructor
@AllArgsConstructor
public
enum
PowerStationNodeEnum
{
public
enum
PowerStationNodeEnum
{
经销商审核
(
"经销商确认"
,
"hygf_02"
),
经销商审核
(
"经销商确认"
,
"hygf_02"
),
设计审核
(
"设计审核"
,
"hygf_03"
),
设计审核
(
"设计审核"
,
"hygf_03"
),
投融审核
(
"投融审核"
,
"hygf_05"
),
投融审核
(
"投融审核"
,
"hygf_05"
),
...
@@ -20,6 +21,7 @@ public enum PowerStationNodeEnum {
...
@@ -20,6 +21,7 @@ public enum PowerStationNodeEnum {
经销商上传图纸
(
"经销商上传图纸"
,
"hygf_10"
),
经销商上传图纸
(
"经销商上传图纸"
,
"hygf_10"
),
文件审核
(
"文件审核"
,
"hygf_11"
);
文件审核
(
"文件审核"
,
"hygf_11"
);
/**
/**
* 名称,描述
* 名称,描述
*/
*/
...
...
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 @
ee682228
...
@@ -64,7 +64,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
...
@@ -64,7 +64,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
@Override
@Override
public
PowerStation
getObjByNhId
(
String
id
,
String
state
)
{
public
PowerStation
getObjByNhId
(
String
id
,
String
state
)
{
LambdaQueryWrapper
<
PowerStation
>
wrapper
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
PowerStation
>
wrapper
=
new
LambdaQueryWrapper
<>();
wrapper
.
eq
(
PowerStation:
:
getProcessStatus
,
state
);
wrapper
.
ne
(
PowerStation:
:
getProcessStatus
,
state
);
wrapper
.
eq
(
PowerStation:
:
getPeasantHouseholdId
,
id
);
wrapper
.
eq
(
PowerStation:
:
getPeasantHouseholdId
,
id
);
return
this
.
baseMapper
.
selectOne
(
wrapper
);
return
this
.
baseMapper
.
selectOne
(
wrapper
);
}
}
...
...
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 @
ee682228
...
@@ -185,7 +185,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
...
@@ -185,7 +185,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
}
}
private
void
submitExamine
(
PeasantHousehold
peasantHousehold
)
{
private
void
submitExamine
(
PeasantHousehold
peasantHousehold
)
{
PowerStation
powerStation
=
powerStationService
.
getObjByNhId
(
String
.
valueOf
(
peasantHousehold
.
getSequenceNbr
()),
PowerStationProcessStateEnum
.
进行中
.
getCode
());
PowerStation
powerStation
=
powerStationService
.
getObjByNhId
(
String
.
valueOf
(
peasantHousehold
.
getSequenceNbr
()),
PowerStationProcessStateEnum
.
作废
.
getCode
());
String
taskId
=
null
;
String
taskId
=
null
;
Map
<
String
,
Object
>
objectMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
objectMap
=
new
HashMap
<>();
...
@@ -210,7 +210,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
...
@@ -210,7 +210,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
powerStation
.
setOwnersName
(
peasantHousehold
.
getOwnersName
());
powerStation
.
setOwnersName
(
peasantHousehold
.
getOwnersName
());
powerStation
.
setProjectAddress
(
peasantHousehold
.
getProjectAddressName
());
powerStation
.
setProjectAddress
(
peasantHousehold
.
getProjectAddressName
());
powerStation
.
setPeasantHouseholdId
(
String
.
valueOf
(
peasantHousehold
.
getSequenceNbr
()));
powerStation
.
setPeasantHouseholdId
(
String
.
valueOf
(
peasantHousehold
.
getSequenceNbr
()));
powerStation
.
setProcessStatus
(
PowerStationProcessStateEnum
.
进行中
.
get
Cod
e
());
powerStation
.
setProcessStatus
(
PowerStationProcessStateEnum
.
进行中
.
get
Nam
e
());
log
.
info
(
"流程执行成功:{}"
,
code
);
log
.
info
(
"流程执行成功:{}"
,
code
);
// 获取流程信息
// 获取流程信息
FeignClientResult
<
JSONObject
>
record
=
idxFeginService
.
getRecord
(
code
);
FeignClientResult
<
JSONObject
>
record
=
idxFeginService
.
getRecord
(
code
);
...
...
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