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-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FilePatrolReportServiceImpl.java

@@ -78,17 +78,18 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 		analysisReportLog.setStartDate(startDate);
 		analysisReportLog.setEndDate(endDate);
 		Map<String, Object> report = analysisReportLogMapper.getReport(analysisReportLog);
+		SimpleDateFormat dateStat = new SimpleDateFormat("yyyy年MM月dd日");
 		// 文档编号
 		String timeStr1 = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
 		String documentNumber = "ZD-XFSBXC" + timeStr1;
+		String documentNameTime = dateStat.format(startDate);
 		map.put("document_number", documentNumber);
 		// 设置文档文件名
-		map.put("document_name", "消防巡查报表" + timeStr1);
+		map.put("document_name", "消防巡查报表" + documentNameTime);
 		// 换流站名称
 		String stationName=(String) station.get("biz_org_name");
 		map.put("station_name", stationName);
 		// 统计时间
-		SimpleDateFormat dateStat = new SimpleDateFormat("yyyy年MM月dd日");
 		String statisticalTime = dateStat.format(startDate) + "-" + dateStat.format(endDate);
 		if (statisticalTime.contains("年0")) {
 			statisticalTime = statisticalTime.replaceAll("年0", "年");

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

@@ -264,10 +264,8 @@ public class ExcelServiceImpl {
 					AircraftDto.class, dataSourcesImpl, false);
 			break;
 		case "XFDW":
-
-
-
-			if(!authFalg) {
+			// 暂时先还原代码不加 “非” ,由此原因导致导出队伍没有数据，后续若需修改请排查加了此逻辑的相关导出功能
+			if(authFalg) {
 				ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,
 						FireTeamDto.class, dataSourcesImpl, false);
 				break;
@@ -745,7 +743,7 @@ public class ExcelServiceImpl {
 							}
 						}
 					}
-					if ("birthdayTime".equals(key)) {
+					if ("birthdayTime".equals(key) && !ObjectUtils.isEmpty(value)) {
 						SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 						try {
 							String date = ft.format(value);
@@ -754,6 +752,11 @@ public class ExcelServiceImpl {
 							logger.error("日期转换失败");
 						}
 					}
+					if ("peopleType".equals(key)) {
+						dynamicFormInstanceDto.setFieldValue("1");
+						dynamicFormInstanceDto.setFieldValueLabel("非消防人员");
+						orgUsrExcelDto.setPeopleType("1");
+					}
 					DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
 					BeanUtils.copyProperties(dynamicFormInstanceDto, dynamicFormInstance);
 					dynamicFormInstancelist.add(dynamicFormInstance);