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 01/17] =?UTF-8?q?update=EF=BC=9A=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=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 @@ - 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, + SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME as standName,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,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) + (a.STAND_NUMBER LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%') or a.STAND_NAME LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%') @@ -37,6 +38,7 @@ b.SYCPX LIKE concat ('%',#{sarFindDto.SYCPX,jdbcType=VARCHAR},'%') and + a.ID IN #{item} From 6dc14af762c7056f2b7ef6077553cf747b31fada Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Wed, 28 Jul 2021 14:05:11 +0800 Subject: [PATCH 07/17] =?UTF-8?q?update=EF=BC=9A=E4=BF=AE=E6=94=B9sql?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListController.java | 4 +-- .../dao/SarLawsAttrDetailedListDao.java | 2 ++ .../SarLawsAttrDetailedListMapper.xml | 26 +++++++++++++++---- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java index 5d291bee..254106fd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java @@ -135,9 +135,9 @@ public class SarLawsAttrDetailedListController extends BaseController list= sarLawsAttrDetailedListDao.selectLawsId2(standExcelVo.getId()); if (CollectionUtils.isEmpty(list)) return; - data=sarLawsAttrDetailedListDao.selectLawsById(list,null); + data=sarLawsAttrDetailedListDao.selectLawsByIdE(list); }else { - data=sarLawsAttrDetailedListDao.selectLawsById(standExcelVo.getIds(),null); + data=sarLawsAttrDetailedListDao.selectLawsByIdE(standExcelVo.getIds()); } //适用车型 Map map= iDicTypeEOService.getDicTypeListCode(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index 361864bd..baffd3c1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -25,6 +25,8 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size); //根据标准id查出数据 List selectLawsById(@Param("param1") List LawsIds, @Param("sarFindDto") SarFindDto sarFindDto); + //用于导出 + List selectLawsByIdE(@Param("param1") List LawsIds); //根据标准id查出数据 List selectLawsByIdC(@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType); //查询时间 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 cd8f823e..eedd123f 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 @@ -3,13 +3,13 @@ + + SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME as standName,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as 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,a.STAND_TYPE as standType + a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType,a.TEXT_STATUS as textStatus 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) @@ -43,13 +43,12 @@ #{item} - + From 60dbb8faeb403209424f37969ec56463fb240347 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 29 Jul 2021 14:02:40 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E6=96=B0=20bu?= =?UTF-8?q?g=E4=BF=AE=E5=A4=8D=20=E5=92=8C=20=E8=A7=92=E8=89=B2=E7=AE=A1?= =?UTF-8?q?=E7=90=86bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarRole/controller/TsRoleController.java | 17 +++++++++++++---- .../mybatis/mapper/sys/DicTypeEOMapper.xml | 5 +++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java index 3f33c2cd..eba62f9b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarRole.controller; +import com.adc.da.exception.AdcDaBaseException; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.login.util.UserUtils; @@ -9,6 +10,7 @@ import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO; import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO; import com.adc.da.slrs.sarRole.service.ITsRoleService; import com.adc.da.sys.entity.UserEO; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Delete; import org.springframework.beans.factory.annotation.Autowired; @@ -53,10 +55,17 @@ public class TsRoleController extends BaseController { @ApiOperation("新增角色") @PostMapping public ResponseMessage addRole(@Validated(TsRole.insert.class) @RequestBody TsRole tsRole){ - //设置操作人 - UserEO userEO=UserUtils.getUser(); - tsRole.setOperator(userEO.getUname()); - return tsRoleService.addRole(tsRole); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("NAME",tsRole.getName()); + int count = tsRoleService.count(queryWrapper); + if (count>0){ + throw new AdcDaBaseException("角色名称已存在，请更换角色名称。"); + }else { + //设置操作人 + UserEO userEO = UserUtils.getUser(); + tsRole.setOperator(userEO.getUname()); + return tsRoleService.addRole(tsRole); + } } @ApiOperation("编辑角色") diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml index 86f5a6f0..cd17691a 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml @@ -461,8 +461,9 @@ AND SAR_LAWS_ITEM_VAL.VALID_FLAG =0 union select count(*) from SAR_BUSSIONESS_STAND - where (SAR_BUSSIONESS_STAND.STAND_GENERA = #{dicTypeCode} or - SAR_BUSSIONESS_STAND.STAND_SUBCLASS = #{dicTypeCode} or + where ( + + SAR_BUSSIONESS_STAND.STAND_STATUS = #{dicTypeCode} or SAR_BUSSIONESS_STAND.STAND_SORT = #{dicTypeCode}) and SAR_BUSSIONESS_STAND.VALID_FLAG =0 From 0779f2c8e9cd1573c3def89e7f01a3bc7ecc5faf Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Thu, 29 Jul 2021 15:07:07 +0800 Subject: [PATCH 16/17] =?UTF-8?q?update=EF=BC=9A=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=95=B4=E6=94=B9=E9=A1=B9=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarLawsDetailedList/entity/ExcelDto.java | 21 ++++++++++ .../entity/SarStandUnqualified.java | 7 +--- .../impl/SarStandUnqualifiedServiceImpl.java | 40 +++++++++++++++---- 3 files changed, 56 insertions(+), 12 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExcelDto.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExcelDto.java new file mode 100644 index 00000000..1a37c435 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExcelDto.java @@ -0,0 +1,21 @@ +package com.adc.da.slrs.sarLawsDetailedList.entity; + +import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-29 + */ +@Data +public class ExcelDto extends SarStandUnqualified { + + @ExcelProperty("创建时间") + private String createTime1; + @ExcelProperty("计划关闭时间") + private String planCloseTime1; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 347f77df..7158dc30 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -81,7 +81,7 @@ public class SarStandUnqualified extends BaseEntity { @TableField("CREATE_BY_ID") private String createById; - @ExcelProperty(value = "创建时间",converter = TimestampConverter.class) + @ExcelIgnore @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -100,7 +100,7 @@ public class SarStandUnqualified extends BaseEntity { @TableField("ACTUAL_CLOSE_TIME") private Date actualCloseTime; - @ExcelProperty(value = "计划关闭时间",converter = TimestampConverter.class) + @ExcelIgnore @ApiModelProperty(value = "计划关闭时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -126,8 +126,6 @@ public class SarStandUnqualified extends BaseEntity { @TableField("DUTY_ENGINEER") private String dutyEngineer; - - @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class) @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") @TableField("PRODUCT_TYPE") @@ -138,7 +136,6 @@ public class SarStandUnqualified extends BaseEntity { @TableId(type = IdType.UUID) private String id; - @ApiModelProperty(value = "质量工程师") @TableField(exist=false) private String qaEngineerName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index 1270bef4..71be68e1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandUnqualified.service.impl; -import com.adc.da.att.entity.AttFileEO; +import com.adc.da.slrs.sarLawsDetailedList.Util.BeanConverUtil; +import com.adc.da.slrs.sarLawsDetailedList.entity.ExcelDto; import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; import com.adc.da.slrs.sarStandUnqualified.dao.SarStandUnqualifiedDao; import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualifiedPage; @@ -11,13 +12,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.stereotype.Service; import java.sql.Timestamp; -import java.time.LocalDateTime; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -128,9 +128,35 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl0){ sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds()); } - List stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper); - List a = stand; - return a; + List stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper); + List list = new ArrayList<>(); + list = BeanConverUtil.converList(stand,ExcelDto.class); + for (int a=0;a Date: Thu, 29 Jul 2021 15:21:53 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E6=94=BF=E7=AD=96=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=EF=BC=81=EF=BC=81=EF=BC=81=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sys/DicTypeEOMapper.xml | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml index cd17691a..288146c0 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml @@ -26,7 +26,14 @@ TS_DICTYPE.id,TS_DICTYPE.parent_id, TS_DICTYPE.dic_type_code, TS_DICTYPE.dic_type_name, TS_DICTYPE.dic_id, - TS_DICTYPE.valid_flag,TS_DICTYPE.creation_time,TS_DICTYPE.modify_time,TS_DICTYPE.describes,TS_DICTYPE.show_index,tree_pid + TS_DICTYPE.valid_flag,TS_DICTYPE.creation_time,TS_DICTYPE.modify_time,TS_DICTYPE.describes,TS_DICTYPE.show_index, + tree_pid + + + + + TS_DICTYPE.id,TS_DICTYPE.parent_id, TS_DICTYPE.dic_type_code, TS_DICTYPE.dic_type_name, TS_DICTYPE.dic_id, + TS_DICTYPE.valid_flag,TS_DICTYPE.creation_time,TS_DICTYPE.modify_time,TS_DICTYPE.describes,(@rownum :=@rownum + 1) AS rownum,TS_DICTYPE.show_index,tree_pid @@ -34,6 +41,11 @@ a.id,a.parent_id, a.dic_type_code, a.dic_type_name, a.dic_id,a.valid_flag,a.creation_time,a.modify_time,a.describes,a.show_index + + + a.id,a.parent_id, a.dic_type_code, a.dic_type_name, a.dic_id,a.valid_flag,a.creation_time,a.modify_time,a.rownum,a.describes,a.show_index + + u.*, ur.id as type_id, ur.dic_type_code as dic_type_code, @@ -294,19 +306,20 @@