修改规则回调

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -313,7 +313,13 @@
     </select>
   <select id="getDutyPersonByTeamIdAndCarId" resultType="java.util.Map">
      SELECT
-	cfir.telephone AS mobilePhone,
+
+	(SELECT
+		cfi.field_value AS telephone
+	FROM
+		cb_dynamic_form_instance cfi
+		where cfi.instance_id = cou.sequence_nbr and cfi.field_code = 'telephone'
+		)AS mobilePhone,
 	hh.userId AS userId,
 	cou.biz_org_name AS userName,
 	cou.amos_org_id AS amosId
@@ -352,18 +358,12 @@ FROM
 			ss.deptName = #{departmentName}
 	) hh
 LEFT JOIN cb_org_usr cou ON hh.userId = cou.sequence_nbr
-LEFT JOIN (
-	SELECT
-		MAX(
-			CASE
-			WHEN cfi.field_code = 'telephone' THEN
-				cfi.field_value
-			END
-		) AS telephone,
-		cfi.instance_id
-	FROM
-		cb_dynamic_form_instance cfi
-) cfir ON cfir.instance_id = hh.userId
+
+
+
+
+
+
     </select>
       <select id="getDutyPersonByTeamIdAndAirId" resultType="java.util.Map">
      SELECT
@@ -429,10 +429,10 @@ FROM
 		SELECT
 			Max(
 				CASE
-				WHEN cbd.field_code = 'positionType' THEN
+				WHEN cbd.field_code = 'administrativePositionCode' THEN
 					cbd.field_value
 				END
-			) AS positionType,
+			) AS administrativePositionCode,
 			Max(
 				CASE
 				WHEN cbd.field_code = 'telephone' THEN
@@ -470,14 +470,14 @@ FROM
 LEFT JOIN cb_org_usr cour ON dd.instance_id = cour.sequence_nbr
 WHERE
  		    <if test="positionType == null ">
-                 dd.positionType IS NOT NULL
-            </if>
-            <if test="positionType != null">
-                 dd.positionType in
-					<foreach collection="positionType"  item="item" separator="," open="(" close=")" index="">
-      					 #{item, jdbcType=NUMERIC}
-   				  </foreach> 
+                 dd.administrativePositionCode IS NOT NULL
             </if>
+<!--            <if test="positionType != null">-->
+<!--                 dd.positionType in-->
+<!--					<foreach collection="positionType"  item="item" separator="," open="(" close=")" index="">-->
+<!--      					 #{item, jdbcType=NUMERIC}-->
+<!--   				  </foreach> -->
+<!--            </if>-->
 	</select>
     <select id ="getDutyFirePerson" resultType="java.util.Map">
   SELECT

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -909,7 +909,7 @@ LEFT JOIN (
         i.field_value, null) as 'telephone' from cb_dynamic_form_instance i where i.field_code  = 'telephone'
         and i.field_value  is not null) b on cou .sequence_nbr = b.id2
         ) d left join cb_org_usr cbo on cbo.sequence_nbr  = d.parentId where d.parentId in  (select sequence_nbr from cb_org_usr cou where biz_org_name = #{bizOrgName})
-
+	    and  d.administrativePositionCode is not null
 
     </select>
 

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

@@ -3629,6 +3629,21 @@
         </sql>
     </changeSet>
 
+    <changeSet author="tw" id="2022-11-08-01">
+        <preConditions onFail="MARK_RAN">
+
+            <tableExists tableName="jc_alert_form" />
+
+        </preConditions>
+        <comment>add data jc_alert_form</comment>
+        <sql>
+            REPLACE INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`, `hide`) VALUES (132, '229', NULL, '火灾经度', 'floorLongitude', 'input', NULL, NULL, NULL, b'0', b'0', 2, NULL, b'1');
+            REPLACE INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`, `hide`) VALUES (133, '229', NULL, '火灾纬度', 'floorLatitude', 'input', NULL, NULL, NULL, b'0', b'0', 3, NULL, b'1');
+
+        </sql>
+    </changeSet>
+
+
 
 
 </databaseChangeLog>