From 5de7e6e552bfceb3d5c4dc28482833150e37b49e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 17 一月 2024 15:09:48 +0800
Subject: [PATCH] 调整
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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..2bc2611 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
@@ -71,6 +71,7 @@
return insurance.getId();
}
private void dealWorkTypeData(Insurance insurance, Insurance newModel, List<Worktype> worktypeList,boolean isNew) {
+ int num=0;
for(Worktype w : worktypeList) {
//鍩虹鐗堟湰
w.setInsuranceId(insurance.getId());
@@ -80,6 +81,7 @@
w.setDataType(insurance.getDataType());
w.setStatus(Constants.ZERO);
w.setVersion(insurance.getVersion());
+ w.setSortnum(num++);
worktypeMapper.insert(w);
//鍘嗗彶鐗堟湰鐨勫伐绉嶄俊鎭�
@@ -89,6 +91,7 @@
newType.setBaseId(w.getId());
newType.setDataType(Constants.ONE);
newType.setVersion(newModel.getVersion());
+ w.setSortnum(num++);
worktypeMapper.insert(newType);
}
}
@@ -159,7 +162,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 +169,7 @@
}
//鏁版嵁鏈夋晥鎬ф牎楠�
initCreateParam(insurance);
-
+ LoginUserInfo user= (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
Insurance updateModel = new Insurance();
updateModel.setEditor(user.getId());
updateModel.setName(insurance.getName());
@@ -241,7 +243,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 +296,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