Merge branch 'developer' into wofkflow0620

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

@@ -864,7 +864,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 
 	@Transactional(isolation = Isolation.REPEATABLE_READ)
     public ConstructionRecords  addConstructionRecords(ConstructionRecords constructionRecords){
-		synchronized (constructionRecords.getPeasantHouseholdId()) {
+		synchronized (constructionRecords) {
 			  LambdaQueryWrapper<WorkOrderPowerStation> qu=new LambdaQueryWrapper();
 		        qu.eq(WorkOrderPowerStation::getSequenceNbr,constructionRecords.getWorkOrderPowerStationId());
 		        WorkOrderPowerStation workOrderPowerStation=workOrderPowerStationMapper.selectOne(qu);
@@ -911,7 +911,6 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		                 upq.set(WorkOrder::getWorkOrderStatus,WorkOrderEnum.已完工.getCode());
 		                 workOrderMapper.update(null,upq);
 		             }
-
 		         }else{
 		             //修改电站状态
 		             workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.未通过.getCode());