WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug53474相关人员模板校验修改

Browse Source
This commit is contained in:
xiejunyu
2022-06-02 11:32:43 +08:00
parent a7071a2388
commit 8b520d872c
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+10 -8
View File
@@ -713,7 +713,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
Row headerRow = sheet.getRow(i); Row headerRow = sheet.getRow(i);
boolean isBlank = dummyInventoryInfoEOService.isRowEmpty(row); boolean isBlank = dummyInventoryInfoEOService.isRowEmpty(row);
// if (row != null && !isBlank) { if (row != null && !isBlank) {
int columHeadNos = headerRow.getLastCellNum();// 表头总共的列数 int columHeadNos = headerRow.getLastCellNum();// 表头总共的列数
if (columHeadNos == 5) {//列数对 if (columHeadNos == 5) {//列数对
for (int j = 0; j < columHeadNos; j++) { for (int j = 0; j < columHeadNos; j++) {
@@ -735,13 +735,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
throw new JeroBootException("The number of imported columns is wrong. Please check!"); throw new JeroBootException("The number of imported columns is wrong. Please check!");
} }
}*/ }*/
// }else{ }else{
// if (CutEnum.CN.getValue().equals(cut)) { if (CutEnum.CN.getValue().equals(cut)) {
// throw new JeroBootException("导入的数据不能为空,请检查"); throw new JeroBootException("导入的数据不能为空,请检查");
// } else { } else {
// throw new JeroBootException("The imported data of cannot be empty. Please check!"); throw new JeroBootException("The imported data of cannot be empty. Please check!");
// } }
// } }
if (i == 1) {//校验填写说明 if (i == 1) {//校验填写说明
row = sheet.getRow(i); row = sheet.getRow(i);
int columNos = row.getLastCellNum(); int columNos = row.getLastCellNum();
@@ -827,8 +827,10 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
//按照责任领域名,查value //按照责任领域名,查value
if (CutEnum.CN.getValue().equals(cut)) { if (CutEnum.CN.getValue().equals(cut)) {
dutyTerritoryValueList = sysDictItemList.stream().filter(f -> f.getItemText().equals(projectRelatedPersonnel.getDutyTerritory())).map(e -> e.getItemValue()).collect(Collectors.toList()); dutyTerritoryValueList = sysDictItemList.stream().filter(f -> f.getItemText().equals(projectRelatedPersonnel.getDutyTerritory())).map(e -> e.getItemValue()).collect(Collectors.toList());
System.out.println(dutyTerritoryValueList);
} else { } else {
dutyTerritoryValueList = sysDictItemList.stream().filter(f -> f.getEnName().equals(projectRelatedPersonnel.getDutyTerritory())).map(e -> e.getItemValue()).collect(Collectors.toList()); dutyTerritoryValueList = sysDictItemList.stream().filter(f -> f.getEnName().equals(projectRelatedPersonnel.getDutyTerritory())).map(e -> e.getItemValue()).collect(Collectors.toList());
System.out.println(dutyTerritoryValueList);
} }
//责任领域 //责任领域