From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
index 1911add..0632e64 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
@@ -16,12 +16,12 @@
*/
package org.springblade.modules.task.mapper;
-import liquibase.pro.packaged.P;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
-import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.grid.entity.GridmanEntity;
+import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
+import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.vo.TaskReportStatistics;
import java.util.List;
@@ -41,13 +41,34 @@
* @param taskReportForRepairs
* @return
*/
- List<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage page,@Param("vo") TaskReportForRepairsVO taskReportForRepairs);
+ List<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage page,
+ @Param("vo") TaskReportForRepairsVO taskReportForRepairs,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator,
+ @Param("aoiCodeList") List<String> aoiCodeList,
+ @Param("gridCodeList") List<String> gridCodeList);
/**
* 查询报事报修统计
+ *
* @param userId
* @return
*/
- TaskReportStatistics getStatisticsCount(@Param("userId") Long userId);
+ TaskReportStatistics getStatisticsCount(@Param("userId") Long userId,
+ @Param("houseCode") String houseCode,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator);
+
+ Integer getStatistics(Long userId, String neiCode, String roleName);
+
+ /**
+ * 更新状态--临时接口
+ *
+ * @param gridman
+ * @return
+ */
+ int updateView(GridmanEntity gridman);
+
+ Integer getReportForStatistics(String code, Long userId, Integer status, Integer type, String roleType);
}
--
Gitblit v1.9.3