From c3c69e87ef6951a404ef8a202ce9591419b71e76 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Tue, 27 Jul 2021 09:20:27 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E6=B8=85=E5=8D=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsDto.java | 36 +++++++++---------- .../entity/StandExcelDto.java | 3 +- .../entity/StandExcelVo.java | 2 +- .../entity/StandRegionalTimeDto.java | 2 +- .../entity/StandTimeDto.java | 2 +- .../Util/BeanConverUtil.java | 2 +- .../entity/AddDetailedDto.java | 2 +- .../entity/DetailedUpDto.java | 5 +-- .../entity/FindFileNameDto.java | 2 +- .../sarLawsDetailedList/entity/IdListDto.java | 2 +- .../sarLawsDetailedList/entity/TimeDto.java | 4 +-- .../sarStandItems/entity/FindStandDto.java | 2 +- .../sarStandItems/entity/SarItemsTime.java | 2 +- .../entity/SarStandItemsDto.java | 6 ---- .../sarStandItems/entity/StandsTimeDto.java | 2 +- .../SarLawsAttrDetailedListMapper.xml | 2 +- 16 files changed, 32 insertions(+), 44 deletions(-) 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 391554f7..7369ffb4 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 @@ -26,66 +26,66 @@ import lombok.NoArgsConstructor; public class LawsDto { @ApiModelProperty(value = "主键") private String id; - @ExcelProperty(value = "标准编号", index = 0) + @ExcelProperty(value = "标准编号") @ApiModelProperty(value = "标准编号") private String standNumber; - @ExcelProperty(value = "中文名称", index = 1) + @ExcelProperty(value = "中文名称") @ApiModelProperty(value = "中文名称") private String standName; - @ExcelProperty(value = "英文名称", index = 2) + @ExcelProperty(value = "英文名称") @ApiModelProperty(value = "英文名称") private String standEnName; - @ExcelProperty(value = "适用车型", index = 3) + @ExcelProperty(value = "适用车型") @ApiModelProperty(value = "适用车型") private String typeApplicable; - @ExcelProperty(value = "能源类型", index = 4) + @ExcelProperty(value = "能源类型") @ApiModelProperty(value = "能源类型") private String NYLX; - @ExcelProperty(value = "标准年份", index = 5) + @ExcelProperty(value = "标准年份") private String standYear; - @ExcelProperty(value = "标准类别", index = 6) + @ExcelProperty(value = "标准类别") private String standSortShow; - @ExcelProperty(value = "标准类别", index = 6) private String issueTime; @ColumnWidth(16) - @ExcelProperty(value = "标准实施日期", index = 7) + @ExcelProperty(value = "标准实施日期") @ApiModelProperty(value = "标准实施日期") @DateTimeFormat("yyyy年MM月dd日") private String putTime; @ColumnWidth(16) - @ExcelProperty(value = "新车型实施日期", index = 8) + @ExcelProperty(value = "新车型实施日期") @ApiModelProperty(value = "新车型实施日期") @DateTimeFormat("yyyy年MM月dd日") private String XCXSSRQGJ; @ColumnWidth(16) - @ExcelProperty(value = "在产车实施日期", index = 8) + @ExcelProperty(value = "在产车实施日期") @ApiModelProperty(value = "在产车实施日期") @DateTimeFormat("yyyy年MM月dd日") private String ZCCSSRQGJ; - @ExcelProperty(value = "责任部门", index = 9) + @ExcelProperty(value = "责任部门") @ApiModelProperty(value = "责任部门") private String ZRBM; @ColumnWidth(14) - @ExcelProperty(value = "适用产品线", index = 10) + @ExcelProperty(value = "适用产品线") @ApiModelProperty(value = "适用产品线") private String SYCPX; @ColumnWidth(20) - @ExcelProperty(value = "乘用车VPPS编码", index = 11) + @ExcelProperty(value = "乘用车VPPS编码") @ApiModelProperty(value = "乘用车VPPS编码") private String CYCVPPSBM; @ColumnWidth(20) - @ExcelProperty(value = "乘用车vpps中文名称", index = 12) + @ExcelProperty(value = "乘用车vpps中文名称") @ApiModelProperty(value = "乘用车vpps中文名称") private String CYCVPPSCN; @ColumnWidth(20) - @ExcelProperty(value = "卡车VPPS编码", index = 13) + @ExcelProperty(value = "卡车VPPS编码") @ApiModelProperty(value = "卡车VPPS编码") private String KCCVPPSBM; @ColumnWidth(20) - @ExcelProperty(value = "卡车vpps中文名称", index = 14) + @ExcelProperty(value = "卡车vpps中文名称") @ApiModelProperty(value = "卡车vpps中文名称") private String KCCVPPSCN; @ApiModelProperty(value = "责任工程师") - @ExcelProperty(value = "责任工程师", index = 15) + @ExcelProperty(value = "责任工程师") private String responsibleEngineer; + private String standType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java index fb9f6787..6805be5d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java @@ -1,6 +1,5 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; -import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -8,7 +7,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * //TODO 添加类、接口描述 + * //导出类 *用于导出标准数据信息 * 需要后期修改 * @author ZhangZhiYuan diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelVo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelVo.java index 1aba0157..a3a6fa8c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelVo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelVo.java @@ -7,7 +7,7 @@ import lombok.Data; import java.util.List; /** - * //TODO 添加类、接口描述 + * //接收所导出的文件名 * * @author ZhangZhiYuan * @date 2021-06-24 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java index 9bdae697..fb999d9c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * //TODO 添加类、接口描述 + * //新增清单进行时间的添加 * * @author ZhangZhiYuan * @date 2021-07-21 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandTimeDto.java index 9d3d62fe..1ea48e91 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandTimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandTimeDto.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * //TODO 添加类、接口描述 + * //标准时间 * * @author ZhangZhiYuan * @date 2021-07-21 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/Util/BeanConverUtil.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/Util/BeanConverUtil.java index 3ef12840..c9688764 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/Util/BeanConverUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/Util/BeanConverUtil.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.stream.Collectors; /** - * //TODO 添加类、接口描述 + * //继承类的数据转移 * * @author ZhangZhiYuan * @date 2021-07-26 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java index fe5b5162..6e7af186 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * //TODO 添加类、接口描述 + * //新增dto * * @author ZhangZhiYuan * @date 2021-06-24 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java index bcb55199..6689b0f9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java @@ -1,15 +1,12 @@ package com.adc.da.slrs.sarLawsDetailedList.entity; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; -import java.util.List; /** - * //TODO 添加类、接口描述 + * //修改dto * * @author ZhangZhiYuan * @date 2021-06-25 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/FindFileNameDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/FindFileNameDto.java index 639d228c..aeb42622 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/FindFileNameDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/FindFileNameDto.java @@ -3,7 +3,7 @@ package com.adc.da.slrs.sarLawsDetailedList.entity; /** - * //TODO 添加类、接口描述 + * //文件名回显 * * @author ZhangZhiYuan * @date 2021-07-26 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/IdListDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/IdListDto.java index 4d6b2229..ed5f89a5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/IdListDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/IdListDto.java @@ -6,7 +6,7 @@ import lombok.Data; import java.util.List; /** - * //TODO 添加类、接口描述 + * //导出标准信息进行接收ids * * @author ZhangZhiYuan * @date 2021-06-22 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java index e7660013..e2dee83d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java @@ -1,12 +1,10 @@ package com.adc.da.slrs.sarLawsDetailedList.entity; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * //TODO 添加类、接口描述 + * //用于新增清单的三个时间 * * @author ZhangZhiYuan * @date 2021-07-21 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java index dfbbe661..48409480 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java @@ -3,7 +3,7 @@ package com.adc.da.slrs.sarStandItems.entity; import lombok.Data; /** - * //TODO 添加类、接口描述 + * //查询dto * * @author ZhangZhiYuan * @date 2021-07-19 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemsTime.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemsTime.java index 3b71d80a..c894d55a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemsTime.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemsTime.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * //TODO 添加类、接口描述 + * //分解单dto * * @author ZhangZhiYuan * @date 2021-07-14 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java index b7d68da5..e6292810 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java @@ -4,10 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import java.util.Date; - /** - * //TODO 添加类、接口描述 * * @author ZhangZhiYuan * @date 2021-07-08 @@ -31,11 +28,8 @@ public class SarStandItemsDto { @ApiModelProperty(value = "责任部门") private String responsibleUnit; - private String responsibleEngineer; - - @ApiModelProperty(value = "SVPPS") private String svpps; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/StandsTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/StandsTimeDto.java index a5ea5d3f..38521d39 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/StandsTimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/StandsTimeDto.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * //TODO 添加类、接口描述 + * //时间查询 * * @author ZhangZhiYuan * @date 2021-07-14 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 87f689cd..ac098d16 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -4,7 +4,7 @@