diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 743e5356..14460d0e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -86,25 +86,25 @@ public class LawsDto { @ApiModelProperty(value = "适用产品线") private String SYCPX; - @ColumnWidth(20) - @ExcelProperty(value = "乘用车VPPS编码", index = 10) - @ApiModelProperty(value = "乘用车VPPS编码") - private String CYCVPPSBM; - - @ColumnWidth(20) - @ExcelProperty(value = "乘用车vpps中文名称", index = 11) - @ApiModelProperty(value = "乘用车vpps中文名称") - private String CYCVPPSCN; - - @ColumnWidth(20) - @ExcelProperty(value = "卡车VPPS编码", index = 12) - @ApiModelProperty(value = "卡车VPPS编码") - private String KCCVPPSBM; - - @ColumnWidth(20) - @ExcelProperty(value = "卡车vpps中文名称", index = 13) - @ApiModelProperty(value = "卡车vpps中文名称") - private String KCCVPPSCN; +// @ColumnWidth(20) +// @ExcelProperty(value = "乘用车VPPS编码", index = 10) +// @ApiModelProperty(value = "乘用车VPPS编码") +// private String CYCVPPSBM; +// +// @ColumnWidth(20) +// @ExcelProperty(value = "乘用车vpps中文名称", index = 11) +// @ApiModelProperty(value = "乘用车vpps中文名称") +// private String CYCVPPSCN; +// +// @ColumnWidth(20) +// @ExcelProperty(value = "卡车VPPS编码", index = 12) +// @ApiModelProperty(value = "卡车VPPS编码") +// private String KCCVPPSBM; +// +// @ColumnWidth(20) +// @ExcelProperty(value = "卡车vpps中文名称", index = 13) +// @ApiModelProperty(value = "卡车vpps中文名称") +// private String KCCVPPSCN; @ApiModelProperty(value = "责任工程师") // @ExcelProperty(value = "责任工程师", index = 17) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java index 5ed171da..0385647a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java @@ -50,18 +50,18 @@ public class StandAttrInfoDto { //责任部门 @ExcelProperty("责任部门") private String ZRBM; - //关联模块--卡车VPPS编码 - @ExcelProperty("关联模块--卡车VPPS编码") - private String KCCVPPSBM; - //关联模块--卡车vpps中文名称 - @ExcelProperty("关联模块--卡车vpps中文名称") - private String KCCVPPSCN; - //关联模块--乘用车VPPS编码 - @ExcelProperty("关联模块--乘用车VPPS编码") - private String CYCVPPSBM; - //关联模块--乘用车vpps中文名称 - @ExcelProperty("关联模块--乘用车vpps中文名称") - private String CYCVPPSCN; +// //关联模块--卡车VPPS编码 +// @ExcelProperty("关联模块--卡车VPPS编码") +// private String KCCVPPSBM; +// //关联模块--卡车vpps中文名称 +// @ExcelProperty("关联模块--卡车vpps中文名称") +// private String KCCVPPSCN; +// //关联模块--乘用车VPPS编码 +// @ExcelProperty("关联模块--乘用车VPPS编码") +// private String CYCVPPSBM; +// //关联模块--乘用车vpps中文名称 +// @ExcelProperty("关联模块--乘用车vpps中文名称") +// private String CYCVPPSCN; private Long unCount; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 210feb35..36142a40 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -352,13 +352,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl