Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

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

@@ -394,6 +394,15 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
         CODE = b.certificatesTypeCode
         AND type = 'RYZJLX'
         ) AS certificatesTypeCode,
+        (
+        SELECT
+        NAME
+        FROM
+        cb_data_dictionary
+        WHERE
+        CODE = b.stateCode
+        AND type = 'RYZT'
+        ) AS stateCode,
         fp.employee_hierarchy,
         cast(b.birthdayTime as datetime) as birthdayTime,
         b.*,
@@ -411,7 +420,7 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
         max(case field_code when 'personNumber' then field_value end)                         personNumber,
         max(case field_code when 'positionType' then field_value_label end)                   positionType,
         max(case field_code when 'safetyTraining' then field_value end)                 safetyTraining,
-        max(case field_code when 'stateCode' then field_value_label end)                      stateCode,
+        max(case field_code when 'stateCode' then field_value end)                      stateCode,
         max(case field_code when 'telephone' then field_value end)                            telephone,
         max(case field_code when 'peopleType' then field_value end)                     peopleType,
         max(case field_code when 'nation' then field_value end)                     nation,

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

@@ -658,6 +658,15 @@ GROUP BY
     CODE = b.certificatesTypeCode
     AND type = 'RYZJLX'
     ) AS certificatesTypeCode,
+    (
+    SELECT
+    NAME
+    FROM
+    cb_data_dictionary
+    WHERE
+    CODE = b.stateCode
+    AND type = 'RYZT'
+    ) AS stateCode,
     fc.emergency_contact,
     fc.emergency_contact_phone,
     fp.employee_hierarchy employeeHierarchy,
@@ -677,16 +686,16 @@ GROUP BY
     max(case field_code when 'personNumber' then field_value end)                         personNumber,
     max(case field_code when 'positionType' then field_value_label end)                   positionType,
     max(case field_code when 'safetyTraining' then field_value end)                 safetyTraining,
-    max(case field_code when 'stateCode' then field_value_label end)                      stateCode,
+    max(case field_code when 'stateCode' then field_value end)                      stateCode,
     max(case field_code when 'telephone' then field_value end)                            telephone,
     max(case field_code when 'peopleType' then field_value end)                     peopleType,
     max(case field_code when 'nation' then field_value end)                     nation,
     max(case field_code when 'birthdayTime' then field_value end)                     birthdayTime,
     max(case field_code when 'maritalStatus' then field_value end)                     maritalStatus,
     max(case field_code when 'nativePlace' then field_value end)                     nativePlace,
-    max(case field_code when 'nativePlaceVal' then field_value end)                     nativePlaceVal,
+    max(case field_code when 'nativePlaceVal' then field_value_label end)                     nativePlaceVal,
     max(case field_code when 'politicalOutlook' then field_value end)                     politicalOutlook,
-    max(case field_code when 'residenceDetails' then field_value end)                     residenceDetails,
+    max(case field_code when 'residenceDetails' then field_value_label end)                     residenceDetails,
     max(case field_code when 'residenceDetailVal' then field_value end)                     residenceDetailVal,
     max(case field_code when 'airportAccommodation' then field_value end)                     airportAccommodation
     FROM cb_dynamic_form_instance GROUP BY instance_id) b