From ee8b99a512bac9de3c88ad19b2c674c3d8c7655f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 25 六月 2025 10:29:44 +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 | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 fc9f3f2..e8604ac 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
@@ -79,9 +79,10 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌涓绘柟妗堟暟鎹�!");
}
solutions.setInsuranceId(solutionsBase.getInsuranceId());
- solutions.setCanAdd(solutionsBase.getCanAdd());
- solutions.setCanReduce(solutionsBase.getCanReduce());
- solutions.setCanChangeUnit(solutionsBase.getCanChangeUnit());
+// solutions.setCanAdd(solutionsBase.getCanAdd());
+// solutions.setCanReduce(solutionsBase.getCanReduce());
+// solutions.setCanChangeUnit(solutionsBase.getCanChangeUnit());
+// solutions.setDelOnlyReplace(solutionsBase.getDelOnlyReplace());
solutions.setAddValidDays(solutionsBase.getAddValidDays());
solutions.setDelValidDays(solutionsBase.getDelValidDays());
solutions.setMinAge(solutionsBase.getMinAge());
@@ -98,7 +99,6 @@
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());
@@ -211,6 +211,10 @@
||Objects.isNull(solutions.getType())
||Objects.isNull(solutions.getRetrial())
||Objects.isNull(solutions.getFanganFile())
+ || Objects.isNull(solutions.getCanAdd())
+ || Objects.isNull(solutions.getCanReduce())
+ || Objects.isNull(solutions.getCanChangeUnit())
+ || Objects.isNull(solutions.getDelOnlyReplace())
// ||Constants.formatIntegerNum(solutions.getPriceCycleUnit()) < 0
||Constants.formatIntegerNum(solutions.getInsureCycle()) < 0
||Constants.formatIntegerNum(solutions.getInsureCycleUnit()) < 0
@@ -342,6 +346,7 @@
.eq(Multifile::getIsdeleted,Constants.ZERO)
.eq(Multifile::getObjType,Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey()));
Multifile file = solutions.getFanganFile();
+ file.setId(null);
file.setIsdeleted(Constants.ZERO);
file.setCreateDate(solutions.getEditDate());
file.setCreator(solutions.getEditor());
@@ -349,6 +354,7 @@
file.setObjType(Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey());
file.setType(Constants.formatIntegerNum(file.getType()));
multifileMapper.insert(file);
+ file.setId(null);
file.setObjId(newModel.getId());
multifileMapper.insert(file);
--
Gitblit v1.9.3