Commit 7a3f199b authored by chenzhao's avatar chenzhao

修改bug

parent d3f37a65
...@@ -701,6 +701,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -701,6 +701,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
definitions.put("$callTime",DateUtils.dateTimeToDateString(alertCalled.getCallTime())); definitions.put("$callTime",DateUtils.dateTimeToDateString(alertCalled.getCallTime()));
definitions.put("$replaceContent",replaceContent); definitions.put("$replaceContent",replaceContent);
definitions.put("$address",alertCalled.getAddress()); definitions.put("$address",alertCalled.getAddress());
definitions.put("$recDate",DateUtils.getDateNowString());
String content = getTaskInformation( template.getContent(),definitions); String content = getTaskInformation( template.getContent(),definitions);
template.setContent(content); template.setContent(content);
TemplateDto templateDto = new TemplateDto(); TemplateDto templateDto = new TemplateDto();
......
...@@ -2233,6 +2233,36 @@ ...@@ -2233,6 +2233,36 @@
</changeSet> </changeSet>
<changeSet author="chenzhao" id="2021-11-24-1">
<preConditions onFail="MARK_RAN">
<tableExists tableName="jc_template"/>
</preConditions>
<comment>update data jc_template</comment>
<sql>
update
jc_template jc
set
content ='<![CDATA[<p>【非警情确认】根据现场反馈信息、视频监控信息和消防物联监控信息,判断 【时间:$callTime 地点: $address 发生$type 警情 $replaceContent ;被困人数:<span contenteditable="true" data-name="trappedNum" data-type="input"></span>;伤亡人数:<span contenteditable="true" data-name="casualtiesNum" data-type="input"></span>; 】 为非警情,请各单位、部门尽快 进行恢复到日常执勤状态。</p><p>发送单位:<span contenteditable="true" data-name="companyName" data-type="input"></span></p> ]]>'
where
jc.type_code = '314'
</sql>
</changeSet>
<changeSet author="chenzhao" id="2021-11-24-2">
<preConditions onFail="MARK_RAN">
<tableExists tableName="jc_template"/>
</preConditions>
<comment>update data jc_template</comment>
<sql>
update
jc_template jc
set
content ='<![CDATA[<p>【警情结案】当前警情已于$recDate已经结案。</p>相关警情:时间:$callTime 地点: $address 发生$type 警情 $replaceContent;被困人数:<span contenteditable="true" data-name="trappedNum" data-type="input"></span>;伤亡人数:<span contenteditable="true" data-name="casualtiesNum" data-type="input"></span>;<p>发送单位:<span contentEditable data-name="companyName" data-type="input"></span></p>]]>'
where
jc.type_code = '315'
</sql>
</changeSet>
<!-- insert 模板 <!-- insert 模板
<changeSet author="chenzhao" id="2021-11-16-1"> <changeSet author="chenzhao" id="2021-11-16-1">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
......
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