修改完工登记重复

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

@@ -296,10 +296,11 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		// 新增施工信息
 		// 防止重复添加
 		LambdaUpdateWrapper<PowerStationConstructionData> psc = new LambdaUpdateWrapper();
-		psc.eq(PowerStationConstructionData::getWorkOrderPowerStationId, powerStationConstructionData.getWorkOrderPowerStationId());
+		psc.eq(PowerStationConstructionData::getWorkOrderPowerStationId,
+				powerStationConstructionData.getWorkOrderPowerStationId());
 		psc.eq(PowerStationConstructionData::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
-		powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData,psc);
-		//powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);
+		powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData, psc);
+		// powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);
 
 		// 增加操作日志
 		if (powerStationConstructionData.getSequenceNbr() != null) {
@@ -831,12 +832,21 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			workOrderMapper.update(null, upq);
 		}
 		// 新增完工登记
+
+	
+
 		PowerStationEngineeringInfo powerStationEngineeringInfo = powerStationEngineeringInfoAllDto
 				.getPowerStationEngineeringInfo();
 		powerStationEngineeringInfo.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
 		powerStationEngineeringInfo
 				.setWorkOrderPowerStationId(powerStationEngineeringInfoAllDto.getWorkOrderPowerStationId());
-		powerStationEngineeringInfoService.saveOrUpdate(powerStationEngineeringInfo);
+		// 防止重复提交
+		LambdaQueryWrapper<PowerStationEngineeringInfo> pse = new LambdaQueryWrapper<>();
+		pse.eq(PowerStationEngineeringInfo::getWorkOrderId, workOrderPowerStation.getWorkOrderId()).eq(
+				PowerStationEngineeringInfo::getWorkOrderPowerStationId,
+				powerStationEngineeringInfoAllDto.getWorkOrderPowerStationId());
+		// powerStationEngineeringInfoService.saveOrUpdate(powerStationEngineeringInfo);
+		powerStationEngineeringInfoService.saveOrUpdate(powerStationEngineeringInfo, pse);
 		// 增加操作日志
 		ConstructionRecords da = new ConstructionRecords(powerStationEngineeringInfo.getRecUserName(), "完工登记",
 				new Date(), "", workOrderPowerStation.getWorkOrderId(), workOrderPowerStation.getSequenceNbr(),
@@ -869,69 +879,68 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	}
 
 	@Transactional(isolation = Isolation.REPEATABLE_READ)
-    public ConstructionRecords  addConstructionRecords(ConstructionRecords constructionRecords){
+	public ConstructionRecords addConstructionRecords(ConstructionRecords constructionRecords) {
 		synchronized (constructionRecords) {
-			  LambdaQueryWrapper<WorkOrderPowerStation> qu=new LambdaQueryWrapper();
-		        qu.eq(WorkOrderPowerStation::getSequenceNbr,constructionRecords.getWorkOrderPowerStationId());
-		        WorkOrderPowerStation workOrderPowerStation=workOrderPowerStationMapper.selectOne(qu);
+			LambdaQueryWrapper<WorkOrderPowerStation> qu = new LambdaQueryWrapper();
+			qu.eq(WorkOrderPowerStation::getSequenceNbr, constructionRecords.getWorkOrderPowerStationId());
+			WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectOne(qu);
 
-		         if(constructionRecords.getOperationResults().equals("通过")){
-		             //修改电站状态
+			if (constructionRecords.getOperationResults().equals("通过")) {
+				// 修改电站状态
 				workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.已完工.getCode());
 
-		             //修改完工时间
-		             LambdaUpdateWrapper<PowerStationEngineeringInfo> upq1=new LambdaUpdateWrapper();
-		             upq1.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,workOrderPowerStation.getSequenceNbr());
-		             upq1.set(PowerStationEngineeringInfo::getCompletionDate,new Date());
-		             powerStationEngineeringInfoMapper.update(null,upq1);
+				// 修改完工时间
+				LambdaUpdateWrapper<PowerStationEngineeringInfo> upq1 = new LambdaUpdateWrapper();
+				upq1.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,
+						workOrderPowerStation.getSequenceNbr());
+				upq1.set(PowerStationEngineeringInfo::getCompletionDate, new Date());
+				powerStationEngineeringInfoMapper.update(null, upq1);
 
-		             BasicGridAcceptance dat=new BasicGridAcceptance();
+				BasicGridAcceptance dat = new BasicGridAcceptance();
 				dat.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
 				dat.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
 				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) 
-		             {
+				// 防止重复增加
+				if (b == null) {
 					basicGridAcceptanceMapper.insert(dat);
 				}
 				workOrderPowerStationMapper.updateById(workOrderPowerStation);
-		             //修改派工单状态
-		             LambdaQueryWrapper<WorkOrderPowerStation> qu1=new LambdaQueryWrapper();
-		             qu1.eq(WorkOrderPowerStation::getWorkOrderId,workOrderPowerStation.getWorkOrderId());
-		             List<String> d=new ArrayList<>();
+				// 修改派工单状态
+				LambdaQueryWrapper<WorkOrderPowerStation> qu1 = new LambdaQueryWrapper();
+				qu1.eq(WorkOrderPowerStation::getWorkOrderId, workOrderPowerStation.getWorkOrderId());
+				List<String> d = new ArrayList<>();
 				d.add(WorkOrderEnum.施工中.getCode());
 				d.add(WorkOrderEnum.待施工.getCode());
 				d.add(WorkOrderEnum.待登记.getCode());
 				d.add(WorkOrderEnum.待审核.getCode());
-		             qu1.in(WorkOrderPowerStation::getPowerStationConstructionStatus,d);
-		             List<WorkOrderPowerStation> list=workOrderPowerStationMapper.selectList(qu1);
-		             LambdaUpdateWrapper<WorkOrder> upq=new LambdaUpdateWrapper();
-		             upq.eq(WorkOrder::getSequenceNbr,workOrderPowerStation.getWorkOrderId());
-		             if(list==null||list.isEmpty()){
-		                 upq.set(WorkOrder::getWorkOrderStatus,WorkOrderEnum.已完工.getCode());
-		                 workOrderMapper.update(null,upq);
-		             }
-		         }else{
-		             //修改电站状态
+				qu1.in(WorkOrderPowerStation::getPowerStationConstructionStatus, d);
+				List<WorkOrderPowerStation> list = workOrderPowerStationMapper.selectList(qu1);
+				LambdaUpdateWrapper<WorkOrder> upq = new LambdaUpdateWrapper();
+				upq.eq(WorkOrder::getSequenceNbr, workOrderPowerStation.getWorkOrderId());
+				if (list == null || list.isEmpty()) {
+					upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.已完工.getCode());
+					workOrderMapper.update(null, upq);
+				}
+			} else {
+				// 修改电站状态
 				workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.未通过.getCode());
 				workOrderPowerStationMapper.updateById(workOrderPowerStation);
-		             LambdaUpdateWrapper<WorkOrder> upq=new LambdaUpdateWrapper();
-		             upq.eq(WorkOrder::getSequenceNbr,workOrderPowerStation.getWorkOrderId());
-		             upq.set(WorkOrder::getWorkOrderStatus,WorkOrderEnum.未通过
-		                     .getCode());
-		             workOrderMapper.update(null,upq);
+				LambdaUpdateWrapper<WorkOrder> upq = new LambdaUpdateWrapper();
+				upq.eq(WorkOrder::getSequenceNbr, workOrderPowerStation.getWorkOrderId());
+				upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.未通过.getCode());
+				workOrderMapper.update(null, upq);
 
 			}
 
-		        //增加操作日志
+			// 增加操作日志
 			constructionRecords.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
-		        constructionRecords.setOperationContent("完工自审-"+constructionRecords.getOperationResults());
+			constructionRecords.setOperationContent("完工自审-" + constructionRecords.getOperationResults());
 			constructionRecords.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
 			constructionRecords.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
 			constructionRecordsServiceImpl.save(constructionRecords);