增加导出字段

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

@@ -674,6 +674,7 @@ GROUP BY
     fc.emergency_contact_phone,
     fp.employee_hierarchy employeeHierarchy,
     cast(b.birthdayTime as datetime) as birthdayTime,
+    a.amos_org_code,
     b.*,
     fw.*
     from cb_org_usr a LEFT JOIN
@@ -691,7 +692,6 @@ GROUP BY
     max(case field_code when 'safetyTraining' then field_value end)                 safetyTraining,
     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,
@@ -700,6 +700,10 @@ GROUP BY
     max(case field_code when 'politicalOutlook' then field_value end)                     politicalOutlook,
     max(case field_code when 'residenceDetailsCode' then field_value_label end)                     residenceDetails,
     max(case field_code when 'residenceDetailVal' then field_value end)                     residenceDetailVal,
+
+        max(case field_code when 'holdingTime' then field_value end)                     holdingTime,
+        max(case field_code when 'peopleType' then field_value_label end)                     peopleType,
+
     max(case field_code when 'airportAccommodation' then field_value end)                     airportAccommodation
     FROM cb_dynamic_form_instance GROUP BY instance_id) b