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());