From 426718fb2310abff70f54962f118f4300ead2408 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期日, 12 一月 2025 11:30:59 +0800 Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/yunyibao into 2.0.1 --- server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java index c190001..93f38be 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsBaseServiceImpl.java @@ -66,6 +66,7 @@ private InsuranceApplyMapper insuranceApplyMapper; @Override + @Transactional(rollbackFor = {BusinessException.class,Exception.class}) public Integer create(SolutionsBase solutionsBase) { LoginUserInfo user= (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); initCreateParam(solutionsBase); @@ -146,6 +147,7 @@ newType.setSolutionId(newModel.getId()); solutionWorktypeJoinMapper.insert(newType); } + } @@ -209,6 +211,7 @@ } @Override + @Transactional(rollbackFor = {BusinessException.class,Exception.class}) public void updateById(SolutionsBase solutionsBase) { LoginUserInfo user= (LoginUserInfo)SecurityUtils.getSubject().getPrincipal(); SolutionsBase model = findById(solutionsBase.getId()); @@ -248,6 +251,7 @@ solutionsBase.setAddValidDays(solutionsBase.getDelValidDays()); } solutionsBaseMapper.updateById(solutionsBase); + SolutionsBase oldVersion = solutionsBaseMapper.selectOne(new QueryWrapper<SolutionsBase>() .lambda() .eq(SolutionsBase::getBaseId,solutionsBase.getId()) @@ -276,7 +280,6 @@ .eq(SolutionWorktype::getType,Constants.ONE) ); //鍒犻櫎鐖舵柟妗堜笅鎵�鏈夊瓙鏂规鐨勫伐绉嶆暟鎹� - solutionWorktypeJoinMapper.delete(new UpdateWrapper<SolutionWorktype>() .lambda() .eq(SolutionWorktype::getType,Constants.ZERO) @@ -284,7 +287,6 @@ ); dealWorkTypeInsurance(solutionsBase,newModel,solutionsBase.getWorktypeIdList()); - solutionsBaseMapper.update(null,new UpdateWrapper<SolutionsBase>() .lambda() -- Gitblit v1.9.3