验收审核bug修改

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

@@ -268,7 +268,7 @@ 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());
@@ -284,25 +284,10 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
                     }
                     if (CollectionUtil.isNotEmpty(hygfRectificationOrders) && flag){
                         up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
+                    }else {
+                        up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YSROLESDSH.getCode());
                     }
                 }
-               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::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());
-                }
                 this.wofkflowExcute(instanceId, approvalStatus , comment ,BusinessWorkflowKey.片区运营审核.getCode() );
                 break;
             case "ys-fawu":