From f8d1143ef6cfbbaaebe3b25efa24ee19c9ea61c8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 16:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/task/service/ITaskService.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/service/ITaskService.java b/src/main/java/org/springblade/modules/task/service/ITaskService.java
index 5f1350f..9098b40 100644
--- a/src/main/java/org/springblade/modules/task/service/ITaskService.java
+++ b/src/main/java/org/springblade/modules/task/service/ITaskService.java
@@ -48,7 +48,7 @@
 	 * @param createUser
 	 * @return
 	 */
-	Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser,String houseCode);
+	Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser,String houseCode,Integer reportType);
 
 	/**
 	 * @param type
@@ -59,9 +59,15 @@
 	 * @param id
 	 * @return
 	 */
-	public Long updateTask(Integer type, String name, Integer frequency, String remark, Long updateUser, Long id, Integer status);
+	Long updateTask(Integer type, String name, Integer frequency, String remark, Long updateUser, Long id, Integer status);
 
-    Object countNumber(String houseCode, Integer status);
+	Object countNumber(String houseCode, Integer status);
 
-	Object countTypeNumber();
+	Object countTypeNumber(Integer roleType, String neiCode);
+
+	Object countFrequencyNumber();
+
+	Boolean removeTask(TaskEntity task);
+
+	IPage<TaskVO> getBailReportingPage(IPage<TaskVO> page, TaskVO task);
 }

--
Gitblit v1.9.3