feat: 不符合项库导出调整顺序
This commit is contained in:
+4
-4
@@ -182,7 +182,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
|
|||||||
* PCR编号
|
* PCR编号
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "PCR编号")
|
@ApiModelProperty(value = "PCR编号")
|
||||||
@Excel(name = "PCR编号", width = 15, orderNum = "11")
|
@Excel(name = "PCR编号", width = 15, orderNum = "13")
|
||||||
private String pcrNo;
|
private String pcrNo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -206,7 +206,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
|
|||||||
@ApiModelProperty(value = "整改完成日期")
|
@ApiModelProperty(value = "整改完成日期")
|
||||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||||
@Excel(name = "整改完成日期", width = 15, orderNum = "12", format = "yyyy-MM-dd")
|
@Excel(name = "整改完成日期", width = 15, orderNum = "14", format = "yyyy-MM-dd")
|
||||||
private Date rectifyCompleteDate;
|
private Date rectifyCompleteDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -220,7 +220,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
|
|||||||
* 附件
|
* 附件
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "附件")
|
@ApiModelProperty(value = "附件")
|
||||||
@ExcelCollection(name = "", orderNum = "13")
|
@ExcelCollection(name = "", orderNum = "15")
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private List<ExcelExportUtilPro.FileDetails> fileList = Collections.emptyList();
|
private List<ExcelExportUtilPro.FileDetails> fileList = Collections.emptyList();
|
||||||
|
|
||||||
@@ -270,7 +270,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
|
|||||||
* 关闭人
|
* 关闭人
|
||||||
*/
|
*/
|
||||||
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
|
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
|
||||||
@Excel(name = "关闭人", width = 15, orderNum = "8", dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
|
@Excel(name = "关闭人", width = 15, orderNum = "11", dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
|
||||||
@ApiModelProperty(value = "关闭人")
|
@ApiModelProperty(value = "关闭人")
|
||||||
private String closeUser;
|
private String closeUser;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user