Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml

@@ -13,7 +13,7 @@
     hygf_peasant_household.project_address_detail,
     b.stamp_status,
     b.status
-    from hygf_power_station LEFT JOIN ( select peasant_household_id,initiate_status, contract_lock_id,stamp_status,status from  hygf_household_contract where   hygf_household_contract.status !='已作废'
+    from hygf_power_station LEFT JOIN ( select peasant_household_id,initiate_status, contract_lock_id,stamp_status,status from  hygf_household_contract
     ) b    on b.peasant_household_id=hygf_power_station.peasant_household_id
     LEFT JOIN hygf_peasant_household on hygf_peasant_household.sequence_nbr=hygf_power_station.peasant_household_id
     where hygf_power_station.is_delete=0

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

@@ -126,7 +126,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		}
 		if (!workorderPeasant.isEmpty()) {
 			String names = workorderPeasant.stream().map(i -> i.getOwnersName()).collect(Collectors.joining(","));
-			throw new Exception("电站" + names + ",已被工单关联");
+			throw new Exception("电站" + names + ",已被工单关联,请重新选择电站");
 		}
 
 		// 保存派工单
@@ -270,7 +270,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	}
 
 	@Transactional
-	public PowerStationConstructionData addOrUpdate(PowerStationConstructionData powerStationConstructionData) {
+	public synchronized PowerStationConstructionData addOrUpdate(PowerStationConstructionData powerStationConstructionData) {
 		// 如果不是提交进行单独保存
 		if (powerStationConstructionData.isCommitFlow()) {
 //        if(powerStationConstructionData.getSequenceNbr()!=null){
@@ -334,8 +334,8 @@ 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);