FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into 'FOTON'

Browse Source 
Develop master

See merge request LiuChao/foton-slrs-system-rest!316
This commit is contained in:
王夏晖
2021-12-23 15:06:57 +08:00
parent 69f6708e56 d1cf56c660
commit 0e904d7b53
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/common/ConvertHtml2Excel.java
+1
View File
@@ -30,6 +30,7 @@ public class ConvertHtml2Excel {
List<CrossRangeCellMeta> crossRowEleMetaLs = new ArrayList<CrossRangeCellMeta>(); List<CrossRangeCellMeta> crossRowEleMetaLs = new ArrayList<CrossRangeCellMeta>();
int rowIndex = 0; int rowIndex = 0;
try { try {
tableHtml=tableHtml.replaceAll("\''","\'");
Document data = DocumentHelper.parseText(tableHtml); Document data = DocumentHelper.parseText(tableHtml);
HSSFCellStyle contentStyle = getContentStyle(wb); HSSFCellStyle contentStyle = getContentStyle(wb);
// 生成表头 // 生成表头
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java
+1 -4
View File
@@ -14,17 +14,14 @@ public class SarFindDto {
private int Size; private int Size;
private String id; private String id;
private String standName; private String standName;
// private String standNumber;
private String standEnName; private String standEnName;
private String typeApplicable; private String typeApplicable;
private String nylx; private String nylx;
// private String putTime;
// private String XCXSSRQGJ;
// private String ZCCSSRQGJ;
private String zrbm; private String zrbm;
private String sycpx; private String sycpx;
private String standSort; private String standSort;
private String standType; private String standType;
private String standNumber; private String standNumber;
private String types;
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java
+14 -12
View File
@@ -60,18 +60,20 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
/** /**
*2021/9/13 摒弃使用清单实施日期,改用标准实施日期 *2021/9/13 摒弃使用清单实施日期,改用标准实施日期
*/ */
List<SarLawsAttrDetailedList> sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); if("1".equals(sarFindDto.getTypes())) {
if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq()) && "null"!=sarLawsAttrDetailedLists.get(0).getSsrq()){ List<SarLawsAttrDetailedList> sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper);
lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); 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).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 (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 ("INLAND".equals(lawsDto.getStandType())) lawsDto.setStandType("INLAND_STAND");
if ("FOREIGN".equals(lawsDto.getStandType())) lawsDto.setStandType("FOREIGN_STAND");
}
} }
//适用车型 //适用车型
Map<String,Object> map= iDicTypeEOService.getDicTypeListCode(); Map<String,Object> map= iDicTypeEOService.getDicTypeListCode();
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java
+4
View File
@@ -400,6 +400,10 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
String imgUUIndex = "img" + String.valueOf(imgIndex); String imgUUIndex = "img" + String.valueOf(imgIndex);
if (StringUtils.isNotEmpty(imgContent)){ if (StringUtils.isNotEmpty(imgContent)){
int pathIndex = imgContent.indexOf("src='file"); 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)) { if (pathIndex > -1 && imgContent.length()>(pathIndex+16)) {
String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2); String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2);
String imgName = imgUUIndex + "-" +imgPath.substring(imgPath.lastIndexOf("/")+1,imgPath.length()); String imgName = imgUUIndex + "-" +imgPath.substring(imgPath.lastIndexOf("/")+1,imgPath.length());