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

bug54000添加事务注解

Browse Source
This commit is contained in:
xiejunyu
2022-06-12 13:37:09 +08:00
parent 28e897de63
commit c27f0bb401
2 changed files with 39 additions and 38 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/ProjectLibraryBaseServiceImpl.java
+2
View File
@@ -34,6 +34,7 @@ import org.apache.poi.ss.usermodel.Row;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@@ -95,6 +96,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
* @return * @return
*/ */
@Override @Override
@Transactional
public void add(ProjectLibraryBase projectLibraryBase) throws ParseException { public void add(ProjectLibraryBase projectLibraryBase) throws ParseException {
Date now = new Date(); Date now = new Date();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+37 -38
View File
@@ -872,44 +872,43 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
Result<?> result = oppositeDisposeData(list, projectId, cut); Result<?> result = oppositeDisposeData(list, projectId, cut);
return result; return result;
} }
public void deleteBlankRow(Sheet sheet){ public void deleteBlankRow(Sheet sheet){
//获取到excel行数 //获取到excel行数
int num = sheet.getLastRowNum(); int num = sheet.getLastRowNum();
//删除的空行(包含空白行和带有格式的空行) //删除的空行(包含空白行和带有格式的空行)
int bk = 0; int bk = 0;
//记录空白行的集合 //记录空白行的集合
List<Integer> nums = Lists.newArrayList(); List<Integer> nums = Lists.newArrayList();
for (int i = 1; i <= num; i++) { for (int i = 1; i <= num; i++) {
Row row = sheet.getRow(i); Row row = sheet.getRow(i);
boolean flag = false; boolean flag = false;
//带有格式的空白行 //带有格式的空白行
if (row != null) { if (row != null) {
for (Cell cell : row) { for (Cell cell : row) {
//判断该单元格是否为空 //判断该单元格是否为空
if (StringUtils.isEmpty(cell.toString())) { if (StringUtils.isEmpty(cell.toString())) {
flag = true; flag = true;
break; break;
}
} }
} if (flag) {
if (flag) { nums.add(i);
bk++;
}
//空白行
} else {
nums.add(i); nums.add(i);
bk++; bk++;
} }
//空白行
} else {
nums.add(i);
bk++;
} }
} //删除无效数据行(空白行,带格式的空白行)
//删除无效数据行(空白行,带格式的空白行) for (Integer n : nums) {
for (Integer n : nums) { if (sheet.getRow(n) != null) {
if (sheet.getRow(n) != null) { sheet.removeRow(sheet.getRow(n));
sheet.removeRow(sheet.getRow(n)); }
} }
} }
}
/** /**
* 把导入的数据翻译成对应的id,校验,不存 * 把导入的数据翻译成对应的id,校验,不存
* 若除责任领域外的导入数据不能为空 * 若除责任领域外的导入数据不能为空
@@ -1041,16 +1040,16 @@ public void deleteBlankRow(Sheet sheet){
List<ProjectRelatedPersonnel> baseCertificationEngineerList = queryCertificationEngineer(projectId); List<ProjectRelatedPersonnel> baseCertificationEngineerList = queryCertificationEngineer(projectId);
List<String> baseCertificationEngineerNameList = baseCertificationEngineerList.stream().map(e -> e.getCertificationEngineerName()).collect(Collectors.toList()); List<String> baseCertificationEngineerNameList = baseCertificationEngineerList.stream().map(e -> e.getCertificationEngineerName()).collect(Collectors.toList());
for(String certificationEngineerName : certificationEngineerNameList){ for(String certificationEngineerName : certificationEngineerNameList){
if(!baseCertificationEngineerNameList.contains(certificationEngineerName)){ if(!baseCertificationEngineerNameList.contains(certificationEngineerName)){
//中英切换提示语 //中英切换提示语
if(CutEnum.CN.getValue().equals(cut)) { if(CutEnum.CN.getValue().equals(cut)) {
message.append("导入的认证工程师姓名不属于该项目,请检查第" + row + "行"); message.append("导入的认证工程师姓名不属于该项目,请检查第" + row + "行");
}else { }else {
message.append("The imported certified engineer name does not belong to this project..Please check line " + row ); message.append("The imported certified engineer name does not belong to this project..Please check line " + row );
}
break;
} }
break;
} }
}