moral.git - Gitblit

			@@ -44,13 +44,30 @@


			@ApiModelProperty(value = "上报时间")
			@JsonFormat(pattern="yyyy-MM-dd")
			@ExcelProperty(value = "上报时间")
			private Date escalationTime;
			private String escalationTimeStr;

			@ExcelProperty(value = "责任单位")
			private String unitName;

			@ExcelProperty(value = "污染分类")
			private String polluteTypeName;

			@ApiModelProperty(value = "污染位置")
			@ExcelProperty(value = "污染位置")
			private String pollutePosition;

			@ApiModelProperty(value = "整改类型id")
			@ExcelProperty(value = "整改类型")
			private String changeTypeStr;

			@ApiModelProperty(value = "上报人")
			@ExcelProperty(value = "上报人")
			private String escalationName;

			@ApiModelProperty(value = "问题描述")
			@ExcelProperty(value = "问题描述")
			private String problemDescribe;

			/* @ApiModelProperty(value = "基础附件")
			private List<FileAddressVo> fileBaseList;*/
			@@ -59,9 +76,25 @@
			@ExcelProperty(value = "整改前图片",converter = MyStringImageConverterUtil.class)
			private List<String> writeCellDataFile;

			@ApiModelProperty(value = "上报人")
			@ExcelProperty(value = "上报人")
			private String escalationName;
			@ApiModelProperty(value = "是否整改")
			@ExcelProperty(value = "是否整改")
			private String changeStr;

			@ApiModelProperty(value = "整改反馈")
			@ExcelProperty(value = "整改反馈")
			private String changeDescribe;

			@ApiModelProperty(value = "整改人姓名")
			@ExcelProperty(value = "整改人姓名")
			private String changeName;

			@ApiModelProperty(value = "整改时间")
			@ExcelProperty(value = "整改时间")
			private String changeTimeStr;


			@ExcelProperty(value = "整改后图片",converter = MyStringImageConverterUtil.class)
			private List<String> writeCellDataFileResult;

			/* @ApiModelProperty(value = "责任单位id")
			private Integer unitId;