修改代码

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

@@ -438,7 +438,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         }
         //修改状态
         if (addorSubmit.equals("0")){
-            qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
+            int num = 0;
             //如果历史有未完成的整改单则片区审核完成的时候改变主流程状态为整改单的状态
 			LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
 			query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
@@ -450,7 +450,10 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
 					qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ZGDSH.getCode());
 					break;
 				}
-			}	
+			}
+			if ( num == 0){
+                qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
+            }
             this.update(null,qu);
         }
         rectificationOrderAuditingService.addRectification(hygfRectificationOrder);

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

@@ -738,8 +738,8 @@ public class BasicGridAcceptanceServiceImpl
 		}
 		//修改状态
 		if (addorSubmit.equals("0")){
-			qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
 			//如果历史有未完成的整改单则片区审核完成的时候改变主流程状态为整改单的状态
+			int num = 0;
 			LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
 			query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
 			query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待提交","待审核"));
@@ -748,9 +748,13 @@ public class BasicGridAcceptanceServiceImpl
 			for (HygfRectificationOrder hygfRectificationOrderO : hygfRectificationOrders) {
 				if (hygfRectificationOrderO.getRectificationStatus().equals("待审核")){
 					qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.ZGDSH.getCode());
+					num = 1;
 					break;
 				}
-			}			
+			}
+			if (num == 0){
+				qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
+			}
 			basicGridRecordService.update(null,qu);
 		}
 		rectificationOrderAuditingService.addRectification(hygfRectificationOrder);