未符合项整改-导出 字段显示有问题

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java

@@ -36,7 +36,12 @@ public class SarStandUnqualified extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    @ExcelProperty("标准ID")
+    @ExcelProperty("标准号")
+    @ApiModelProperty(value = "标准编号")
+    @TableField("STAND_SERIAL_NUMBER")
+    private String standSerialNumber;
+
+    @ExcelIgnore
     @ApiModelProperty(value = "标准ID")
     @TableField("STAND_ID")
     private String standId;
@@ -69,27 +74,27 @@ public class SarStandUnqualified extends BaseEntity {
     @TableField("ITEMS_NAME")
     private String itemsName;
 
+    @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class)
+    @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）")
+    @TableField("PRODUCT_TYPE")
+    private String productType;
+
     @ExcelProperty("产品线")
     @ApiModelProperty(value = "产品线")
     @TableField("PRODUCT_LINE")
     private String productLine;
 
-    @ExcelProperty("责任部门")
-    @ApiModelProperty(value = "责任部门")
-    @TableField("RESPONSIBLE_UNIT")
-    private String responsibleUnit;
-
     @ExcelProperty("项目名称")
     @ApiModelProperty(value = "项目名称")
     @TableField("PRODUCT_NAME")
     private String productName;
 
-    @ExcelProperty("创建部门")
+    @ExcelIgnore
     @ApiModelProperty(value = "创建部门")
     @TableField("CREATE_DEPT_ID")
     private String createDeptId;
 
-    @ExcelProperty("创建人")
+    @ExcelIgnore
     @ApiModelProperty(value = "创建人")
     @TableField("CREATE_BY_ID")
     private String createById;
@@ -113,17 +118,16 @@ public class SarStandUnqualified extends BaseEntity {
     @TableField("ACTUAL_CLOSE_TIME")
     private Date actualCloseTime;
 
-    @ExcelIgnore
+    @ExcelProperty("不合规项目")
-    @ApiModelProperty(value = "计划关闭时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField("PLAN_CLOSE_TIME")
-    private Date planCloseTime;
-
     @ApiModelProperty(value = "未符合原因")
     @TableField("REASON")
     private String reason;
 
+    @ExcelProperty("责任部门")
+    @ApiModelProperty(value = "责任部门")
+    @TableField("RESPONSIBLE_UNIT")
+    private String responsibleUnit;
+
     @ExcelProperty("质量工程师")
     @ApiModelProperty(value = "质量工程师")
     @TableField("QA_ENGINEER")
@@ -139,33 +143,34 @@ public class SarStandUnqualified extends BaseEntity {
     @TableField("DUTY_ENGINEER")
     private String dutyEngineer;
 
-    @ExcelProperty("标准编号")
+    @ExcelProperty("计划关闭时间")
-    @ApiModelProperty(value = "标准编号")
+    @ApiModelProperty(value = "计划关闭时间")
-    @TableField("STAND_SERIAL_NUMBER")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private String standSerialNumber;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-
+    @TableField("PLAN_CLOSE_TIME")
-    @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class)
+    private Date planCloseTime;
-    @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）")
-    @TableField("PRODUCT_TYPE")
-    private String productType;
 
     @ExcelIgnore
     @ApiModelProperty(value = "主键")
     @TableId(type = IdType.UUID)
     private String id;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "质量工程师")
     @TableField(exist=false)
     private String qaEngineerName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "认证工程师")
     @TableField(exist=false)
     private String authEngineerName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "责任工程师")
     @TableField(exist=false)
     private String dutyEngineerName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "国内OR海外")
     @TableField(exist=false)
     private String standType;