字段排序

srs-survey/src/main/java/com/srs/survey/domain/SurItinerary.java

@@ -180,61 +180,6 @@ private static final long serialVersionUID=1L;
     @Excel(name = "宿舍号")
     @TableField(exist = false)
     public String roomNo;
-    /**
-     * 家长是否知晓
-     */
-    @ApiModelProperty("家长是否知晓")
-    @TableField("know")
-    @Excel(name = "家长是否知晓")
-    public String know;
-
-    /**
-     * 未返校原因分类
-     */
-    @ApiModelProperty("未返校原因分类")
-    @TableField("absent_school_type")
-    @Excel(name = "未返校原因分类")
-    public String absentSchoolType;
-
-    /**
-     * 未返校详细原因
-     */
-    @ApiModelProperty("未返校详细原因")
-    @TableField("absent_school_remark")
-    @Excel(name = "未返校详细原因")
-    public String absentSchoolRemark;
-
-    /**
-     * 到校定位
-     */
-    @ApiModelProperty("到校定位")
-    @TableField("attend_school_gps")
-    @Excel(name = "到校定位")
-    public String attendSchoolGps;
-
-    /**
-     * 到校时间
-     */
-    @ApiModelProperty("到校时间")
-    @TableField("attend_school_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "到校时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    public Date attendSchoolTime;
-
-    /**
-     * 状态：0.保存，1.保存,2.已审核
-     */
-    @ApiModelProperty("状态：0.保存，1.待审核,2.已审核")
-    @TableField("status")
-    @Excel(name = "状态：0.保存，1.待审核,2.已审核")
-    public String status;
-
-
-    @ApiModelProperty("预计离校时间")
-    @TableField("will_leave_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "预计离校时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    public Date willLeaveTime;
 
     @ApiModelProperty("是否离校")
     @TableField("is_leave")
@@ -256,37 +201,11 @@ private static final long serialVersionUID=1L;
     @Excel(name = "家长是否知晓（离校、留校）")
     public String famKnow;
 
-    @ApiModelProperty("计划返校时间")
+    @ApiModelProperty("预计离校时间")
-    @TableField("scheduled_return_time")
+    @TableField("will_leave_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "计划返校时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "预计离校时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    public Date scheduledReturnTime;
+    public Date willLeaveTime;
-
-    @ApiModelProperty("预计留校时间")
-    @TableField("will_stay_time")
-    @Excel(name = "预计留校时间")
-    public String willStayTime;
-
-    @ApiModelProperty("留校事由")
-    @TableField("stay_reason")
-    @Excel(name = "留校事由")
-    public String stayReason;
-
-
-    @ApiModelProperty("离校、留校审核状态")
-    @TableField("leave_status")
-    @Excel(name = "离校、留校审核状态",dictType = "sur_status")
-    public String leaveStatus;
-
-    @ApiModelProperty("是否到家")
-    @TableField("is_home")
-    @Excel(name = "是否到家")
-    public String isHome;
-
-    @ApiModelProperty("到家定位")
-    @TableField("home_gps")
-//    @Excel(name = "到家定位")
-    public String homeGps;
 
     @ApiModelProperty("去向地")
     @TableField("will_addr")
@@ -298,25 +217,79 @@ private static final long serialVersionUID=1L;
     @Excel(name = "去向地详细地址")
     public String willDetailAddr;
 
-    @TableField("home_gps_addr")
-    public String homeGpsAddr;
 
-    @TableField("home_submit")
+    @ApiModelProperty("计划返校时间")
-    public String homeSubmit;
+    @TableField("scheduled_return_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "计划返校时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    public Date scheduledReturnTime;
+
+
+    @ApiModelProperty("预计留校时间")
+    @TableField("will_stay_time")
+    @Excel(name = "预计留校时间")
+    public String willStayTime;
+
+    @ApiModelProperty("留校事由")
+    @TableField("stay_reason")
+    @Excel(name = "留校事由")
+    public String stayReason;
+
+    @ApiModelProperty("离校、留校审核状态")
+    @TableField("leave_status")
+    @Excel(name = "离校、留校审核状态",dictType = "sur_status")
+    public String leaveStatus;
+
+
+    @ApiModelProperty("是否到家")
+    @TableField("is_home")
+    @Excel(name = "是否到家")
+    public String isHome;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("home_gps_time")
     @Excel(name = "到家定位时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     public Date homeGpsTime;
 
-
-
-
     @ApiModelProperty("是否到校")
     @TableField("reach_school_status")
     @Excel(name = "是否到校")
     public String reachSchoolStatus;
 
+
+
+
+    @ApiModelProperty("到校定位")
+    @TableField("attend_school_gps")
+//    @Excel(name = "到校定位")
+    public String attendSchoolGps;
+
+    /**
+     * 到校时间
+     */
+    @ApiModelProperty("到校时间")
+    @TableField("attend_school_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "到校时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    public Date attendSchoolTime;
+
+
+    /**
+     * 未返校原因分类
+     */
+    @ApiModelProperty("未返校原因分类")
+    @TableField("absent_school_type")
+    @Excel(name = "未返校原因分类")
+    public String absentSchoolType;
+
+    /**
+     * 未返校详细原因
+     */
+    @ApiModelProperty("未返校详细原因")
+    @TableField("absent_school_remark")
+    @Excel(name = "未返校详细原因")
+    public String absentSchoolRemark;
+
     /**
      * 家长姓名
      */
@@ -333,11 +306,46 @@ private static final long serialVersionUID=1L;
     @Excel(name = "家长电话（返校）")
     public String parentPhone;
 
+    /**
+     * 家长是否知晓
+     */
+    @ApiModelProperty("家长是否知晓（返校）")
+    @TableField("know")
+    @Excel(name = "家长是否知晓（返校）")
+    public String know;
+
+
+    /**
+     * 状态：0.保存，1.保存,2.已审核
+     */
+    @ApiModelProperty("返校审核状态")
+    @TableField("status")
+    @Excel(name = "返校审核状态",dictType = "sur_status")
+    public String status;
+
+
 
     @TableField("stu_fdy_name")
     @Excel(name = "学生辅导员姓名")
     public String stuFdyName;
 
+
+
+    @ApiModelProperty("到家定位")
+    @TableField("home_gps")
+//    @Excel(name = "到家定位")
+    public String homeGps;
+
+
+
+    @TableField("home_gps_addr")
+    public String homeGpsAddr;
+
+    @TableField("home_submit")
+    public String homeSubmit;
+
+
+
     @TableField(exist = false)
     public Long pageNum;
     @TableField(exist = false)