Skip to content

A
amos-boot-zx-biz
Commit b2febf4d authored by chenzhao's avatar chenzhao
Browse files
Options

并网优化

parent 1d0d1069
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 22 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml
View file @ b2febf4d
......@@ -63,11 +63,13 @@
<if test="map.projectAddress != null and map.projectAddress!=''">
AND hph.project_address_name LIKE concat(concat('%', #{map.projectAddress}), '%')
</if>
<if test="map.basicGridNodes != null and map.basicGridNodes.size()>0 and map.type != null">
AND hbga.grid_node IN
<foreach collection="map.basicGridNodes" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
<if test="map.type != null">
and ( hbga.grid_node is not null
or hbga.grid_node = 'all'
or hbga.power_station_area_status is not null
or hbga.power_station_design_status is not null
or hbga.power_station_engineering_status is not null
)
</if>
<if test="map.ownersName != null and map.ownersName !=''">
AND hph.owners_name LIKE concat(concat('%', #{map.ownersName}), '%')
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/pom.xml
View file @ b2febf4d
......@@ -26,11 +26,6 @@
<!-- <version>${amos-biz-boot.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>org.typroject</groupId>
<artifactId>tyboot-component-emq</artifactId>
<version>1.1.20</version>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java
View file @ b2febf4d
......@@ -499,6 +499,24 @@ public class BasicGridAcceptanceServiceImpl
up.set(BasicGridRecord::getPowerStationAreaStatus,approvalStatus.equals("0")?"通过":"驳回");
up.set(BasicGridRecord::getBasicGridNode,"bw-design,bw-engineering");
up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ROLESDSH.getCode());
LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待提交","待审核"));
query.in(HygfRectificationOrder::getRectificationSource,Arrays.asList("bw-design","bw-engineering"));
List<HygfRectificationOrder> hygfRectificationOrders = rectificationOrderService.getBaseMapper().selectList(query);
for (HygfRectificationOrder hygfRectificationOrder : hygfRectificationOrders) {
if (hygfRectificationOrder.getRectificationStatus().equals("待审核")){
up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ZGDSH.getCode());
break;
}
if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
up.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
break;
}
if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ROLESDSH.getCode());
}
}
this.wofkflowExcute(instanceId, approvalStatus , comment );
break;
case "bw-design":
......@@ -524,17 +542,16 @@ public class BasicGridAcceptanceServiceImpl
acceptanceCheck.setAcceptanceCheckStatus(GridStatusEnum.DTJYS.getCode());
acceptanceCheckService.saveOrUpdate(acceptanceCheck);
}else if( null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") && ( Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("bw-bw-engineering")) ) ) {
up.set(BasicGridRecord::getBasicGridNode,"bw-engineering");
up.set(BasicGridRecord::getGridStatus,GridStatusEnum.GCDSH.getCode());
}else if( null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") && basicGridRecord.getRectificationStatus() .contains("bw-engineering") ) {
up.set(BasicGridRecord::getBasicGridNode,"bw-engineering");
LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","整改待审核","待提交"));
query.eq(HygfRectificationOrder::getRectificationSource,"bw-engineering");
HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query);
LambdaQueryWrapper<HygfRectificationOrder> query2 = new LambdaQueryWrapper<>();
query2.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
query2.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待审核","待提交"));
query2.eq(HygfRectificationOrder::getRectificationSource,"bw-engineering");
HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query2);
if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
up.set(BasicGridRecord::getGridStatus,GridStatusEnum.SJDSH.getCode());
}else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
......@@ -576,11 +593,11 @@ public class BasicGridAcceptanceServiceImpl
up.set(BasicGridRecord::getGridStatus,GridStatusEnum.SJDSH.getCode());
}else if( null == basicGridRecord.getPowerStationDesignStatus() &&approvalStatus.equals("0") && !Objects.isNull(basicGridRecord.getRectificationStatus()) && basicGridRecord.getRectificationStatus().contains("bw-bw-design") ) {
up.set(BasicGridRecord::getBasicGridNode,"bw-design");
LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","整改待审核","待提交"));
query.eq(HygfRectificationOrder::getRectificationSource,"bw-design");
HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query);
LambdaQueryWrapper<HygfRectificationOrder> query1 = new LambdaQueryWrapper<>();
query1.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
query1.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待审核","待提交"));
query1.eq(HygfRectificationOrder::getRectificationSource,"bw-design");
HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query1);
if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
up.set(BasicGridRecord::getGridStatus,GridStatusEnum.SJDSH.getCode());
}else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
......@@ -599,7 +616,6 @@ public class BasicGridAcceptanceServiceImpl
up.eq(BaseEntity::getSequenceNbr,sequenceNbr);
up.set(BasicGridRecord::getBasicGridNode,null);
up.set(BasicGridRecord::getGridStatus,GridStatusEnum.WTG.getCode());
basicGridRecordService.getBaseMapper().update(null,up);
}
//修改并网数据状态
if (StringUtils.isNotEmpty(sequenceNbr)){
......
pom.xml
View file @ b2febf4d
......@@ -35,6 +35,11 @@
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
</dependency>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment