修改Grid AND Acceptance代码

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceCheckServiceImpl.java

@@ -253,7 +253,9 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
             case "ys-area":
                 up.set(AcceptanceCheck::getPowerStationAreaStatus,approvalStatus.equals("0")?"通过":"驳回");
                 da.setOperationContent("验收审核-片区运营审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
-                up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu,ys-tourong");
+                if (approvalStatus.equals("0")){
+                    up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu,ys-tourong");
+                }
                 up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YSROLESDSH.getCode());
                 LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
                 query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
@@ -278,7 +280,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
                     up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ZCDSH.getCode());
                     this.wofkflowExcute(instanceId, approvalStatus , comment,BusinessWorkflowKey.法务审核.getCode()  );
                     up.set(AcceptanceCheck::getBasicGridNode,"ys-zichan");
- 
+
                 }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::getAcceptanceCheckStatus,GridStatusEnum.TRDSH.getCode());
@@ -336,8 +338,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
             default:
                 da.setOperationContent("验收审核-资产审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
                 up.set(AcceptanceCheck::getPowerStationAssetsStatus,approvalStatus.equals("0")?"通过":"驳回");
-                up.set(AcceptanceCheck::getBasicGridNode,"all");
                 if (approvalStatus.equals("0")){
+                    up.set(AcceptanceCheck::getBasicGridNode,"all");
                     up.set(AcceptanceCheck::getAcceptanceTime,new Date());
                     up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YWC.getCode());
                 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java

@@ -535,7 +535,9 @@ public class BasicGridAcceptanceServiceImpl
 		switch (status){
 			case "bw-area":
 				up.set(BasicGridRecord::getPowerStationAreaStatus,approvalStatus.equals("0")?"通过":"驳回");
-				up.set(BasicGridRecord::getBasicGridNode,"bw-design,bw-engineering");
+				if (approvalStatus.equals("0")){
+					up.set(BasicGridRecord::getBasicGridNode,"bw-design,bw-engineering");
+				}
 				up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ROLESDSH.getCode());
 				da.setOperationContent("并网验收-片区运营审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
 				//如果历史有未完成的整改单则片区审核完成的时候改变主流程状态为整改单的状态