Merge branch 'dev0124' of http://36.40.66.175:5000/moa/amos-boot-biz into dev0124

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

@@ -241,7 +241,10 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
         }
 
         //验收完成
-        if(workBasicGridAcceptance.getNextTaskId()==null){
+        System.out.println("验收完成==============================="+workBasicGridAcceptance.getNextTaskId());
+        System.out.println("验收完成888888==============================="+workBasicGridAcceptance.getAcceptanceStatus());
+
+        if(workBasicGridAcceptance.getAcceptanceStatus().equals("10")){
 
             //更新状态
             LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();