Skip to content

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

验收优化

parent 853731bb
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 24 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceCheckDto.java
View file @ bca5f794
...@@ -74,4 +74,6 @@ public class AcceptanceCheckDto extends BaseDto { ...@@ -74,4 +74,6 @@ public class AcceptanceCheckDto extends BaseDto {
private String isAudit; private String isAudit;
private String rectificationStatus;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceCheckMapper.xml
View file @ bca5f794
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
WHEN hbga.acceptance_check_status = '3' THEN '已完成' WHEN hbga.acceptance_check_status = '3' THEN '已完成'
WHEN hbga.acceptance_check_status = '4' THEN '未通过' WHEN hbga.acceptance_check_status = '4' THEN '未通过'
WHEN hbga.acceptance_check_status = '11' THEN '投融待审核/法务待审核' WHEN hbga.acceptance_check_status = '11' THEN '投融待审核/法务待审核'
WHEN hbga.acceptance_check_status = '9' THEN '整改待审核'
WHEN hbga.acceptance_check_status = '7' THEN '片区运营待审核' WHEN hbga.acceptance_check_status = '7' THEN '片区运营待审核'
WHEN hbga.acceptance_check_status = '12' THEN '投融待审核' WHEN hbga.acceptance_check_status = '12' THEN '投融待审核'
WHEN hbga.acceptance_check_status = '13' THEN '资产待审核' WHEN hbga.acceptance_check_status = '13' THEN '资产待审核'
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AcceptanceCheckController.java
View file @ bca5f794
...@@ -240,7 +240,7 @@ public class AcceptanceCheckController extends BaseController { ...@@ -240,7 +240,7 @@ public class AcceptanceCheckController extends BaseController {
if (null != e.getBasicGridNode() && e.getBasicGridNode().contains(g) && (roleIds.contains(areaId) ||roleIds.contains(fawuId) || roleIds.contains(zichanId)|| roleIds.contains(tourongId))){ if (null != e.getBasicGridNode() && e.getBasicGridNode().contains(g) && (roleIds.contains(areaId) ||roleIds.contains(fawuId) || roleIds.contains(zichanId)|| roleIds.contains(tourongId))){
e.setIsAudit("0"); e.setIsAudit("0");
break; break;
}if (e.getBasicGridNode().equals("jxsAdmin") && roleIds.contains(delerAdminId)){ }if (null != e.getBasicGridNode()&&e.getBasicGridNode().equals("jxsAdmin") && roleIds.contains(delerAdminId)){
e.setIsAudit("0"); e.setIsAudit("0");
break; break;
} }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HygfRectificationOrderController.java
View file @ bca5f794
...@@ -249,18 +249,23 @@ public class HygfRectificationOrderController extends BaseController { ...@@ -249,18 +249,23 @@ public class HygfRectificationOrderController extends BaseController {
workOrderPowerStationNodes.add("ys-area"); workOrderPowerStationNodes.add("ys-area");
} }
if (longs.contains(tourongId) ) { if (longs.contains(tourongId) ) {
workOrderPowerStationNodes.add("ys-engineering"); workOrderPowerStationNodes.add("ys-tourong");
} }
if (longs.contains(fawuId) ) { if (longs.contains(fawuId) ) {
workOrderPowerStationNodes.add("ys-design"); workOrderPowerStationNodes.add("ys-fawu");
}
if (longs.contains(zichanId) ) {
workOrderPowerStationNodes.add("ys-zichan");
} }
if (longs.contains(delerAdminId) ) { if (longs.contains(delerAdminId) ) {
workOrderPowerStationNodes.add("ys-design"); workOrderPowerStationNodes.add("ys-zichan");
workOrderPowerStationNodes.add("ys-engineering"); workOrderPowerStationNodes.add("ys-tourong");
workOrderPowerStationNodes.add("ys-fawu");
workOrderPowerStationNodes.add("ys-area"); workOrderPowerStationNodes.add("ys-area");
}if (longs.contains(delerKfId) ) { }if (longs.contains(deveEngineeringId) ) {
workOrderPowerStationNodes.add("ys-design"); workOrderPowerStationNodes.add("ys-zichan");
workOrderPowerStationNodes.add("ys-engineering"); workOrderPowerStationNodes.add("ys-tourong");
workOrderPowerStationNodes.add("ys-fawu");
workOrderPowerStationNodes.add("ys-area"); workOrderPowerStationNodes.add("ys-area");
} }
// if (longs.contains(delergcId) ) { // if (longs.contains(delergcId) ) {
...@@ -274,13 +279,15 @@ public class HygfRectificationOrderController extends BaseController { ...@@ -274,13 +279,15 @@ public class HygfRectificationOrderController extends BaseController {
for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) { for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong); List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
page.getRecords().forEach(e->{ page.getRecords().forEach(e->{
if (longs.contains(areaId) && e.getRectificationSource().equals("bw-area")){ if (longs.contains(areaId) && e.getRectificationSource().equals("ys-area") && rectificationSource.contains(e.getRectificationSource()) ){
e.setIsAudit("0"); e.setIsAudit("0");
}else if (longs.contains(engineeringId) && e.getRectificationSource().equals("bw-engineering")){ }else if (longs.contains(tourongId) && e.getRectificationSource().equals("ys-tourong")&& rectificationSource.contains(e.getRectificationSource())){
e.setIsAudit("0"); e.setIsAudit("0");
}else if (longs.contains(designId) && e.getRectificationSource().equals("bw-design")){ }else if (longs.contains(fawuId) && e.getRectificationSource().equals("ys-fawu")&& rectificationSource.contains(e.getRectificationSource())){
e.setIsAudit("0"); e.setIsAudit("0");
}else if (longs.contains(delerKfId)){ }else if (longs.contains(zichanId) && e.getRectificationSource().equals("ys-zichan")&& rectificationSource.contains(e.getRectificationSource())){
e.setIsAudit("0");
}else if (longs.contains(deveEngineeringId) && e.getRectificationStatus().equals("待审核")){
e.setIsAudit("0"); e.setIsAudit("0");
}else { }else {
e.setIsAudit("1"); e.setIsAudit("1");
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceCheckServiceImpl.java
View file @ bca5f794
...@@ -209,7 +209,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -209,7 +209,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
this.wofkflowExcute(instanceId, approvalStatus , comment); this.wofkflowExcute(instanceId, approvalStatus , comment);
//修改并网数据状态 //修改并网数据状态
basicGridRecord.setAcceptanceCheckStatus(approvalStatus.equals("0")?GridStatusEnum.PQYYDSH.getCode():GridStatusEnum.WTG.getCode()); basicGridRecord.setAcceptanceCheckStatus(approvalStatus.equals("0")?GridStatusEnum.PQYYDSH.getCode():GridStatusEnum.WTG.getCode());
basicGridRecord.setBasicGridNode("ys-area"); basicGridRecord.setBasicGridNode(approvalStatus.equals("0")?"ys-area":null);
this.updateById(basicGridRecord); this.updateById(basicGridRecord);
} }
...@@ -228,7 +228,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -228,7 +228,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
case "ys-area": case "ys-area":
up.set(AcceptanceCheck::getPowerStationAreaStatus,approvalStatus.equals("0")?"通过":"驳回"); up.set(AcceptanceCheck::getPowerStationAreaStatus,approvalStatus.equals("0")?"通过":"驳回");
up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu,ys-tourong"); up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu,ys-tourong");
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ROLESDSH.getCode()); up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YSROLESDSH.getCode());
LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId()); query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待提交","待审核")); query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待提交","待审核"));
...@@ -254,7 +254,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -254,7 +254,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
}else if( null == basicGridRecord.getPowerStationFinancingStatus() && approvalStatus.equals("0") && ( Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("ys-tourong")) ) ) { }else if( null == basicGridRecord.getPowerStationFinancingStatus() && approvalStatus.equals("0") && ( Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("ys-tourong")) ) ) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-tourong"); up.set(AcceptanceCheck::getBasicGridNode,"ys-tourong");
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.GCDSH.getCode()); up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.TRDSH.getCode());
}else if( null == basicGridRecord.getPowerStationFinancingStatus() && approvalStatus.equals("0") && basicGridRecord.getRectificationStatus() .contains("ys-tourong") ) { }else if( null == basicGridRecord.getPowerStationFinancingStatus() && approvalStatus.equals("0") && basicGridRecord.getRectificationStatus() .contains("ys-tourong") ) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-tourong"); up.set(AcceptanceCheck::getBasicGridNode,"ys-tourong");
LambdaQueryWrapper<HygfRectificationOrder> query2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<HygfRectificationOrder> query2 = new LambdaQueryWrapper<>();
...@@ -263,7 +263,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -263,7 +263,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
query2.eq(HygfRectificationOrder::getRectificationSource,"ys-tourong"); query2.eq(HygfRectificationOrder::getRectificationSource,"ys-tourong");
HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query2); HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query2);
if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){ if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.SJDSH.getCode()); up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.TRDSH.getCode());
}else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){ }else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode()); up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
}else { }else {
...@@ -284,7 +284,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -284,7 +284,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
up.set(AcceptanceCheck::getBasicGridNode,"ys-zichan"); up.set(AcceptanceCheck::getBasicGridNode,"ys-zichan");
}else if( null == basicGridRecord.getPowerStationLegalStatus() && approvalStatus.equals("0") && ( Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("ys-fawu")) )) { }else if( null == basicGridRecord.getPowerStationLegalStatus() && approvalStatus.equals("0") && ( Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("ys-fawu")) )) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu"); up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu");
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.SJDSH.getCode()); up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.FWDSH.getCode());
}else if( null == basicGridRecord.getPowerStationLegalStatus() &&approvalStatus.equals("0") && !Objects.isNull(basicGridRecord.getRectificationStatus()) && basicGridRecord.getRectificationStatus().contains("ys-fawu") ) { }else if( null == basicGridRecord.getPowerStationLegalStatus() &&approvalStatus.equals("0") && !Objects.isNull(basicGridRecord.getRectificationStatus()) && basicGridRecord.getRectificationStatus().contains("ys-fawu") ) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu"); up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu");
LambdaQueryWrapper<HygfRectificationOrder> query1 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<HygfRectificationOrder> query1 = new LambdaQueryWrapper<>();
...@@ -293,7 +293,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -293,7 +293,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
query1.eq(HygfRectificationOrder::getRectificationSource,"ys-fawu"); query1.eq(HygfRectificationOrder::getRectificationSource,"ys-fawu");
HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query1); HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query1);
if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){ if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.SJDSH.getCode()); up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.FWDSH.getCode());
}else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){ }else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode()); up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
}else { }else {
...@@ -311,6 +311,14 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -311,6 +311,14 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
up.set(AcceptanceCheck::getAcceptanceTime,new Date()); up.set(AcceptanceCheck::getAcceptanceTime,new Date());
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YWC.getCode()); up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YWC.getCode());
this.wofkflowExcute(instanceId, approvalStatus , comment ); this.wofkflowExcute(instanceId, approvalStatus , comment );
// 线上验收
LambdaUpdateWrapper<PeasantHousehold> up1 = new LambdaUpdateWrapper<>();
up1.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.验收完成.getCode());
long idsk = basicGridRecord.getPeasantHouseholdId();
up1.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up1);
} }
if (approvalStatus.equals("1") ){ if (approvalStatus.equals("1") ){
up.eq(BaseEntity::getSequenceNbr,sequenceNbr); up.eq(BaseEntity::getSequenceNbr,sequenceNbr);
...@@ -441,12 +449,12 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -441,12 +449,12 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
//若两者状态都为空 说明均为审核 若某一审核状态为空 则审核状态修改为为空审核节点 //若两者状态都为空 说明均为审核 若某一审核状态为空 则审核状态修改为为空审核节点
if (Objects.isNull(basicGridRecord.getPowerStationLegalStatus() ) if (Objects.isNull(basicGridRecord.getPowerStationLegalStatus() )
&& Objects.isNull(basicGridRecord.getPowerStationFinancingStatus())){ && Objects.isNull(basicGridRecord.getPowerStationFinancingStatus())){
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ROLESDSH.getCode()); qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YSROLESDSH.getCode());
}else if (Objects.isNull(basicGridRecord.getPowerStationLegalStatus() ) ){ }else if (Objects.isNull(basicGridRecord.getPowerStationLegalStatus() ) ){
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.SJDSH.getCode()); qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.FWDSH.getCode());
}else { }else {
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.GCDSH.getCode()); qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.TRDSH.getCode());
} }
}else { }else {
List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList()); List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
...@@ -517,11 +525,11 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -517,11 +525,11 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
//若两者状态都为空 说明均为审核 若某一审核状态为空 则审核状态修改为为空审核节点 //若两者状态都为空 说明均为审核 若某一审核状态为空 则审核状态修改为为空审核节点
if (Objects.isNull(basicGridRecord.getPowerStationLegalStatus() ) if (Objects.isNull(basicGridRecord.getPowerStationLegalStatus() )
&& Objects.isNull(basicGridRecord.getPowerStationFinancingStatus())){ && Objects.isNull(basicGridRecord.getPowerStationFinancingStatus())){
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ROLESDSH.getCode()); qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YSROLESDSH.getCode());
}else if (Objects.isNull(basicGridRecord.getPowerStationLegalStatus() ) ){ }else if (Objects.isNull(basicGridRecord.getPowerStationLegalStatus() ) ){
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.SJDSH.getCode()); qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.FWDSH.getCode());
}else { }else {
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.GCDSH.getCode()); qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.TRDSH.getCode());
} }
}else { }else {
List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList()); List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
......
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