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/controller/HygfRectificationOrderController.java

@@ -109,7 +109,6 @@ public class HygfRectificationOrderController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个审核单",  notes = "根据sequenceNbr查询单个审核单")
 	public ResponseModel<HygfRectificationOrder> selectOne(@PathVariable Long sequenceNbr) {
 		HygfRectificationOrder hygfRectificationOrder =	hygfRectificationOrderServiceImpl.getBaseMapper().selectById(sequenceNbr);
-		
 		RectificationRoleEnum enums = RectificationRoleEnum.getNodeByName(hygfRectificationOrder.getRectificationSource());
 		hygfRectificationOrder.setRectificationSourceName(enums!=null?enums.name():null);
 	    return ResponseHelper.buildResponse(hygfRectificationOrder);

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

@@ -484,9 +484,9 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
             }
         }else {
             //驳回的时候 也需根据 工程或者设计 整改单状态修改并网状态
-            LambdaUpdateWrapper<AcceptanceCheck> qu = new LambdaUpdateWrapper();
+            LambdaUpdateWrapper<AcceptanceCheck> qu = new LambdaUpdateWrapper<AcceptanceCheck>();
             qu.eq(AcceptanceCheck::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
-            if (CollectionUtil.isEmpty(list)) {
+            if (!CollectionUtil.isEmpty(list)) {
                 List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
                 qu.set(AcceptanceCheck::getAcceptanceCheckStatus,collect.contains(WorkOrderEnum.待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
             }else {

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

@@ -768,7 +768,7 @@ public class BasicGridAcceptanceServiceImpl
 			//驳回的时候 也需根据 工程或者设计 整改单状态修改并网状态
 			LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
 			qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
-			if (CollectionUtil.isEmpty(list)) {
+			if (!CollectionUtil.isEmpty(list)) {
 				List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
 				qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
 			}else {