From 78bd7e1bde7cf6f7ae5b1cb586f094926b042a72 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 27 Dec 2021 11:01:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=AF=BC=E5=87=BA=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E6=95=B0=E6=8D=AE=20=E5=BA=94=E8=AF=A5=E5=8F=AA?=
 =?UTF-8?q?=E5=9C=A8=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=EF=BC=81=E5=B7=B2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarLawsAttrDetailedListController.java    | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 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 51315bbb..05aea921 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
@@ -11,6 +11,7 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListS
 import com.adc.da.sys.service.IDicTypeEOService;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -118,7 +119,7 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
     **/
     @ApiOperation(value = "导出标准信息")
     @GetMapping("/ExportLawsById")
-    public void ExportLawsById(HttpServletResponse response, StandExcelVo standExcelVo){
+    public void ExportLawsById(HttpServletResponse response, StandExcelVo standExcelVo,@RequestParam(required = false,defaultValue = "0")String type){
 
             response.setContentType("application/vnd.ms-excel");
             response.setCharacterEncoding("utf-8");
@@ -140,6 +141,34 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
             }else {
                 data=sarLawsAttrDetailedListDao.selectLawsByIdE(standExcelVo.getIds());
             }
+            if ("1".equals(type)){
+                List<String> lawsIds=new ArrayList<>();
+                SarFindDto sarFindDto=new SarFindDto();
+                sarFindDto.setId(standExcelVo.getId());
+                data.forEach(lawsDto -> {lawsIds.add(lawsDto.getId());});
+                List<LawsDto> list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto);
+                for (LawsDto lawsDto:data){
+                    if (StringUtils.isNoneEmpty(lawsDto.getApplyArctic())){
+                        lawsDto.setApplyArctic(lawsDto.getApplyArctic());
+                    }
+                    QueryWrapper<SarLawsAttrDetailedList> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("stand_id",lawsDto.getId())
+                            .eq("detailed_list_id",sarFindDto.getId());
+                    List<SarLawsAttrDetailedList> sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper);
+                    if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq()) && "null" != sarLawsAttrDetailedLists.get(0).getSsrq()) {
+                        lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq());
+                    }
+                    if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getXcxssrq()) {
+                        lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq());
+                    }
+                    if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getZccssrq()) {
+                        lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq());
+                    }
+                    if ("INLAND".equals(lawsDto.getStandType())) lawsDto.setStandType("INLAND_STAND");
+                    if ("FOREIGN".equals(lawsDto.getStandType())) lawsDto.setStandType("FOREIGN_STAND");
+
+                }
+            }
             //适用车型
             Map<String,Object> map= iDicTypeEOService.getDicTypeListCode();
             List<Map<String, String>> typeApplicable = (List<Map<String, String>>)map.get("ENERGYTYPES");
@@ -227,13 +256,13 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
             List<Map<String, String>> sycpx = (List<Map<String, String>>)map.get("SYCPXCLASS");
             for (LawsDto list1:data){
                 if (list1.getSSRQ()!=null){
-                    list1.setSSRQ(list1.getSSRQ().substring(0,10));
+                    list1.setSSRQ(list1.getSSRQ());
                 }
                 if (list1.getZCCSSRQGJ()!=null){
-                    list1.setZCCSSRQGJ(list1.getZCCSSRQGJ().substring(0,10));
+                    list1.setZCCSSRQGJ(list1.getZCCSSRQGJ());
                 }
                 if (list1.getXCXSSRQGJ()!=null){
-                    list1.setXCXSSRQGJ(list1.getXCXSSRQGJ().substring(0,10));
+                    list1.setXCXSSRQGJ(list1.getXCXSSRQGJ());
                 }
 
                 if (StringUtils.isNotBlank(list1.getSYCPX()) && list1.getSYCPX().contains(",")){