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
dfb525ab
Commit
dfb525ab
authored
Jan 25, 2024
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
电站详情增加施工,并网派工信息
parent
1ba3fd03
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
76 additions
and
1 deletion
+76
-1
WorkOrderPowerStationMapper.xml
...in/resources/mapper/mysql/WorkOrderPowerStationMapper.xml
+2
-1
SurveyInformationServiceImpl.java
...e/hygf/biz/service/impl/SurveyInformationServiceImpl.java
+74
-0
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderPowerStationMapper.xml
View file @
dfb525ab
...
@@ -5,7 +5,8 @@
...
@@ -5,7 +5,8 @@
<select
id=
"selectPeasantHousehold"
resultType=
"com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold"
>
<select
id=
"selectPeasantHousehold"
resultType=
"com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold"
>
SELECT
SELECT
hygf_peasant_household.*
hygf_peasant_household.*,
hygf_peasant_household.sequence_nbr stationId
FROM
FROM
hygf_work_order_power_station
hygf_work_order_power_station
LEFT JOIN hygf_peasant_household ON hygf_work_order_power_station.peasant_household_id = hygf_peasant_household.sequence_nbr
LEFT JOIN hygf_peasant_household ON hygf_work_order_power_station.peasant_household_id = hygf_peasant_household.sequence_nbr
...
...
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 @
dfb525ab
...
@@ -97,6 +97,26 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
...
@@ -97,6 +97,26 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
private
static
final
String
IDX_REQUEST_STATE
=
"200"
;
private
static
final
String
IDX_REQUEST_STATE
=
"200"
;
@Autowired
@Autowired
PersonnelBusinessMapper
personnelBusinessMapper
;
PersonnelBusinessMapper
personnelBusinessMapper
;
@Autowired
WorkOrderMapper
workOrderMapper
;
@Autowired
HygfOnGridMapper
hygfOnGridMapper
;
@Autowired
ConstructionRecordsServiceImpl
constructionRecordsServiceImpl
;
@Autowired
ConstructionRecordsMapper
constructionRecordsMapper
;
@Autowired
BasicGridAcceptanceMapper
basicGridAcceptanceMapper
;
@Autowired
SurveyInformationMapper
surveyInformationMapper
;
@Autowired
PowerStationConstructionDataMapper
powerStationConstructionDataMapper
;
@Autowired
PowerStationEngineeringInfoMapper
powerStationEngineeringInfoMapper
;
@Autowired
WorkOrderPowerStationMapper
workOrderPowerStationMapper
;
/**
/**
* 分页查询
* 分页查询
*/
*/
...
@@ -404,6 +424,60 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
...
@@ -404,6 +424,60 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
surveyInfoAllDto
.
setDesignInformation
(
BeanDtoUtils
.
convert
(
designInformation
,
DesignInformationDto
.
class
));
surveyInfoAllDto
.
setDesignInformation
(
BeanDtoUtils
.
convert
(
designInformation
,
DesignInformationDto
.
class
));
}
}
LambdaQueryWrapper
<
WorkOrderPowerStation
>
up1
=
new
LambdaQueryWrapper
();
up1
.
eq
(
WorkOrderPowerStation:
:
getPeasantHouseholdId
,
peasantHouseholdId
);
WorkOrderPowerStation
workOrderPowerStation
=
workOrderPowerStationMapper
.
selectOne
(
up1
);
if
(
workOrderPowerStation
!=
null
){
Long
workOrderId
=
workOrderPowerStation
.
getWorkOrderId
();
Long
workOrderPowerStationId
=
workOrderPowerStation
.
getSequenceNbr
();
//派工单信息
LambdaQueryWrapper
<
WorkOrder
>
upl
=
new
LambdaQueryWrapper
();
upl
.
eq
(
WorkOrder:
:
getSequenceNbr
,
workOrderId
);
WorkOrder
workOrder
=
workOrderMapper
.
selectOne
(
upl
);
//施工信息
LambdaQueryWrapper
<
PowerStationConstructionData
>
up2
=
new
LambdaQueryWrapper
();
up2
.
eq
(
PowerStationConstructionData:
:
getWorkOrderId
,
workOrderId
);
up2
.
eq
(
PowerStationConstructionData:
:
getWorkOrderPowerStationId
,
workOrderPowerStationId
);
PowerStationConstructionData
powerStationConstructionData
=
powerStationConstructionDataMapper
.
selectOne
(
up2
);
//工程信息
LambdaQueryWrapper
<
PowerStationEngineeringInfo
>
up3
=
new
LambdaQueryWrapper
();
up3
.
eq
(
PowerStationEngineeringInfo:
:
getWorkOrderId
,
workOrderId
);
up3
.
eq
(
PowerStationEngineeringInfo:
:
getWorkOrderPowerStationId
,
workOrderPowerStationId
);
PowerStationEngineeringInfo
powerStationEngineeringInfo
=
powerStationEngineeringInfoMapper
.
selectOne
(
up3
);
if
(
powerStationConstructionData
!=
null
){
powerStationEngineeringInfo
=
powerStationEngineeringInfo
!=
null
?
powerStationEngineeringInfo:
new
PowerStationEngineeringInfo
();
powerStationEngineeringInfo
.
setConstructionComponentInfo
(
powerStationConstructionData
.
getConstructionComponentInfo
());
powerStationEngineeringInfo
.
setConstructionInverterInfo
(
powerStationConstructionData
.
getConstructionInverterInfo
());
powerStationEngineeringInfo
.
setConstructionCollectorBoxInfo
(
powerStationConstructionData
.
getConstructionCollectorBoxInfo
());
powerStationEngineeringInfo
.
setConstructionGridBoxInfo
(
powerStationConstructionData
.
getConstructionGridBoxInfo
());
powerStationEngineeringInfo
.
setProjectRegionManager
(
workOrder
.
getProjectRegionManager
());
powerStationEngineeringInfo
.
setProjectRegionManagerPhone
(
workOrder
.
getProjectRegionManagerPhone
());
powerStationEngineeringInfo
.
setConstructionRegionManager
(
workOrder
.
getConstructionRegionManager
());
powerStationEngineeringInfo
.
setConstructionRegionManagerPhone
(
workOrder
.
getConstructionRegionManagerPhone
());
}
//并网信息
LambdaQueryWrapper
<
HygfOnGrid
>
up4
=
new
LambdaQueryWrapper
();
up4
.
eq
(
HygfOnGrid:
:
getWorkOrderId
,
workOrderId
);
up4
.
eq
(
HygfOnGrid:
:
getWorkOrderPowerStationId
,
workOrderPowerStationId
);
HygfOnGrid
hygfOnGrid
=
hygfOnGridMapper
.
selectOne
(
up4
);
surveyInfoAllDto
.
setHygfOnGrid
(
hygfOnGrid
!=
null
?
hygfOnGrid:
new
HygfOnGrid
());
surveyInfoAllDto
.
setPowerStationConstructionData
(
powerStationConstructionData
!=
null
?
powerStationConstructionData:
new
PowerStationConstructionData
());
surveyInfoAllDto
.
setPowerStationEngineeringInfo
(
powerStationEngineeringInfo
!=
null
?
powerStationEngineeringInfo:
new
PowerStationEngineeringInfo
());
surveyInfoAllDto
.
setWorkOrder
(
workOrder
!=
null
?
workOrder:
new
WorkOrder
());
}
else
{
surveyInfoAllDto
.
setHygfOnGrid
(
new
HygfOnGrid
());
surveyInfoAllDto
.
setPowerStationConstructionData
(
new
PowerStationConstructionData
());
surveyInfoAllDto
.
setPowerStationEngineeringInfo
(
new
PowerStationEngineeringInfo
());
surveyInfoAllDto
.
setWorkOrder
(
new
WorkOrder
());
}
if
(!
StringUtils
.
isEmpty
(
processInstanceId
)){
if
(!
StringUtils
.
isEmpty
(
processInstanceId
)){
try
{
try
{
Map
<
String
,
Object
>
flowLoggerMap
=
workflowFeignClient
.
getFlowLogger
(
processInstanceId
).
getResult
();
Map
<
String
,
Object
>
flowLoggerMap
=
workflowFeignClient
.
getFlowLogger
(
processInstanceId
).
getResult
();
...
...
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