修改导出

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

@@ -407,6 +407,7 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
         AND type = 'RYZT'
         ) AS stateCode,
         fp.employee_hierarchy,
+        a.amos_org_code,
         b.*,
         fw.*,
         DATE_FORMAT(b.birthdayTime,'%Y-%m-%d') AS birthdaryTime
@@ -434,6 +435,11 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
         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 '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 'nativePlace' then field_value_label end)                     nativePlace,
+
         max(case field_code when 'airportAccommodation' then field_value end)                     airportAccommodation
         FROM cb_dynamic_form_instance GROUP BY instance_id) b
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -793,6 +793,13 @@ public class ExcelServiceImpl {
 					orgUsrExcelDto.setParentName(certificates[0]);
 					orgUsrExcelDto.setParentId(certificates[1]);
 				}
+
+				if (orgUsrExcelDto.getAmosOrgCode() != null) {
+					String[] certificates = orgUsrExcelDto.getAmosOrgCode().split("@");
+					orgUsrExcelDto.setAmosOrgId(certificates[1]);
+					orgUsrExcelDto.setAmosOrgCode(certificates[0]);
+				}
+
 				// 动态字段填充
 				List<DynamicFormInitDto> dynamicFormColumn = dynamicFormColumnServiceImpl.getFormlist("246");
 				Map<String, Object> map = new HashMap<>();