From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java | 66 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java
index 26ae0b7..04808f9 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java
@@ -10,6 +10,7 @@
import com.doumee.dao.business.InsuranceMapper;
import com.doumee.dao.business.WorktypeMapper;
import com.doumee.dao.business.model.Insurance;
+import com.doumee.dao.business.model.Solutions;
import com.doumee.dao.business.model.Worktype;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.InsuranceService;
@@ -25,10 +26,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 淇濋櫓鍏徃淇℃伅琛⊿ervice瀹炵幇
@@ -49,6 +48,13 @@
LoginUserInfo user= (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
initCreateParam(insurance);//宸ョ鏁版嵁鏈夋晥鎬ф楠岋紝鍘婚櫎绌虹櫧琛屾暟鎹�
+
+ if(insuranceMapper.selectCount(new QueryWrapper<Insurance>().lambda().eq(Insurance::getName,insurance.getName())
+ .eq(Insurance::getIsdeleted,Constants.ZERO)
+ .eq(Insurance::getDataType,Constants.ZERO)
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"淇濋櫓鍏徃鍚嶇О宸插瓨鍦�");
+ }
insurance.setIsdeleted(Constants.ZERO);
insurance.setCreator(user.getId());
@@ -71,7 +77,23 @@
return insurance.getId();
}
private void dealWorkTypeData(Insurance insurance, Insurance newModel, List<Worktype> worktypeList,boolean isNew) {
+ int num=0;
+ List<String> workTypeName = worktypeList.stream().map(m->m.getName()).collect(Collectors.toList());
+ Set<String> set = new HashSet<>(workTypeName);
+ if(workTypeName.size() != set.size()){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝宸ョ褰曞叆鏁版嵁瀛樺湪鐩稿悓鏁版嵁锛�");
+ }
for(Worktype w : worktypeList) {
+ if(!isNew){
+ //鏌ヨ淇濋櫓鍏徃涓嬫槸鍚﹀凡瀛樺湪璇ュ伐绉�
+ if(worktypeMapper.selectCount(new QueryWrapper<Worktype>().lambda().eq(Worktype::getInsuranceId,insurance.getId())
+ .eq(Worktype::getIsdeleted,Constants.ZERO)
+ .eq(Worktype::getDataType,Constants.ZERO)
+ .eq(Worktype::getName,w.getName())
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"褰撳墠淇濋櫓鍏徃涓嬪瓨鍦ㄣ��"+w.getName()+"銆戣宸ョ淇℃伅");
+ }
+ }
//鍩虹鐗堟湰
w.setInsuranceId(insurance.getId());
w.setIsdeleted(Constants.ZERO);
@@ -80,15 +102,18 @@
w.setDataType(insurance.getDataType());
w.setStatus(Constants.ZERO);
w.setVersion(insurance.getVersion());
+ w.setSortnum(num++);
worktypeMapper.insert(w);
+
//鍘嗗彶鐗堟湰鐨勫伐绉嶄俊鎭�
Worktype newType = new Worktype();
BeanUtils.copyProperties(w, newType);
newType.setInsuranceId(newModel.getId());
newType.setBaseId(w.getId());
- newType.setDataType(Constants.ONE);
+ newType.setDataType(Constants.TWO);
newType.setVersion(newModel.getVersion());
+ w.setSortnum(num++);
worktypeMapper.insert(newType);
}
}
@@ -159,7 +184,6 @@
@Override
public void updateById(Insurance insurance) {
- LoginUserInfo user= (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
Insurance model = findById(insurance.getId());
if(model == null || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)
|| !Constants.equalsInteger(model.getDataType(),Constants.ZERO)){
@@ -167,7 +191,15 @@
}
//鏁版嵁鏈夋晥鎬ф牎楠�
initCreateParam(insurance);
+ if(insuranceMapper.selectCount(new QueryWrapper<Insurance>().lambda().eq(Insurance::getName,insurance.getName())
+ .eq(Insurance::getIsdeleted,Constants.ZERO)
+ .eq(Insurance::getDataType,Constants.ZERO)
+ .ne(Insurance::getId,insurance.getId())
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"淇濋櫓鍏徃鍚嶇О宸插瓨鍦�");
+ }
+ LoginUserInfo user= (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
Insurance updateModel = new Insurance();
updateModel.setEditor(user.getId());
updateModel.setName(insurance.getName());
@@ -184,6 +216,7 @@
newModel.setId(null);
newModel.setVersion(updateModel.getVersion());
newModel.setCreateDate(new Date());
+ newModel.setName(updateModel.getName());
newModel.setBaseId(insurance.getId());
newModel.setDataType(Constants.TWO);
insuranceMapper.insert(newModel);
@@ -197,8 +230,16 @@
.lambda()
.eq(Insurance::getBaseId,insurance.getId())
.eq(Insurance::getDataType,Constants.TWO)
+ .ne(Insurance::getId,newModel.getId())
.set(Insurance::getDataType,Constants.ONE)
);
+ worktypeMapper.update(null,new UpdateWrapper<Worktype>()
+ .lambda()
+ .eq(Worktype::getBaseId,insurance.getId())
+ .eq(Worktype::getDataType,Constants.TWO)
+ .set(Worktype::getDataType,Constants.ONE)
+ );
+
//澶勭悊宸ヤ綔淇℃伅锛屾柊澧炴渶鏂扮殑锛屽悓鏃朵骇鐢熷巻鍙茬増鏈�
dealWorkTypeData(updateModel,newModel,insurance.getWorktypeList(),false);
}
@@ -241,7 +282,16 @@
@Override
public Insurance findById(Integer id) {
- return insuranceMapper.selectById(id);
+ Insurance model = insuranceMapper.selectById(id);
+ if(model == null || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY );
+ }
+ List<Worktype> worktypeList = worktypeMapper.selectList(new QueryWrapper<Worktype>().lambda()
+ .eq(Worktype::getInsuranceId,id)
+ .eq(Worktype::getIsdeleted,Constants.ZERO)
+ .orderByAsc(Worktype::getSortnum));
+ model.setWorktypeList(worktypeList);
+ return model;
}
@Override
@@ -285,7 +335,7 @@
queryWrapper.lambda().eq(Insurance::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Insurance::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(Insurance::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getRemark() != null) {
queryWrapper.lambda().eq(Insurance::getRemark, pageWrap.getModel().getRemark());
--
Gitblit v1.9.3