Commit 18c07de6 authored by 付培阳's avatar 付培阳

修改接口:获取警情续报内容和模板

parent 53e065c8
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
left join jc_power_transfer pt on ptc.power_transfer_id = pt.sequence_nbr left join jc_power_transfer pt on ptc.power_transfer_id = pt.sequence_nbr
right join jc_power_transfer_company_resources ptcr right join jc_power_transfer_company_resources ptcr
on ptcr.power_transfer_company_id = ptc.sequence_nbr on ptcr.power_transfer_company_id = ptc.sequence_nbr
where pt.alert_called_id = '63453543' where pt.alert_called_id = #{alertCalledId}
and ptc.is_distribution_agencies = 0) r and ptc.is_distribution_agencies = 0) r
group by company_name, type, rec_date group by company_name, type, rec_date
having rec_date = (select rec_date from jc_power_transfer_company_resources order by rec_date desc limit 1) having rec_date = (select rec_date from jc_power_transfer_company_resources order by rec_date desc limit 1)
......
...@@ -201,9 +201,9 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto,Ale ...@@ -201,9 +201,9 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto,Ale
Template template = templateService.getOne(new QueryWrapper<Template>().eq("type_code", Template template = templateService.getOne(new QueryWrapper<Template>().eq("type_code",
dataDictionary.getCode())); dataDictionary.getCode()));
List<PowerTransferCompanyVo> lastPowerTransferCompany; List<PowerTransferCompanyVo> lastPowerTransferCompany;
powerTransferService.getLastPowerTransferCompany(alertCalledId);
if ("警情续报".equals(template.getType()) && (lastPowerTransferCompany = if ("警情续报".equals(template.getType()) && (lastPowerTransferCompany =
powerTransferService.getLastPowerTransferCompany(alertCalledId)).size() > 0) { powerTransferService.getLastPowerTransferCompany(alertCalledId)).size() > 0) {
map.put("businessType",template.getType());
// 获取力量调派内容 // 获取力量调派内容
StringBuilder companyNames = new StringBuilder(); StringBuilder companyNames = new StringBuilder();
StringBuilder resourcesInfo = new StringBuilder(); StringBuilder resourcesInfo = new StringBuilder();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment