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

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -1876,17 +1876,7 @@
         </sql>
     </changeSet>
 
-    <changeSet author="chenzhao" id="2021-10-20">
-        <preConditions onFail="MARK_RAN">
-            <tableExists tableName="jc_template" />
-        </preConditions>
-        <comment>update data jc_template</comment>
-        <sql>
-            UPDATE `jc_template` SET type='120急救' WHERE sequence_nbr=24;
-            UPDATE `jc_template` SET type='120急救' WHERE sequence_nbr=25;
-            UPDATE `jc_template` SET content ='【120急救】时间：callTime；地址：address；保障类别：securityCategory；事件概述：eventOverview；备注：remarks；警情阶段：alertStage' WHERE sequence_nbr=23;
-        </sql>
-    </changeSet>
+
 
 
     <changeSet author="tw" id="2021-10-20-2">
@@ -1975,6 +1965,30 @@
         </sql>
     </changeSet>
 
+    <changeSet author="chenzhao" id="2021-10-19-1-2">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="jc_template" />
+            <primaryKeyExists primaryKeyName="sequence_nbr" tableName="jc_template"/>
+        </preConditions>
+        <comment>add data jc_template</comment>
+        <sql>
+            INSERT INTO `jc_template`(`sequence_nbr`, `type_code`, `type`, `content`, `format`) VALUES (23, 'JJQK-1214', '接警情况', '【120救援】时间：callTime；地址：address；保障类别：securityCategory；事件概述：eventOverview；备注：remarks；警情阶段：alertStage');
+            INSERT INTO `jc_template`(`sequence_nbr`, `type_code`, `type`, `content`, `format`) VALUES (24, '1214', '120救援', '【力量调派】调派你部车辆type 车牌号resourcesNum 赶往rescueGrid 位置。
+            <![CDATA[ INSERT INTO `jc_template`(`sequence_nbr`, `type_code`, `type`, `content`, `format`) VALUES (25, '1214    ', '120救援', '<p>【120救援】时间：<span contenteditable="true" data-name="callTimeStr" data-type="input"></span> 地址：<span contenteditable="true" data-name="address" data-type="input"></span>；单位名称：<span contenteditable="true" data-name="unitInvolved" data-type="input"></span>；被困人数：<span contenteditable="true" data-name="trappedNum" data-type="input"></span>trapped_num；伤亡人数：<span contenteditable="true" data-name="casualtiesNum" data-type="input"></span>casualties_num；性别：<span contenteditable="true" data-name="gender" data-type="input"></span>gender；年龄段(岁)：<span contenteditable="true" data-name="ageGroup" data-type="input"></span>ageGroup；。 </p><p>发送单位：<span contenteditable="true" data-name="companyName" data-type="input"></span></p>');]]>
+        </sql>
+    </changeSet>
+
+    <changeSet author="chenzhao" id="2021-10-20">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="jc_template" />
+        </preConditions>
+        <comment>update data jc_template</comment>
+        <sql>
+            UPDATE `jc_template` SET type='120急救' WHERE sequence_nbr=24;
+            UPDATE `jc_template` SET type='120急救' WHERE sequence_nbr=25;
+            UPDATE `jc_template` SET content ='【120急救】时间：callTime；地址：address；保障类别：securityCategory；事件概述：eventOverview；备注：remarks；警情阶段：alertStage' WHERE sequence_nbr=23;
+        </sql>
+    </changeSet>
 
         </databaseChangeLog>