diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java index 20ea8e57..c24b5639 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java @@ -37,7 +37,7 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 一级资料类别 */ - @ApiModelProperty("一级资料类别") + @ApiModelProperty("1级资料分类") @TableField(value = "FIRST_TYPE") private String firstType; @@ -46,7 +46,7 @@ public class SarLawsInformation extends BasePage implements Serializable { */ @ApiModelProperty(value = "一级资料类别名称") // @TableField(exist = false) - @Excel(name = "一级资料类别", orderNum = "0") + @Excel(name = "1级资料分类", orderNum = "0") private String firstTypeName; /** @@ -61,7 +61,7 @@ public class SarLawsInformation extends BasePage implements Serializable { */ @ApiModelProperty(value = "二级资料类别名称") // @TableField(exist = false) - @Excel(name = "二级资料类别", orderNum = "1") + @Excel(name = "2级资料分类", orderNum = "1") private String secondTypeName; /** @@ -76,7 +76,7 @@ public class SarLawsInformation extends BasePage implements Serializable { */ @ApiModelProperty(value = "三级资料类别名称") // @TableField(exist = false) - @Excel(name = "三级资料类别", orderNum = "2") + @Excel(name = "3级资料分类", orderNum = "2") private String thirdTypeName; /** @@ -91,7 +91,7 @@ public class SarLawsInformation extends BasePage implements Serializable { */ @ApiModelProperty(value = "四级资料类别名称") // @TableField(exist = false) - @Excel(name = "四级资料类别", orderNum = "3") + @Excel(name = "4级资料分类", orderNum = "3") private String fourthTypeName; /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java index 11af44bd..d2f908f0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java @@ -178,7 +178,7 @@ public class SarLawsTopicController extends BaseController { HSSFCellStyle cellStyle1 = workbook.createCellStyle(); cellStyle1.setAlignment(HorizontalAlignment.CENTER); cellStyle1.setVerticalAlignment(VerticalAlignment.CENTER); - String exportFieldName = "课题名称,课题承办单位,课题指导单位,课题参与单位,开始时间,结题时间,课题费用(万元)"; + String exportFieldName = "课题名称,课题承办单位,课题指导单位,课题参与单位,启动时间,结题时间,课题费用(万元)"; String[] headerArr = exportFieldName.split(","); for (int i=0;i < headerArr.length; i++) { Cell cell = rowHeader.createCell(i); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java index c3ae5219..9ac842d3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java @@ -56,7 +56,7 @@ public class SarLawsTopicVO extends BasePage { */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", orderNum = "4", exportFormat = "yyyy-MM-dd", needMerge = true) + @Excel(name = "启动时间", orderNum = "4", exportFormat = "yyyy-MM-dd", needMerge = true) private Date startTime; /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 643db6da..1d63b5c6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -70,7 +70,7 @@ public class FieldConvertUtil { public static String exportFieldNamesMeetingTopic = "议题名称,汇报人,汇报单位,议题主要内容"; // 政策法规资料 表头 - public static String exportFieldLawsInformation = "一级资料类别,二级资料类别,三级资料类别,四级资料类别,资料名称,资料归属部门,作者,资料说明"; + public static String exportFieldLawsInformation = "1级资料分类,2级资料分类,3级资料分类,4级资料分类,资料名称,资料归属部门,作者,资料说明"; // 政策课题 表头 public static String exportFieldLawsTopic = "课题名称,课题承办单位,课题指导单位,课题参与单位,开始时间,结题时间,课题费用(万元),课题组会议列表,课题组联系方式,内部联系方式";