融合调度规则 任务 4318 4326 4327

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -192,16 +192,16 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 				monitorTeamList.add(powerTransferCompanyDto);
 			}
 		}
-		if (fullTimeList != null) {
+		if (fullTimeList.size() > 0) {
 			ruleAlertCalledService.powerTransferCalledRule(fullTimeList, powerTransferDto.getAlertCalledId(),
 					FireBrigadeTypeEnum.专职消防队.getKey());
 		}
-		if (medicalTeamList != null) {
+		if (medicalTeamList.size() > 0) {
 			ruleAlertCalledService.powerTransferCalledRule(medicalTeamList, powerTransferDto.getAlertCalledId(),
 					FireBrigadeTypeEnum.医疗救援队.getKey());
 
 		}
-		if (monitorTeamList != null) {
+		if (monitorTeamList.size() > 0) {
 			ruleAlertCalledService.powerTransferCalledRule(monitorTeamList, powerTransferDto.getAlertCalledId(),
 					FireBrigadeTypeEnum.监控大队.getKey());
 
@@ -423,6 +423,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 		definitions.put("callTime",
 				DateUtils.convertDateToString(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
 
+
 		for (PowerTransferCompanyDto powerTransferCompanyDto : powerTransferCompanyDotList) {
 			powerTransferCompany = new PowerTransferCompany();
 			BeanUtils.copyProperties(powerTransferCompanyDto, powerTransferCompany);
@@ -436,6 +437,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 				definitions.put("content", "");
 				powerTransferCompany.setTaskInformation(getTaskInformation(content, definitions));
 				powerTransferCompanyService.save(powerTransferCompany);
+				powerTransferCompanyDto.setSequenceNbr(powerTransferCompany.getSequenceNbr());
 			} else {
 				powerTransferCompany.setIsDistributionAgencies(false);
 				StringBuilder taskInformation = new StringBuilder();
@@ -457,10 +459,19 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 
 				powerTransferCompany.setTaskInformation(getTaskInformation(content, definitions));
 				powerTransferCompanyService.save(powerTransferCompany);
+				powerTransferCompanyDto.setSequenceNbr(powerTransferCompany.getSequenceNbr());
 				Long powerTransferCompanySequenceNbr = powerTransferCompany.getSequenceNbr();
 				List<PowerTransferCompanyResources> powerTransferCompanyResourcesList = DtoEntityBatchConvert(
 						powerTransferCompanyResourcesDtoList, powerTransferCompanySequenceNbr);
 				powerTransferCompanyResourcesService.saveBatch(powerTransferCompanyResourcesList);
+				List<PowerTransferCompanyResourcesDto> resourcesDtoList = new ArrayList<>();
+				powerTransferCompanyResourcesList.stream().forEach(e->{
+					PowerTransferCompanyResourcesDto dto = new PowerTransferCompanyResourcesDto();
+					Bean.toPo(e,dto);
+					resourcesDtoList.add(dto);
+				});
+
+				powerTransferCompanyDto.setPowerTransferCompanyResourcesDtoList(resourcesDtoList);
 
 				// 更新车辆状态
 				equipFeignService.updateCarStatus(carStatusInfoDtoList);