Merge branch 'developer_bw' into developer

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

@@ -268,6 +268,23 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
                 da.setOperationContent("验收审核-片区运营审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
                 if (approvalStatus.equals("0")){
                     up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu,ys-tourong");
+                    up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YSROLESDSH.getCode());
+                    Boolean flag = true;
+                    LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
+                    query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
+                    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 (CollectionUtil.isNotEmpty(hygfRectificationOrders) && flag){
+                        up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
+                    }
                 }
                Boolean flag = true;
                 up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YSROLESDSH.getCode());

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

@@ -539,26 +539,28 @@ public class BasicGridAcceptanceServiceImpl
 				if (approvalStatus.equals("0")){
 					up.set(BasicGridRecord::getBasicGridNode,"bw-design,bw-engineering");
 					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ROLESDSH.getCode());
+					int num = 0;
+					//如果历史有未完成的整改单则片区审核完成的时候改变主流程状态为整改单的状态
+					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());
+							num = 1;
+							break;
+						}
+					}
+					if (CollUtil.isNotEmpty(hygfRectificationOrders) && num == 0){
+						up.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.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::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 (CollUtil.isNotEmpty(hygfRectificationOrders) && num == 0){
-					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
-				}
+
 
 				this.wofkflowExcute(instanceId, approvalStatus , comment ,BusinessWorkflowKey.片区运营审核.getCode() );
 				break;