From 2428b39e799777a73aa79b0f49316c65a387ebf1 Mon Sep 17 00:00:00 2001
From: Wanghong <1417307168@qq.com>
Date: Wed, 28 Jul 2021 09:23:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E9=A1=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarStandUnqualifiedServiceImpl.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 1c73a0d7..e5c91ca3 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,5 +1,6 @@
 package com.adc.da.slrs.sarStandUnqualified.service.impl;
 
+import com.adc.da.att.entity.AttFileEO;
 import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified;
 import com.adc.da.slrs.sarStandUnqualified.dao.SarStandUnqualifiedDao;
 import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualifiedPage;
@@ -17,9 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -42,7 +41,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
     @Override
     public IPage<SarStandUnqualified> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
         QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
-        if(sarStandUnqualifiedPage.getStandId()!=null){
+        if(sarStandUnqualifiedPage.getStandId()!=null || sarStandUnqualifiedPage.getStandName()!=null){
             sarStandUnqualifiedQueryWrapper
                     .like("stand_id",sarStandUnqualifiedPage.getStandId())
                     .like("stand_name",sarStandUnqualifiedPage.getStandId());
@@ -73,8 +72,9 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
     @Override
     public IPage<SarStandUnqualified> getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
         QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
-        if(sarStandUnqualifiedPage.getStandId()!=null){
-            sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name",sarStandUnqualifiedPage.getStandId()));
+        if(sarStandUnqualifiedPage.getStandId()!=null || sarStandUnqualifiedPage.getStandName()!=null){
+            sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId())
+                    .like("stand_name",sarStandUnqualifiedPage.getStandId());
 //            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
         }
 

From b3630e8ad60265c43fdde771da96c71df7f596e2 Mon Sep 17 00:00:00 2001
From: zzy <2041873787@qq.com>
Date: Wed, 28 Jul 2021 10:10:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarLawsAttrDetailedListController.java    | 22 +++++--
 .../entity/LawsDto.java                       | 58 +++++++++++++------
 .../SarLawsAttrDetailedListMapper.xml         |  4 +-
 3 files changed, 60 insertions(+), 24 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 c14be448..5d291bee 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
@@ -21,6 +21,7 @@ import com.adc.da.base.web.BaseController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
@@ -117,14 +118,19 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
     @ApiOperation(value = "导出标准信息")
     @GetMapping("/ExportLawsById")
     public void ExportLawsById(HttpServletResponse response, StandExcelVo standExcelVo){
-        try {
+
             response.setContentType("application/vnd.ms-excel");
             response.setCharacterEncoding("utf-8");
             if(standExcelVo.getExportName()==null){
                 standExcelVo.setExportName("标准导出信息");
             }
-            String fileName = URLEncoder.encode(standExcelVo.getExportName(), "UTF-8").replaceAll("\\+", "%20");
-            response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+        String fileName = null;
+        try {
+            fileName = URLEncoder.encode(standExcelVo.getExportName(), "UTF-8").replaceAll("\\+", "%20");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
             List<LawsDto> data = new ArrayList<>();
             if (CollectionUtils.isEmpty(standExcelVo.getIds())){
                 List<String> list=  sarLawsAttrDetailedListDao.selectLawsId2(standExcelVo.getId());
@@ -248,10 +254,14 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
                     }
                 }
             }
+        try {
             EasyExcel.write(response.getOutputStream(), LawsDto.class).useDefaultStyle(false).autoCloseStream(Boolean.FALSE).sheet("sheet1")
                     .doWrite(data);
-        } catch (Exception e) {
-            response.reset();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        response.reset();
             response.setContentType("application/json");
             response.setCharacterEncoding("utf-8");
             try {
@@ -261,6 +271,6 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
             }
         }
 
-    }
+
 
 }
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 7369ffb4..5fd67bcf 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,90 @@ import lombok.NoArgsConstructor;
 public class LawsDto {
     @ApiModelProperty(value = "主键")
     private String id;
-    @ExcelProperty(value = "标准编号")
+
+    @ExcelProperty(value = "标准编号", index = 0)
     @ApiModelProperty(value = "标准编号")
     private String standNumber;
-    @ExcelProperty(value = "中文名称")
+
+    @ExcelProperty(value = "中文名称", index = 1)
     @ApiModelProperty(value = "中文名称")
     private String standName;
-    @ExcelProperty(value = "英文名称")
+
+    @ExcelProperty(value = "英文名称", index = 2)
     @ApiModelProperty(value = "英文名称")
     private String standEnName;
-    @ExcelProperty(value = "适用车型")
+
+    @ExcelProperty(value = "适用车型", index = 3)
     @ApiModelProperty(value = "适用车型")
     private String typeApplicable;
-    @ExcelProperty(value = "能源类型")
+
+    @ExcelProperty(value = "能源类型", index = 4)
     @ApiModelProperty(value = "能源类型")
     private String NYLX;
-    @ExcelProperty(value = "标准年份")
+
+    @ApiModelProperty(value = "标准年份")
+    @ExcelProperty(value = "标准年份", index = 5)
     private String standYear;
-    @ExcelProperty(value = "标准类别")
+
+    @ApiModelProperty(value = "标准类别")
+    @ExcelProperty(value = "标准类别", index = 6)
     private String standSortShow;
+
+    @ApiModelProperty(value = "标准发表日期")
+    @ExcelProperty(value = "标准发表日期", index = 7)
     private String issueTime;
+
     @ColumnWidth(16)
-    @ExcelProperty(value = "标准实施日期")
+    @ExcelProperty(value = "标准实施日期", index = 8)
     @ApiModelProperty(value = "标准实施日期")
     @DateTimeFormat("yyyy年MM月dd日")
     private String putTime;
+
     @ColumnWidth(16)
-    @ExcelProperty(value = "新车型实施日期")
+    @ExcelProperty(value = "新车型实施日期", index = 9)
     @ApiModelProperty(value = "新车型实施日期")
     @DateTimeFormat("yyyy年MM月dd日")
     private String XCXSSRQGJ;
+
     @ColumnWidth(16)
-    @ExcelProperty(value = "在产车实施日期")
+    @ExcelProperty(value = "在产车实施日期", index = 10)
     @ApiModelProperty(value = "在产车实施日期")
     @DateTimeFormat("yyyy年MM月dd日")
     private String ZCCSSRQGJ;
-    @ExcelProperty(value = "责任部门")
+
+    @ExcelProperty(value = "责任部门", index = 11)
     @ApiModelProperty(value = "责任部门")
     private String ZRBM;
+
     @ColumnWidth(14)
-    @ExcelProperty(value = "适用产品线")
+    @ExcelProperty(value = "适用产品线", index = 12)
     @ApiModelProperty(value = "适用产品线")
     private String SYCPX;
+
     @ColumnWidth(20)
-    @ExcelProperty(value = "乘用车VPPS编码")
+    @ExcelProperty(value = "乘用车VPPS编码", index = 13)
     @ApiModelProperty(value = "乘用车VPPS编码")
     private String CYCVPPSBM;
+
     @ColumnWidth(20)
-    @ExcelProperty(value = "乘用车vpps中文名称")
+    @ExcelProperty(value = "乘用车vpps中文名称", index = 14)
     @ApiModelProperty(value = "乘用车vpps中文名称")
     private String CYCVPPSCN;
+
     @ColumnWidth(20)
-    @ExcelProperty(value = "卡车VPPS编码")
+    @ExcelProperty(value = "卡车VPPS编码", index = 15)
     @ApiModelProperty(value = "卡车VPPS编码")
     private String KCCVPPSBM;
+
     @ColumnWidth(20)
-    @ExcelProperty(value = "卡车vpps中文名称")
+    @ExcelProperty(value = "卡车vpps中文名称", index = 16)
     @ApiModelProperty(value = "卡车vpps中文名称")
     private String KCCVPPSCN;
+
     @ApiModelProperty(value = "责任工程师")
-    @ExcelProperty(value = "责任工程师")
+    @ExcelProperty(value = "责任工程师", index = 17)
     private String responsibleEngineer;
+
+    @ApiModelProperty(value = "1")
     private 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 ac098d16..cd8f823e 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,12 +3,13 @@
 <mapper namespace="com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao">
 
     <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,
+        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)
         <where>
+        <if test="sarFindDto !=null">
             <if test="sarFindDto.standName != 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
             </if>
+        </if>
             a.ID IN
             <foreach collection="param1" item="item" open="(" separator="," close=")">
                 #{item}