From 05cf6324ea8322164d99a3d3d4161fe374534b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 2bc2611..591c11e 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
@@ -89,7 +89,7 @@
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);
@@ -186,6 +186,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);
@@ -199,8 +200,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);
}
--
Gitblit v1.9.3