productDev/funingyunwei.git

			@@ -26,129 +26,103 @@

			@TableId(type = IdType.AUTO)
			@ApiModelProperty(value = "主键", example = "1")
			@ExcelColumn(name="主键")
			private Integer id;

			@ApiModelProperty(value = "创建人编码", example = "1")
			@ExcelColumn(name="创建人编码")
			private Integer creator;

			@ApiModelProperty(value = "创建时间")
			@ExcelColumn(name="创建时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			@ExcelColumn(name="上报时间",index = 5,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
			private Date createDate;

			@ApiModelProperty(value = "更新人编码", example = "1")
			@ExcelColumn(name="更新人编码")
			private Integer editor;

			@ApiModelProperty(value = "更新时间")
			@ExcelColumn(name="更新时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date editDate;

			@ApiModelProperty(value = "是否删除0否 1是", example = "1")
			@ExcelColumn(name="是否删除0否 1是")
			private Integer isdeleted;

			@ApiModelProperty(value = "标题")
			@ExcelColumn(name="标题")
			private String title;

			@ApiModelProperty(value = "备注")
			@ExcelColumn(name="备注")
			private String remark;

			@ApiModelProperty(value = "状态 0启用 1禁用", example = "1")
			@ExcelColumn(name="状态 0启用 1禁用")
			private Integer status;

			@ApiModelProperty(value = "排序码", example = "1")
			@ExcelColumn(name="排序码")
			private Integer sortnum;

			@ApiModelProperty(value = "情况说明")
			@ExcelColumn(name="情况说明")
			private String content;

			@ApiModelProperty(value = "上门时间")
			@ExcelColumn(name="上门时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date getDate;

			@ApiModelProperty(value = "所属项目编码（关联yw_project)", example = "1")
			@ExcelColumn(name="所属项目编码（关联yw_project)")
			private Integer projectId;

			@ApiModelProperty(value = "所属楼宇编码（关联yw_building)", example = "1")
			@ExcelColumn(name="所属楼宇编码（关联yw_building)")
			private Integer buildingId;

			@ApiModelProperty(value = "所属房间编码（关联yw_room)", example = "1")
			@ExcelColumn(name="所属房间编码（关联yw_room)")
			private Integer roomId;
			@ApiModelProperty(value = "所属楼层编码（关联yw_floor)", example = "1")
			@ExcelColumn(name="所属楼层编码（关联yw_floor)")
			private Integer floorId;

			@ApiModelProperty(value = "提报人编码", example = "1")
			@ExcelColumn(name="提报人编码")
			private Integer userId;

			@ApiModelProperty(value = "联系电话")
			@ExcelColumn(name="联系电话")
			private String phone;

			@ApiModelProperty(value = "提报时间")
			@ExcelColumn(name="提报时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date submitDate;

			@ApiModelProperty(value = "工单分类编码(关联category）", example = "1")
			@ExcelColumn(name="工单分类编码(关联category）")
			private Integer cateId;

			@ApiModelProperty(value = "保修区域类型 0室内维修 1公共区域", example = "1")
			@ExcelColumn(name="保修区域类型 0室内维修 1公共区域")
			@ExcelColumn(name="位置区域",valueMapping = "0=室内维修;1=公共区域;",index = 0,width = 10)
			private Integer areaType;

			@ApiModelProperty(value = "工单编号")
			@ExcelColumn(name="工单编号")
			private String code;

			@ApiModelProperty(value = "处理状态 0待处理 1已分派 2已处理", example = "1")
			@ExcelColumn(name="处理状态 0待处理 1已分派 2已处理")
			@ExcelColumn(name="工单状态",index = 7,width = 10,valueMapping = "0=待处理;1=已分派;2=已处理;")
			private Integer dealStatus;

			@ApiModelProperty(value = "分派人编码(关联system_user)", example = "1")
			@ExcelColumn(name="分派人编码(关联system_user)")
			private Integer dispatchUserId;

			@ApiModelProperty(value = "分派时间")
			@ExcelColumn(name="分派时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date dispatchDate;

			@ApiModelProperty(value = "分派处理说明")
			@ExcelColumn(name="分派处理说明")
			private String dispatchInfo;

			@ApiModelProperty(value = "处理人编码(关联system_user)", example = "1")
			@ExcelColumn(name="处理人编码(关联system_user)")
			private Integer dealUserId;

			@ApiModelProperty(value = "处理时间")
			@ExcelColumn(name="处理时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date dealDate;

			@ApiModelProperty(value = "处理备注")
			@ExcelColumn(name="处理备注")
			private String dealInfo;

			@ApiModelProperty(value = "处理方式 0指派后处理 1直接回复", example = "1")
			@ExcelColumn(name="处理方式 0指派后处理 1直接回复")
			private Integer dealType;

			@ApiModelProperty(value = "项目名称")
			@TableField(exist = false)
			private String projectName;
			@@ -158,11 +132,16 @@
			private String queryStatus;

			@ApiModelProperty(value = "楼宇名称")
			@ExcelColumn(name="楼宇",index = 1,width = 10)
			@TableField(exist = false)
			private String buildingName;
			@ApiModelProperty(value = "房源名称")
			@TableField(exist = false)
			private String roomName;
			@ApiModelProperty(value = "报修区域")
			@ExcelColumn(name="报修区域",index = 2,width = 10)
			@TableField(exist = false)
			private String areaNameInfo;
			@ApiModelProperty(value = "楼层名称")
			@TableField(exist = false)
			private String floorName;
			@@ -170,6 +149,7 @@
			@TableField(exist = false)
			private String roomNum;
			@ApiModelProperty(value = "提报人姓名")
			@ExcelColumn(name="上报人",index = 4,width = 10)
			@TableField(exist = false)
			private String creatorName;
			@ApiModelProperty(value = "提报人电话")
			@@ -177,11 +157,13 @@
			private String creatorMobile;
			@ApiModelProperty(value = "处理人姓名")
			@TableField(exist = false)
			@ExcelColumn(name="处理人",index = 6,width = 10)
			private String dealUserName;
			@ApiModelProperty(value = "处理人组织")
			@TableField(exist = false)
			private String dealUserCompany;
			@ApiModelProperty(value = "类别名称")
			@ExcelColumn(name="工单分类",index = 3,width = 10)
			@TableField(exist = false)
			private String categoryName;
			@ApiModelProperty(value = "分配人姓名")