From 6e41324f84f0cf70871ca05292c5420bdcaaa98c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 14:36:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 18 +-----------------
1 files changed, 1 insertions(+), 17 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 ce9af65..2992c58 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
@@ -190,6 +190,7 @@
.eq(Solutions::getBaseId,solutions.getId())
.eq(Solutions::getDataType,Constants.TWO)
.set(Solutions::getDataType,Constants.ONE)
+ .set(StringUtils.isNotBlank(solutions.getSignKeyword()),Solutions::getSignKeyword,solutions.getSignKeyword())
);
//澶勭悊宸ヤ綔淇℃伅锛屾柊澧炴渶鏂扮殑锛屽悓鏃朵骇鐢熷巻鍙茬増鏈�
dealWorkType(solutions,newModel,solutions.getWorktypeIdList(),false);
@@ -422,23 +423,6 @@
.eq(CompanySolution::getCompanyId,user.getCompanyId())
.orderByAsc(Solutions::getSortnum)
);
-
-// solutionsList.forEach(i->{
-// //淇濋櫓鏃堕棿鍗曚綅 涓� 鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣� 瑙勫垯鐩稿悓 鎴栬�� 鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣� 瑙勫垯涓� 澶╂椂 榛樿閲戦
-// if(i.getTimeUnit().equals(i.getInsureCycleUnit())||i.getInsureCycleUnit().equals(Constants.ZERO)){
-// i.setCyclePrice(i.getPrice());
-// }else{
-// if(i.getInsureCycleUnit().equals(Constants.ONE)){
-// //鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣嶄负鍗婃湀
-// i.setCyclePrice(i.getPrice().multiply(new BigDecimal(15)));
-// }else if(i.getInsureCycleUnit().equals(Constants.TWO)){
-// //鏈�灏忔姇淇濆懆鏈熸椂闂村崟浣嶄负鏈� 鍒欒绠楀綋鏈堝灏戝ぉ
-// if( ){
-//
-// }
-// }
-// }
-// });
return solutionsList;
}
--
Gitblit v1.9.3