fix 新增并网记录重复增加

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

@@ -89,7 +89,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	ConstructionRecordsMapper constructionRecordsMapper;
 	@Autowired
 	BasicGridAcceptanceMapper basicGridAcceptanceMapper;
-
+    @Autowired
+	BasicGridAcceptanceServiceImpl basicGridAcceptanceService;
 	@Autowired
 	WorkflowFeignClient workflowFeignClient;
 
@@ -900,9 +901,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 
 	}
 
-	@Transactional(isolation = Isolation.REPEATABLE_READ)
-	public ConstructionRecords addConstructionRecords(ConstructionRecords constructionRecords) {
-		synchronized (constructionRecords) {
+	@Transactional(rollbackFor = Exception.class)
+	public synchronized ConstructionRecords addConstructionRecords(ConstructionRecords constructionRecords) {
         LambdaQueryWrapper<WorkOrderPowerStation> qu = new LambdaQueryWrapper();
         qu.eq(WorkOrderPowerStation::getSequenceNbr, constructionRecords.getWorkOrderPowerStationId());
         WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectOne(qu);
@@ -924,14 +924,16 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
             dat.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
             dat.setGridStatus("1");
 
-				// 新增并网记录
-				LambdaQueryWrapper<BasicGridAcceptance> bga = new LambdaQueryWrapper<>();
-				bga.eq(BasicGridAcceptance::getPeasantHouseholdId, workOrderPowerStation.getPeasantHouseholdId());
-				BasicGridAcceptance b = basicGridAcceptanceMapper.selectOne(bga);
-				// 防止重复增加
-				if (b == null) {
-					basicGridAcceptanceMapper.insert(dat);
-				}
+//				// 新增并网记录
+//				LambdaQueryWrapper<BasicGridAcceptance> bga = new LambdaQueryWrapper<>();
+//				bga.eq(BasicGridAcceptance::getPeasantHouseholdId, workOrderPowerStation.getPeasantHouseholdId());
+//				BasicGridAcceptance b = basicGridAcceptanceMapper.selectOne(bga);
+//				// 防止重复增加
+//				if (b == null) {
+//					basicGridAcceptanceMapper.insert(dat);
+//				}
+            basicGridAcceptanceService.saveOrUpdate(dat);
+
             workOrderPowerStationMapper.updateById(workOrderPowerStation);
             // 修改派工单状态
             LambdaQueryWrapper<WorkOrderPowerStation> qu1 = new LambdaQueryWrapper();
@@ -966,7 +968,6 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
         constructionRecords.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
         constructionRecords.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
         constructionRecordsServiceImpl.save(constructionRecords);
-		}
 		return constructionRecords;
 	}