diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index a53882076c..f40344f6cb 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -66,14 +66,14 @@ public class IcTripReportRecordDTO implements Serializable { * 姓名 */ @ColumnWidth(15) - @ExcelProperty(value = "姓名", order = 1) + @ExcelProperty(value = "姓名") private String name; /** * 手机号 */ @ColumnWidth(15) - @ExcelProperty(value = "手机号",order = 3) + @ExcelProperty(value = "手机号") private String mobile; /** @@ -85,7 +85,7 @@ public class IcTripReportRecordDTO implements Serializable { * 身份证号 */ @ColumnWidth(22) - @ExcelProperty(value = "证件号",order = 2) + @ExcelProperty(value = "证件号") private String idCard; /** @@ -121,14 +121,14 @@ public class IcTripReportRecordDTO implements Serializable { * 现居地名称eg:山东省青岛市黄岛区玫瑰山路社区 */ @ColumnWidth(50) - @ExcelProperty(value = "现居地",order = 4) + @ExcelProperty(value = "现居地") private String presentAddress; /** * 详细地址 */ @ColumnWidth(35) - @ExcelProperty(value = "现居地详细地址",order = 5) + @ExcelProperty(value = "现居地详细地址") private String detailAddress; /** @@ -147,14 +147,14 @@ public class IcTripReportRecordDTO implements Serializable { * 来源地区地址 */ @ColumnWidth(50) - @ExcelProperty(value = "来自地区",order = 6) + @ExcelProperty(value = "来自地区") private String sourceAddress; /** * 到达日期 */ @ColumnWidth(25) - @ExcelProperty(value = "来到本地时间",order = 8) + @ExcelProperty(value = "来到本地时间") @JsonFormat(pattern = "yyyy-MM-dd") private String arriveDate; @@ -162,7 +162,7 @@ public class IcTripReportRecordDTO implements Serializable { * 离开日期 */ @ColumnWidth(25) - @ExcelProperty(value = "离开本地时间",order = 13) + @ExcelProperty(value = "离开本地时间") @JsonFormat(pattern = "yyyy-MM-dd") private String leaveDate; @@ -178,7 +178,7 @@ public class IcTripReportRecordDTO implements Serializable { * 备注信息 */ @ColumnWidth(100) - @ExcelProperty(value = "备注",order = 14) + @ExcelProperty(value = "备注") private String remark; /** @@ -237,112 +237,127 @@ public class IcTripReportRecordDTO implements Serializable { /** * 交通方式,来源字典表(traffic_type) */ + @ExcelIgnore private String trafficType; /** * 交通方式-中国字 */ - @ColumnWidth(50) - @ExcelProperty(value = "返回方式",order = 9) + @ExcelIgnore private String trafficTypeName; /** * 其他返回方式,交通方式为其他时此列需要有值 */ - @ColumnWidth(50) - @ExcelProperty(value = "其他返回方式",order = 10) + @ExcelIgnore private String trafficTypeExplain; /** * 来自地区详细地址 source_address字段的说明 */ - @ColumnWidth(25) - @ExcelProperty(value = "来自地区详细地址",order = 7) + @ExcelIgnore private String sourceDetailAddress; /** * 疫苗接种针次 (0 1 2 3)【小寨子】 */ + @ExcelIgnore private String vaccineNum; /** * 疫苗接种针次 -中国字(0针 1针 2针 3针) */ - @ColumnWidth(50) - @ExcelProperty(value = "疫苗接种针次",order = 12) + @ExcelIgnore private String vaccineNumName; /** * 是否有48小时核算记录 0:否 1:是 【小寨子】 */ + @ExcelIgnore private String isNatRecord; /** * 是否有48小时核算记录 0:否 1:是 【小寨子】-中国字 */ - @ColumnWidth(50) - @ExcelProperty(value = "48小时核酸检测",order = 11) + @ExcelIgnore private String isNatRecordName; /** * 户籍地 【磐石】 */ + @ExcelIgnore private String registeredResidence; /** * 年龄【磐石】 */ + @ExcelIgnore private int age; /** * 来曹事由【磐石】 */ + @ExcelIgnore private String describeContent; /** * 48小时核算检查结果(0:阴性 1:阳性)【磐石】 */ + @ExcelIgnore private String natOutcome; /** * 48小时核算检查结果(阴性 阳性)【磐石】-中国字 */ + @ExcelIgnore private String natOutcomeName; /** * 7天内旅居史情况,字典表(sojourn_history)【磐石】 */ + @ExcelIgnore private String sojournHistory; /** * 7天内旅居史情况,字典表(sojourn_history)【磐石】-中国字 */ + @ExcelIgnore private String sojournHistoryName; /** * 隔离状态,字典表(isolate_type)【磐石】 */ + @ExcelIgnore private String isolateType; /** * 隔离状态,字典表(isolate_type)【磐石】-中国字 */ + @ExcelIgnore private String isolateTypeName; /** * 是否落实"落地检" 0:否 1:是【磐石】 */ + @ExcelIgnore private String isArriveCheck; /** * 是否落实"落地检" 0:否 1:是【磐石】-中国字 */ + @ExcelIgnore private String isArriveCheckName; /** * 是否达到曹县 0:否 1:是【磐石】 */ + @ExcelIgnore private String isArrive; /** * 是否达到曹县 0:否 1:是【磐石】-中国字 */ + @ExcelIgnore private String isArriveName; /** * 上报时间【磐石】 */ + @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd") private String reportingTime; /** * 管控措施【磐石】 */ + @ExcelIgnore private String controlMeasures; /** * 行程记录类型,字典表(trip_data_type)【磐石】 */ + @ExcelIgnore private String tripDataType; /** * 行程记录类型,字典表(trip_data_type)【磐石】-中国字 */ + @ExcelIgnore private String tripDataTypeName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 50728a1db7..5444efca73 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -221,8 +221,6 @@ public class IcTripReportRecordController implements ResultDataResolver { public void export(@LoginUser TokenDto tokenDto, @RequestBody PageTripReportFormDTO formDTO, HttpServletResponse response) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - // formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); - // formDTO.setUserId("35005df15fb0f7c791344f0b424870b7"); formDTO.setIsPage(false); ExcelWriter excelWriter = null; formDTO.setPageSize(NumConstant.TEN_THOUSAND); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java index a701be4c74..150dfd684d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPsTripReportRecordExportExcel.java @@ -24,13 +24,13 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 姓名 */ - @ColumnWidth(15) + @ColumnWidth(12) @ExcelProperty(value = "姓名", order = 1) private String name; /** * 年龄【磐石】 */ - @ColumnWidth(15) + @ColumnWidth(10) @ExcelProperty(value = "年龄",order = 2) private int age; /** @@ -42,7 +42,7 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 户籍地 【磐石】 */ - @ColumnWidth(30) + @ColumnWidth(28) @ExcelProperty(value = "户籍地(省市县区)",order = 4) private String registeredResidence; /** @@ -103,7 +103,7 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 其他返回方式,交通方式为其他时此列需要有值 */ - @ColumnWidth(20) + @ColumnWidth(18) @ExcelProperty(value = "其他返回方式",order = 14) private String trafficTypeExplain; /** @@ -121,7 +121,7 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 备注(500字以内) */ - @ColumnWidth(35) + @ColumnWidth(30) @ExcelProperty(value = "备注(500字以内)",order = 17) private String remark; /** @@ -146,7 +146,7 @@ public class IcPsTripReportRecordExportExcel implements Serializable { /** * 管控措施(500字以内)【磐石】 */ - @ColumnWidth(35) + @ColumnWidth(30) @ExcelProperty(value = "管控措施(500字以内)",order = 21) private String controlMeasures; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java index 5b2bfbc0d9..77754cdefd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExportExcel.java @@ -25,7 +25,7 @@ public class IcTripReportRecordExportExcel implements Serializable { /** * 姓名 */ - @ColumnWidth(15) + @ColumnWidth(12) @ExcelProperty(value = "姓名", order = 1) private String name; @@ -88,7 +88,7 @@ public class IcTripReportRecordExportExcel implements Serializable { /** * 其他返回方式,交通方式为其他时此列需要有值 */ - @ColumnWidth(20) + @ColumnWidth(18) @ExcelProperty(value = "其他返回方式",order = 10) private String trafficTypeExplain; @@ -109,7 +109,7 @@ public class IcTripReportRecordExportExcel implements Serializable { /** * 离开日期 */ - @ColumnWidth(20) + @ColumnWidth(15) @ExcelProperty(value = "离开本地时间",order = 13) @JsonFormat(pattern = "yyyy-MM-dd") private String leaveDate; @@ -117,7 +117,7 @@ public class IcTripReportRecordExportExcel implements Serializable { /** * 备注信息 */ - @ColumnWidth(40) + @ColumnWidth(30) @ExcelProperty(value = "备注",order = 14) private String remark; }