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 | 78 +++++++++++++++++++++++++--------------
1 files changed, 50 insertions(+), 28 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 2dba310..4213e49 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -15,6 +15,7 @@
import com.ycl.common.config.SysConfig;
import com.ycl.common.constant.Constants;
import com.ycl.common.core.domain.BaseEntity;
+import com.ycl.common.core.domain.entity.SysDictData;
import com.ycl.common.enums.business.FileTypeEnum;
import com.ycl.common.enums.business.ImportanceTypeEnum;
import com.ycl.common.enums.business.ProjectCategoryEnum;
@@ -39,13 +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;
@@ -93,6 +94,8 @@
private final ProjectInvestmentPolicyComplianceServiceImpl projectInvestmentPolicyComplianceServiceImpl;
private final ProjectUnitRegistrationInfoServiceImpl projectUnitRegistrationInfoServiceImpl;
private final SysDeptMapper sysDeptMapper;
+ private final ISysDictDataService dictDataService;
+
/**
* 娣诲姞
@@ -101,16 +104,15 @@
* @return
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public Result add(ProjectInfoForm form) {
//娣诲姞鍩烘湰淇℃伅
ProjectInfo entity = ProjectInfoForm.getEntityByForm(form, null);
Long userId = SecurityUtils.getUserId();
- Long deptId = SecurityUtils.getDeptId();
- entity.setProjectOwnerUnit(deptId);
+// Long deptId = SecurityUtils.getDeptId();
+// entity.setProjectOwnerUnit(deptId);
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
- //濡傛灉涓嶆槸鍌ㄥ椤圭洰(涓嶆槸鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
+ //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
if(ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())){
entity.setUsedStatus(ProjectConstant.PASS);
}
@@ -127,10 +129,9 @@
//娣诲姞椤圭洰涓爣鍗曚綅
saveUnit(entity.getId(),form.getWinUnitList());
//娣诲姞骞村害鎶曡祫璁″垝
-// saveYearPlan(entity.getId(),form.getYearPlanList());
+ saveYearPlan(entity.getId(),form.getYearPlanList());
return Result.ok("娣诲姞鎴愬姛").data(entity.getId());
}
-
public void addPlan(Long projectInfoId) {
@@ -151,7 +152,6 @@
* @return
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public Result update(ProjectInfoForm form) {
ProjectInfo entity = baseMapper.selectById(form.getId());
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
@@ -159,6 +159,10 @@
ProjectInfoForm.getEntityByForm(form, entity);
Long userId = SecurityUtils.getUserId();
entity.setUpdateBy(userId);
+ //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
+ if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
+ entity.setUsedStatus(ProjectConstant.PASS);
+ }
//鏇存柊椤圭洰淇℃伅
baseMapper.updateById(entity);
List<File> fileList = form.getFileList();
@@ -177,25 +181,23 @@
//淇敼椤圭洰涓爣鍗曚綅
//鍒犻櫎鍘熸暟鎹�
- List<ProjectInfoWinUnitForm> projectInfoWinUnitForm = form.getWinUnitList();
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(),projectInfoWinUnitForm);
+ saveUnit(entity.getId(), form.getWinUnitList());
//淇敼骞村害鎶曡祫璁″垝
//鍒犻櫎鍘熸暟鎹�
-// List<ProjectInfoYearPlanForm> projectInfoYearPlanForm = form.getYearPlanList();
QueryWrapper<ProjectInfoYearPlan> yearPlanWrapper = new QueryWrapper<>();
- unitWrapper.eq("project_info_id",form.getId());
- projectInfoWinUnitService.remove(unitWrapper);
+ unitWrapper.eq("project_info_id", form.getId());
+ projectInfoYearPlanService.remove(yearPlanWrapper);
//娣诲姞骞村害鎶曡祫璁″垝
- saveUnit(entity.getId(),projectInfoWinUnitForm);
+ 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);
@@ -207,10 +209,12 @@
projectInfoWinUnitService.saveBatch(projectInfoWinUnits);
}
}
+
private void saveYearPlan(Long id, List<ProjectInfoYearPlanForm> yearPlanList) {
List<ProjectInfoYearPlan> projectInfoYearPlans = new ArrayList<>();
for (ProjectInfoYearPlanForm yearPlanForm : yearPlanList) {
ProjectInfoYearPlan yearPlan = ProjectInfoYearPlanForm.getEntityByForm(yearPlanForm, null);
+ yearPlan.setId(null);
yearPlan.setProjectInfoId(id);
projectInfoYearPlans.add(yearPlan);
}
@@ -218,6 +222,7 @@
projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
}
}
+
/**
* 鎵归噺鍒犻櫎
*
@@ -243,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());
@@ -292,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);
@@ -313,9 +318,16 @@
copyToProjectVO(vo, projectVO);
List<Long> departmentList = vo.getCompetentDepartmentList();
projectVO.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (!CollectionUtils.isEmpty(departmentList) && departmentList.contains(SecurityUtils.getDeptId())));
- //缈昏瘧椤圭洰闃舵
+ // 缈昏瘧椤圭洰闃舵
String phase = ProjectCategoryEnum.getPhaseByProjectStatus(projectVO.getProjectStatus(), projectVO.getProcessId() != null);
projectVO.setProjectPhase(phase);
+ if (StringUtils.isNotEmpty(projectVO.getProjectSubType())) {
+ // 缈昏瘧椤圭洰瀛愮被鍨�
+ SysDictData dictData = dictDataService.selectDictDataByValue(projectVO.getProjectType(), projectVO.getProjectSubType(), "sys_project_type");
+ if (Objects.nonNull(dictData)) {
+ projectVO.setProjectSubType(dictData.getDictLabel());
+ }
+ }
list.add(projectVO);
});
return Result.ok().data(list).total(page.getTotal());
@@ -358,11 +370,20 @@
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);
}
vo.setWinUnitList(unitVOS);
+ //骞村害鎶曡祫璁″垝
+ 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);
+ yearPlanVO.setId(null);
+ yearPlanVOS.add(yearPlanVO);
+ }
+ vo.setYearPlanList(yearPlanVOS);
return Result.ok().data(vo);
}
@@ -750,14 +771,15 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result editProject(ProjectForm form) {
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