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

企标制修订计划立项-导入 修复 ，高级查询失效修复

Browse Source
This commit is contained in:
yuezhihang
2022-03-22 17:30:29 +08:00
parent dc585e7840
commit 86b9eabd03
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java
+2 -1
View File
@@ -19,9 +19,10 @@ public class importExcelDTO {
private String unitName; private String unitName;
@Excel(name = "起草责任单位" , orderNum = "3", width = 20.0)
private String unit; private String unit;
@Excel(name = "起草责任单位" , orderNum = "3", width = 20.0)
private String drafterName; private String drafterName;
@Excel(name = "起草人" , orderNum = "4", width = 20.0) @Excel(name = "起草人" , orderNum = "4", width = 20.0)
adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java
+3 -3
View File
@@ -73,9 +73,9 @@ public class IExportServiceImpl implements IExportService {
stringBuilder.append("第" + i + "行第7列工作组组长填写不符合格式要求请检查；"); stringBuilder.append("第" + i + "行第7列工作组组长填写不符合格式要求请检查；");
} }
} }
if (null!=importExcelDTO.getUnit() && !"".equals(importExcelDTO.getUnit())){ if (null!=importExcelDTO.getUnitName() && !"".equals(importExcelDTO.getUnitName())){
importExcelDTO.setUnitName(tsInstitutionMap.get(importExcelDTO.getUnit())); importExcelDTO.setUnit(tsInstitutionMap.get(importExcelDTO.getUnitName()));
if (null==tsInstitutionMap.get(importExcelDTO.getUnit())){ if (null==tsInstitutionMap.get(importExcelDTO.getUnitName())){
stringBuilder.append("第"+i+"行第4列起草责任单位填写不符合格式要求请检查；"); stringBuilder.append("第"+i+"行第4列起草责任单位填写不符合格式要求请检查；");
} }
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+1 -1
View File
@@ -233,7 +233,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
// sarAdvanceSearchVO.setField("STAND_SYSTEM"); // sarAdvanceSearchVO.setField("STAND_SYSTEM");
// } // }
// }); // });
String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info"); String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_stand_attr_info");
if (StringUtils.isNotBlank(advanceStr)) { if (StringUtils.isNotBlank(advanceStr)) {
page.setAdvanceSearchStr(advanceStr); page.setAdvanceSearchStr(advanceStr);
} else { } else {