修改机场人员导出模板。

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrExcelDto.java

@@ -41,7 +41,7 @@ public class OrgUsrExcelDto extends BaseDto {
     @ApiModelProperty(value = "amos中公司/部门ID")
     private String amosOrgId;
 
-    @ExcelIgnore
+    @ExcelProperty(value = "关联平台用户名称", index = 38)
     @ApiModelProperty(value = "amos中公司/部门编码")
     private String amosOrgCode;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -36,6 +36,8 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
     List<OrgPersonExcelDto> queryOrgPersonDtoList(boolean isDelete);
 
+    List<OrgUsr> selectAmosorgCode();
+
     /**
      * 根据id查询当前单位下的所有子单位、部门
      *

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

@@ -1075,4 +1075,11 @@ LEFT JOIN (
             AND code = #{companyCode}
         </if>
     </select>
+
+    <select id="selectAmosorgCode"  resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT  cb_org_usr.amos_org_id  FROM  cb_org_usr WHERE
+        cb_org_usr.is_delete=0 AND cb_org_usr.amos_org_id IS NOT NULL AND cb_org_usr.amos_org_id !=''
+    </select>
+
+
 </mapper>

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

@@ -192,8 +192,43 @@ public class ExcelServiceImpl {
 	public void templateExport(HttpServletResponse response, ExcelDto excelDto) throws ClassNotFoundException {
 		String url = excelDto.getClassUrl();
 		Class<?> clz = Class.forName(url);
-		ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null, clz, dataSourcesImpl,
-				true);
+		//机场单位人员时填充amosuser 字段
+		if(excelDto.getType().equals("JCDWRY")){
+
+			//查询平台所有用户信息
+			FeignClientResult<List<AgencyUserModel>> userListResult = Privilege.agencyUserClient.list(null,null);
+			List<AgencyUserModel> userList = userListResult.getResult();
+			List<OrgUsrExcelDto> data = new ArrayList<>();
+			//查询已经关联的所有 用户
+            Set<String> set=new HashSet();
+			List<OrgUsr> listD=orgUsrMapper.selectAmosorgCode();
+			if(listD.isEmpty()){
+				for (OrgUsr orgUsr : listD) {
+					set.add(orgUsr.getAmosOrgId());
+				}
+			}
+			userList.stream().forEach(u -> {
+
+				if(set.isEmpty()&& set.contains(u.getUserId())){
+					//暂时不处理
+				}else{
+					OrgUsrExcelDto dd=new OrgUsrExcelDto();
+					dd.setAmosOrgCode(u.getUserId()+"@"+u.getRealName());
+					data.add(dd);
+				}
+			});
+
+			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), data, clz, dataSourcesImpl,
+					true);
+		}else{
+			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null, clz, dataSourcesImpl,
+					true);
+		}
+
+
+
+
+
 	}
 
 	public void commonExport(HttpServletResponse response, ExcelDto excelDto, Map par) {
@@ -722,7 +757,13 @@ public class ExcelServiceImpl {
 					case "telephone":
 						dynamicFormInstanceDto.setFieldValue(orgUsrExcelDto.getTelephone());
 						break;
-
+					case "amosOrgCode":
+						if (orgUsrExcelDto.getAmosOrgCode() != null) {
+							String[] certificates = orgUsrExcelDto.getAmosOrgCode().split("@");
+							orgUsrExcelDto.setAmosOrgId(certificates[1]);
+							orgUsrExcelDto.setAmosOrgCode(certificates[0]);
+						}
+						break;
 					}
 
 					DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();