From a5ef1518e11684ec903cbe0b6952403ef9297d0e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 20 五月 2025 11:21:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/service/business/SolutionsService.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/SolutionsService.java b/server/service/src/main/java/com/doumee/service/business/SolutionsService.java
index 294b4a0..3d21352 100644
--- a/server/service/src/main/java/com/doumee/service/business/SolutionsService.java
+++ b/server/service/src/main/java/com/doumee/service/business/SolutionsService.java
@@ -3,12 +3,15 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Solutions;
+
+import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
- * 淇濋櫓鏂规淇℃伅琛紙鍘嗗彶鐗堟湰锛塖ervice瀹氫箟
+ * 淇濋櫓鏂规淇℃伅琛⊿ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2024/01/15 11:15
+ * @date 2024/01/16 10:03
*/
public interface SolutionsService {
@@ -47,6 +50,7 @@
* @param solutions 瀹炰綋瀵硅薄
*/
void updateById(Solutions solutions);
+ void updateStatus(Solutions solutions);
/**
* 鎵归噺涓婚敭鏇存柊
@@ -86,7 +90,20 @@
* @return PageData<Solutions>
*/
PageData<Solutions> findPage(PageWrap<Solutions> pageWrap);
+ PageData<Solutions> findPageCom(PageWrap<Solutions> pageWrap);
+
+ List<Solutions> findListForCompany(Integer dataType);
+
+ /**
+ * 鏌ヨ浼佷笟宸茬缃茬殑鏂规淇℃伅
+ * @param dataType
+ * @param companyId
+ * @return
+ */
+ List<Solutions> findListByCompanyId(Integer dataType,Integer companyId);
+
+ Solutions getNewVersion(Integer solutionId);
/**
* 鏉′欢缁熻
*
@@ -94,4 +111,12 @@
* @return long
*/
long count(Solutions solutions);
+
+
+ BigDecimal testSolutionAddMoney(Integer id, BigDecimal fee, Date start,Date end,Date newDate,Date newEndDate);
+
+ BigDecimal testSolutionReduceMoney(Integer id, BigDecimal fee, Date start,Date end,Date reduceStartTime,Date reduceEndTime);
+
+ BigDecimal testSolutionProduceMoney(Integer id, BigDecimal fee, Date start,Date end,Date produceStart);
+
}
--
Gitblit v1.9.3