修改bug

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

@@ -142,8 +142,8 @@ public class OrgUsrFireExcelDto  extends BaseDto {
 
     @ExcelProperty(value = "出生日期", index = 17)
     @ApiModelProperty(value = "出生日期")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")  此注解用于此处不起任何作用 --ky20220918
+//    @JsonFormat(pattern = "yyyy-MM-dd")
     private String birthdayTime;
 
     @ExplicitConstraint(indexNum = 18, sourceClass = CommonExplicitConstraint.class, method = "getMaritalStatus") //固定下拉内容

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

@@ -407,9 +407,9 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
         AND type = 'RYZT'
         ) AS stateCode,
         fp.employee_hierarchy,
-        cast(b.birthdayTime as datetime) as birthdayTime,
         b.*,
-        fw.*
+        fw.*,
+        DATE_FORMAT(b.birthdayTime,'%Y-%m-%d') AS birthdaryTime
         from cb_org_usr a LEFT JOIN
         (SELECT
         instance_id,
@@ -427,7 +427,7 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
         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 'birthdayTime' THEN DATE_FORMAT(field_value, '%Y-%m-%d') 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,

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

@@ -208,7 +208,7 @@ public class ExcelServiceImpl {
 //			authFalg=true;
 //		}
         //效验参数
-		boolean authFalg=getFlag(par);
+		boolean authFlag = true;
 
 		switch (excelDto.getType()) {
 
@@ -248,7 +248,7 @@ public class ExcelServiceImpl {
 			break;
 		case "SYXX":
 			// 暂时先还原代码不加 “非” ，为修改bug http://36.46.149.14:5080/zentao/task-view-6974.html 水源导出没有数据问题
-			if(!authFalg) {
+			if(!authFlag) {
 				ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,
 						WaterResourceDto.class, dataSourcesImpl, false);
 				break;
@@ -275,7 +275,7 @@ public class ExcelServiceImpl {
 					AircraftDto.class, dataSourcesImpl, false);
 			break;
 		case "XFDW":
-			if(!authFalg) {
+			if(!authFlag) {
 				ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,
 						FireTeamDto.class, dataSourcesImpl, false);
 				break;
@@ -285,7 +285,7 @@ public class ExcelServiceImpl {
 					FireTeamDto.class, dataSourcesImpl, false);
 			break;
 		case "WXXFZ":
-			if(!authFalg) {
+			if(!authFlag) {
 				ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,
 						FireStationDto.class, null, false);
 				break;
@@ -301,7 +301,7 @@ public class ExcelServiceImpl {
 					FireStationDto.class, null, false);
 			break;
 		case "XFRY":
-			if(!authFalg) {
+			if(!authFlag) {
 				ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
 						null, FirefightersExcelDto.class, null, false);
 				break;
@@ -310,8 +310,8 @@ public class ExcelServiceImpl {
 			List<OrgUsrFireExcelDto> firefightersExcelDtoList = firefightersService.exportToExcelNew(false, par);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
 					firefightersExcelDtoList, OrgUsrFireExcelDto.class, null, false);
-			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
-					firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
+//			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+//					firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
 			break;
 		case "WBRY":
 			List<MaintenancePersonExcleDto> maintenancePersonExcelDtoList = maintenanceCompanyService
@@ -350,7 +350,7 @@ public class ExcelServiceImpl {
 					signDtos.getRecords(), SignDto.class, null, false);
 			break;
 		case "KEYSITE":
-			if(!authFalg) {
+			if(!authFlag) {
 				ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,
 						KeySiteExcleDto.class, null, false);
 				break;
@@ -370,7 +370,7 @@ public class ExcelServiceImpl {
 					KeySiteExcleDto.class, null, false);
 			break;
 		case "JCDWRY":
-			if(!authFalg) {
+			if(!authFlag) {
 				ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,
 						OrgUsrExcelDto.class, null, false);
 				break;