Merge remote-tracking branch 'origin/developer_bw' into developer_bw

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

@@ -499,6 +499,8 @@ public class BasicGridAcceptanceServiceImpl
 				up.set(BasicGridRecord::getPowerStationAreaStatus,approvalStatus.equals("0")?"通过":"驳回");
 				up.set(BasicGridRecord::getBasicGridNode,"bw-design,bw-engineering");
 				up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ROLESDSH.getCode());
+				
+				//如果历史有未完成的整改单则片区审核完成的时候改变主流程状态为整改单的状态
 				LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
 				query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
 				query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待提交","待审核"));
@@ -511,11 +513,10 @@ public class BasicGridAcceptanceServiceImpl
 					}
 					if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
 						up.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
-						break;
-					}
-					if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
-						up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ROLESDSH.getCode());
 					}
+//					if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
+//						up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ROLESDSH.getCode());
+//					}
 				}
 				this.wofkflowExcute(instanceId, approvalStatus , comment  );
 				break;