修改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

@@ -256,20 +256,22 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
                 if (approvalStatus.equals("0")){
                     up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu,ys-tourong");
                 }
+               Boolean flag = true;
                 up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YSROLESDSH.getCode());
                 LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
                 query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
-                query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待提交","待审核"));
+                query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待审核"));
                 query.in(HygfRectificationOrder::getRectificationSource,Arrays.asList("ys-fawu","ys-tourong","ys-zichan"));
                 List<HygfRectificationOrder> hygfRectificationOrders = rectificationOrderService.getBaseMapper().selectList(query);
                 for (HygfRectificationOrder hygfRectificationOrder : hygfRectificationOrders) {
                     if (hygfRectificationOrder.getRectificationStatus().equals("待审核")){
                         up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ZGDSH.getCode());
+                        flag = false;
                         break;
                     }
-                    if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
-                        up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
                 }
+                if (CollectionUtil.isNotEmpty(hygfRectificationOrders) && flag){
+                    up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
                 }
                 this.wofkflowExcute(instanceId, approvalStatus , comment ,BusinessWorkflowKey.片区运营审核.getCode() );
                 break;
@@ -342,6 +344,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
                     up.set(AcceptanceCheck::getBasicGridNode,"all");
                     up.set(AcceptanceCheck::getAcceptanceTime,new Date());
                     up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YWC.getCode());
+                    //验收完成后需对投融数据进行处理。
+
                 }
                 this.wofkflowExcute(instanceId, approvalStatus , comment  ,BusinessWorkflowKey.资产审核.getCode() );
 

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -537,24 +538,28 @@ public class BasicGridAcceptanceServiceImpl
 				up.set(BasicGridRecord::getPowerStationAreaStatus,approvalStatus.equals("0")?"通过":"驳回");
 				if (approvalStatus.equals("0")){
 					up.set(BasicGridRecord::getBasicGridNode,"bw-design,bw-engineering");
-				}
 					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ROLESDSH.getCode());
+				}
+				int num = 0;
+
 				da.setOperationContent("并网验收-片区运营审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
 				//如果历史有未完成的整改单则片区审核完成的时候改变主流程状态为整改单的状态
 				LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
 				query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
-				query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待提交","待审核"));
+				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());
+						num = 1;
 						break;
 					}
-					if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
-						up.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
 				}
+				if (CollUtil.isNotEmpty(hygfRectificationOrders) && num == 0){
+					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
 				}
+
 				this.wofkflowExcute(instanceId, approvalStatus , comment ,BusinessWorkflowKey.片区运营审核.getCode() );
 				break;
 			case "bw-design":