From dcd7ec0bd86cd788343b50524c423890a7f3ca00 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 23 Dec 2021 10:45:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E6=89=8D=E6=8B=BFxccssrqgj=20=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E6=8B=BFxccssrq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListServiceImpl.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index f06b591c..0444a390 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -60,18 +60,20 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl 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"); + if("1".equals(sarFindDto.getStandSort())) { + List 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 map= iDicTypeEOService.getDicTypeListCode(); From cb471942cb339c01502b410c7ed491c809e6cbca Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 23 Dec 2021 14:20:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=AF=94=E5=AF=B9?= =?UTF-8?q?=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E5=A4=8D=20+=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E6=9F=A5=E8=AF=A2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/common/ConvertHtml2Excel.java | 1 + .../da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java | 5 +---- .../service/impl/SarLawsAttrDetailedListServiceImpl.java | 2 +- .../service/impl/SarFileSplitItemsEOServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/common/ConvertHtml2Excel.java b/adc-da-slrs/src/main/java/com/adc/da/common/ConvertHtml2Excel.java index 87276771..ac75765a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/common/ConvertHtml2Excel.java +++ b/adc-da-slrs/src/main/java/com/adc/da/common/ConvertHtml2Excel.java @@ -30,6 +30,7 @@ public class ConvertHtml2Excel { List crossRowEleMetaLs = new ArrayList(); int rowIndex = 0; try { + tableHtml=tableHtml.replaceAll("\''","\'"); Document data = DocumentHelper.parseText(tableHtml); HSSFCellStyle contentStyle = getContentStyle(wb); // 生成表头 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java index db12a5b6..cc7ee987 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java @@ -14,17 +14,14 @@ public class SarFindDto { private int Size; private String id; private String standName; -// private String standNumber; private String standEnName; private String typeApplicable; private String nylx; -// private String putTime; -// private String XCXSSRQGJ; -// private String ZCCSSRQGJ; private String zrbm; private String sycpx; private String standSort; private String standType; private String standNumber; + private String types; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 0444a390..8b975cfa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -60,7 +60,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq()) && "null" != sarLawsAttrDetailedLists.get(0).getSsrq()) { lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java index 19cf6cf5..ca85af8f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -399,7 +399,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic String imgContent = itemsValEO.getItemContent(); String imgUUIndex = "img" + String.valueOf(imgIndex); if (StringUtils.isNotEmpty(imgContent)){ - int pathIndex = imgContent.indexOf("src='file"); + int pathIndex = imgContent.indexOf("src='"+uploadFilePath); if (pathIndex > -1 && imgContent.length()>(pathIndex+16)) { String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2); String imgName = imgUUIndex + "-" +imgPath.substring(imgPath.lastIndexOf("/")+1,imgPath.length()); From d1cf56c6601f5243773f6469ffb5683b9926d65b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 23 Dec 2021 15:05:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=AF=94=E5=AF=B9?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A1=A8=E6=A0=BC=E5=92=8C=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=E5=AF=BC=E5=87=BA=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarFileSplitItemsEOServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java index ca85af8f..2ccba526 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -399,7 +399,11 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic String imgContent = itemsValEO.getItemContent(); String imgUUIndex = "img" + String.valueOf(imgIndex); if (StringUtils.isNotEmpty(imgContent)){ - int pathIndex = imgContent.indexOf("src='"+uploadFilePath); + int pathIndex = imgContent.indexOf("src='file"); + if (pathIndex==-1){ + String sa = imgContent.replaceAll("\''","\'"); + pathIndex = sa.indexOf("src='file"); + } if (pathIndex > -1 && imgContent.length()>(pathIndex+16)) { String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2); String imgName = imgUUIndex + "-" +imgPath.substring(imgPath.lastIndexOf("/")+1,imgPath.length());