update：清单增加字段

2021-07-27 09:20:27 +08:00
parent 6f286d6ca5
commit c3c69e87ef
16 changed files with 32 additions and 44 deletions
@@ -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;
 }
@@ -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
@@ -7,7 +7,7 @@ import lombok.Data;
 import java.util.List;

 /**
- * //TODO 添加类、接口描述
+ * //接收所导出的文件名
 *
 * @author ZhangZhiYuan
 * @date 2021-06-24
@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

 /**
- * //TODO 添加类、接口描述
+ * //新增清单进行时间的添加
 *
 * @author ZhangZhiYuan
 * @date 2021-07-21
@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

 /**
- * //TODO 添加类、接口描述
+ * //标准时间
 *
 * @author ZhangZhiYuan
 * @date 2021-07-21
@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.stream.Collectors;

 /**
- * //TODO 添加类、接口描述
+ * //继承类的数据转移
 *
 * @author ZhangZhiYuan
 * @date 2021-07-26
@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

 /**
- * //TODO 添加类、接口描述
+ * //新增dto
 *
 * @author ZhangZhiYuan
 * @date 2021-06-24
@@ -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
@@ -3,7 +3,7 @@ package com.adc.da.slrs.sarLawsDetailedList.entity;


 /**
- * //TODO 添加类、接口描述
+ * //文件名回显
 *
 * @author ZhangZhiYuan
 * @date 2021-07-26
@@ -6,7 +6,7 @@ import lombok.Data;
 import java.util.List;

 /**
- * //TODO 添加类、接口描述
+ * //导出标准信息进行接收ids
 *
 * @author ZhangZhiYuan
 * @date 2021-06-22
@@ -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
@@ -3,7 +3,7 @@ package com.adc.da.slrs.sarStandItems.entity;
 import lombok.Data;

 /**
- * //TODO 添加类、接口描述
+ * //查询dto
 *
 * @author ZhangZhiYuan
 * @date 2021-07-19
@@ -8,7 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;

 /**
- * //TODO 添加类、接口描述
+ * //分解单dto
 *
 * @author ZhangZhiYuan
 * @date 2021-07-14
@@ -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;

@@ -8,7 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;

 /**
- * //TODO 添加类、接口描述
+ * //时间查询
 *
 * @author ZhangZhiYuan
 * @date 2021-07-14
@@ -4,7 +4,7 @@

    <select id="selectLawsById" parameterType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarFindDto" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
        SELECT a.ID,a.STAND_NUMBER,a.STAND_NAME,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQGJ,b.ZCCSSRQGJ,b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,
-               b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow ,a.STAND_YEAR as standYear,ISSUE_TIME as issueTime
+               b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow ,a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType
        FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
        a.ID = b.STAND_ID left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and
        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)