From 870dfdba90fc4062b66de669ad9ff3f4707bf496 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 09 六月 2025 10:32:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
index 2acfe51..fc9f3f2 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
@@ -98,6 +98,7 @@
solutions.setDataType(Constants.ZERO);
solutions.setStatus(Constants.ZERO);
solutions.setCorrectWarnTime(solutionsBase.getCorrectWarnTime());
+ solutions.setDelOnlyReplace(solutionsBase.getDelOnlyReplace());
//2024骞�6鏈�17鏃�15:56:18 浠呮敮鎸佹浛鎹㈡ā寮忎笅锛屾壒澧炴棩鏈� 绛変簬 鎵瑰噺鏃ユ湡
if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)){
solutions.setAddValidDays(solutions.getDelValidDays());
@@ -141,6 +142,7 @@
private void dealWorkType(Solutions solutions, Solutions newModel, List<SolutionWorktype> worktypes) {
int num =0;
+ List<SolutionWorktype> typeList = new ArrayList<>();
for(SolutionWorktype type : worktypes) {
//鍩虹鐗堟湰
SolutionWorktype w = new SolutionWorktype();
@@ -157,8 +159,12 @@
//鍘嗗彶鐗堟湰鐨勫伐绉嶄俊鎭�
SolutionWorktype newType = new SolutionWorktype();
BeanUtils.copyProperties(w, newType);
+ newType.setId(null);
newType.setSolutionId(newModel.getId());
- solutionWorktypeJoinMapper.insert(newType);
+ typeList.add(newType);
+ }
+ if(typeList.size()>0){
+ solutionWorktypeJoinMapper.insert(typeList);
}
}
--
Gitblit v1.9.3