From 618e55dc877b66bb97b93f6e3f48e330a2550240 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 21 二月 2025 11:45:57 +0800
Subject: [PATCH] 事务失效
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
index 6eea496..4213e49 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -40,15 +40,13 @@
import com.ycl.framework.utils.PageUtil;
import com.ycl.listener.excel.ProjectImportListener;
import com.ycl.mapper.*;
-import com.ycl.service.FileService;
-import com.ycl.service.ProjectInfoService;
-import com.ycl.service.ProjectInfoWinUnitService;
-import com.ycl.service.ProjectInfoYearPlanService;
+import com.ycl.service.*;
import com.ycl.system.mapper.SysDeptMapper;
import com.ycl.system.service.ISysDeptService;
import com.ycl.system.service.ISysDictDataService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.codec.Charsets;
+import org.springframework.aop.framework.AopContext;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
@@ -98,6 +96,7 @@
private final SysDeptMapper sysDeptMapper;
private final ISysDictDataService dictDataService;
+
/**
* 娣诲姞
*
@@ -105,7 +104,6 @@
* @return
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public Result add(ProjectInfoForm form) {
//娣诲姞鍩烘湰淇℃伅
ProjectInfo entity = ProjectInfoForm.getEntityByForm(form, null);
@@ -136,7 +134,6 @@
}
-
public void addPlan(Long projectInfoId) {
Plan plan = new Plan();
plan.setProjectInfoId(projectInfoId);
@@ -155,7 +152,6 @@
* @return
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public Result update(ProjectInfoForm form) {
ProjectInfo entity = baseMapper.selectById(form.getId());
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
@@ -164,7 +160,7 @@
Long userId = SecurityUtils.getUserId();
entity.setUpdateBy(userId);
//濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
- if(ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())){
+ if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
//鏇存柊椤圭洰淇℃伅
@@ -186,22 +182,22 @@
//淇敼椤圭洰涓爣鍗曚綅
//鍒犻櫎鍘熸暟鎹�
QueryWrapper<ProjectInfoWinUnit> unitWrapper = new QueryWrapper<>();
- unitWrapper.eq("project_info_id",form.getId());
+ unitWrapper.eq("project_info_id", form.getId());
projectInfoWinUnitService.remove(unitWrapper);
//娣诲姞椤圭洰涓爣鍗曚綅
- saveUnit(entity.getId(),form.getWinUnitList());
+ saveUnit(entity.getId(), form.getWinUnitList());
//淇敼骞村害鎶曡祫璁″垝
//鍒犻櫎鍘熸暟鎹�
QueryWrapper<ProjectInfoYearPlan> yearPlanWrapper = new QueryWrapper<>();
- unitWrapper.eq("project_info_id",form.getId());
+ unitWrapper.eq("project_info_id", form.getId());
projectInfoYearPlanService.remove(yearPlanWrapper);
//娣诲姞骞村害鎶曡祫璁″垝
- saveYearPlan(entity.getId(),form.getYearPlanList());
+ saveYearPlan(entity.getId(), form.getYearPlanList());
return Result.ok("淇敼鎴愬姛");
}
- private void saveUnit(Long id,List<ProjectInfoWinUnitForm> projectInfoWinUnitForm) {
+ private void saveUnit(Long id, List<ProjectInfoWinUnitForm> projectInfoWinUnitForm) {
List<ProjectInfoWinUnit> projectInfoWinUnits = new ArrayList<>();
for (ProjectInfoWinUnitForm winUnitForm : projectInfoWinUnitForm) {
ProjectInfoWinUnit projectInfoWinUnit = ProjectInfoWinUnitForm.getEntityByForm(winUnitForm, null);
@@ -213,6 +209,7 @@
projectInfoWinUnitService.saveBatch(projectInfoWinUnits);
}
}
+
private void saveYearPlan(Long id, List<ProjectInfoYearPlanForm> yearPlanList) {
List<ProjectInfoYearPlan> projectInfoYearPlans = new ArrayList<>();
for (ProjectInfoYearPlanForm yearPlanForm : yearPlanList) {
@@ -225,6 +222,7 @@
projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
}
}
+
/**
* 鎵归噺鍒犻櫎
*
@@ -250,8 +248,8 @@
investmentInfoMapper.delete(new QueryWrapper<ProjectInvestmentInfo>().eq("project_id", id));
policyMapper.delete(new QueryWrapper<ProjectInvestmentPolicyCompliance>().eq("project_id", id));
unitRegistrationInfoMapper.delete(new QueryWrapper<ProjectUnitRegistrationInfo>().eq("project_id", id));
- projectInfoWinUnitService.remove(new QueryWrapper<ProjectInfoWinUnit>().eq("project_info_id",id));
- projectInfoYearPlanService.remove(new QueryWrapper<ProjectInfoYearPlan>().eq("project_info_id",id));
+ projectInfoWinUnitService.remove(new QueryWrapper<ProjectInfoWinUnit>().eq("project_info_id", id));
+ projectInfoYearPlanService.remove(new QueryWrapper<ProjectInfoYearPlan>().eq("project_info_id", id));
List<String> types = new ArrayList<>();
types.add(FileTypeEnum.PROJECT_INFO.getType());
@@ -299,12 +297,12 @@
String ancestors = sysDeptMapper.selectAncestors(userId);
String[] ancestorArr = ancestors.split(",");
List<String> ancestorList = Arrays.stream(ancestorArr).collect(Collectors.toList());
- ancestorList.add(SecurityUtils.getDeptId()+"");
- if(!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("101")){
+ ancestorList.add(SecurityUtils.getDeptId() + "");
+ if (!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("101")) {
query.setProjectOwnerUnit(SecurityUtils.getDeptId());
//涓氫富
query.setRole(0);
- }else if(!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("102")){
+ } else if (!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("102")) {
query.setCompetentDepartment(SecurityUtils.getDeptId());
//瀹℃壒 瀵瑰簲涓荤閮ㄩ棬
query.setRole(1);
@@ -372,7 +370,7 @@
List<ProjectInfoWinUnitVO> unitVOS = new ArrayList<>();
List<ProjectInfoWinUnit> unitList = projectInfoWinUnitService.list(new QueryWrapper<ProjectInfoWinUnit>().eq("project_info_id", id));
for (ProjectInfoWinUnit projectInfoWinUnit : unitList) {
- ProjectInfoWinUnitVO unitVO = ProjectInfoWinUnitVO.getVoByEntity(projectInfoWinUnit,null);
+ ProjectInfoWinUnitVO unitVO = ProjectInfoWinUnitVO.getVoByEntity(projectInfoWinUnit, null);
unitVO.setId(null);
unitVOS.add(unitVO);
}
@@ -381,7 +379,7 @@
List<ProjectInfoYearPlanVO> yearPlanVOS = new ArrayList<>();
List<ProjectInfoYearPlan> yearPlaList = projectInfoYearPlanService.list(new QueryWrapper<ProjectInfoYearPlan>().eq("project_info_id", id));
for (ProjectInfoYearPlan yearPlan : yearPlaList) {
- ProjectInfoYearPlanVO yearPlanVO = ProjectInfoYearPlanVO.getVoByEntity(yearPlan,null);
+ ProjectInfoYearPlanVO yearPlanVO = ProjectInfoYearPlanVO.getVoByEntity(yearPlan, null);
yearPlanVO.setId(null);
yearPlanVOS.add(yearPlanVO);
}
@@ -778,10 +776,10 @@
if (ObjectUtil.isNotNull(form.getProjectInfoForm())) {
if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) {
//鏂板
- add(form.getProjectInfoForm());
+ ((ProjectInfoServiceImpl) AopContext.currentProxy()).add(form.getProjectInfoForm());
} else {
//鏇存柊
- update(form.getProjectInfoForm());
+ ((ProjectInfoServiceImpl) AopContext.currentProxy()).update(form.getProjectInfoForm());
}
}
if (ObjectUtil.isNotNull(form.getProjectInvestmentInfoForm())) {
--
Gitblit v1.8.0