From 69c2b50ded530c6bc003c6ddbeaca786d7823270 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 六月 2024 16:20:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/SolutionsService.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 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 5f706b5..6c3c81a 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,6 +3,9 @@
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;
/**
@@ -87,7 +90,12 @@
* @return PageData<Solutions>
*/
PageData<Solutions> findPage(PageWrap<Solutions> pageWrap);
+ PageData<Solutions> findPageCom(PageWrap<Solutions> pageWrap);
+
+ List<Solutions> findListForCompany(Integer dataType);
+
+ Solutions getNewVersion(Integer solutionId);
/**
* 鏉′欢缁熻
*
@@ -95,4 +103,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