From 9d49dba3ba467a04b9ba9511b82b4d7fa8b402ed Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 13:30:41 +0800
Subject: [PATCH] 民警角色驾驶舱

---
 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java                      |    4 
 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml                       |   47 ++++++--
 src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java               |   22 ++--
 src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java            |    2 
 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java |   34 +++---
 src/main/java/org/springblade/modules/house/mapper/HouseMapper.java                          |   20 ++-
 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml                             |   27 +++-
 src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml                           |   70 +++++++++++---
 src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java           |   10 +-
 src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml             |   16 ++
 10 files changed, 169 insertions(+), 83 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
index 6b2a577..b7cb63b 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
@@ -16,15 +16,15 @@
  */
 package org.springblade.modules.house.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.house.entity.HouseEntity;
+import org.springblade.modules.house.excel.HouseExcel;
 import org.springblade.modules.house.vo.HouseParam;
 import org.springblade.modules.house.vo.HouseTree;
 import org.springblade.modules.house.vo.HouseVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.house.excel.HouseExcel;
 
 import java.util.List;
 import java.util.Map;
@@ -62,16 +62,20 @@
 
 	/**
 	 * 查询房屋树
+	 *
 	 * @param houseParam
 	 * @param list
 	 * @return
 	 */
 	@MapKey(value = "code")
-    Map<String, HouseTree> getHouseTree(@Param("houseParam") HouseParam houseParam,
+	Map<String, HouseTree> getHouseTree(@Param("houseParam") HouseParam houseParam,
 										@Param("list") List<String> list);
 
-    Integer getHouseStatisticsOne(String code, Long userId,String aoiCode,String buildingCode,String unitCode);
-    Integer getHouseStatisticsTwo(String code, Long userId,String aoiCode,String buildingCode,String unitCode);
-    Integer getHouseStatisticsThree(String code, Long userId,String aoiCode,String buildingCode,String unitCode);
-    Integer getHouseStatisticsFour(String code, Long userId,String aoiCode,String buildingCode,String unitCode);
+	Integer getHouseStatisticsOne(String code, Long userId, String aoiCode, String buildingCode, String unitCode, String roleType);
+
+	Integer getHouseStatisticsTwo(String code, Long userId, String aoiCode, String buildingCode, String unitCode, String roleType);
+
+	Integer getHouseStatisticsThree(String code, Long userId, String aoiCode, String buildingCode, String unitCode, String roleType);
+
+	Integer getHouseStatisticsFour(String code, Long userId, String aoiCode, String buildingCode, String unitCode, String roleType);
 }
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index 61c571c..a0eeef3 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -287,7 +287,7 @@
         <if test="aoiCode != null  and aoiCode != ''">
             and jda.aoi_code=#{aoiCode}
         </if>
-        <if test="userId != null">
+        <if test="userId != null and roleType == '1'">
         AND jda.address_code IN (
         SELECT DISTINCT
         jgr.house_code
@@ -299,6 +299,16 @@
         jgm.user_id = #{userId}
         AND jg.is_deleted = 0
         )
+        </if>
+        <if test="userId != null and roleType == '3'">
+            AND jda.address_code IN (SELECT
+            jda.address_code
+            FROM
+            jczz_doorplate_address jda
+            LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+            WHERE
+            jc.res_police_user_id = #{userId})
+            )
         </if>
         ) a
 
@@ -331,7 +341,7 @@
         <if test="aoiCode != null  and aoiCode != ''">
             and jda.aoi_code=#{aoiCode}
         </if>
-        <if test="userId != null">
+        <if test="userId != null and roleType == '1'">
             AND jda.address_code IN (
             SELECT DISTINCT
             jgr.house_code
@@ -342,6 +352,16 @@
             WHERE
             jgm.user_id = #{userId}
             AND jg.is_deleted = 0
+            )
+        </if>
+        <if test="userId != null and roleType == '3'">
+            AND jda.address_code IN (SELECT
+            jda.address_code
+            FROM
+            jczz_doorplate_address jda
+            LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+            WHERE
+            jc.res_police_user_id = #{userId})
             )
         </if>
         ) a
@@ -371,18 +391,28 @@
         <if test="aoiCode != null  and aoiCode != ''">
             and jda.aoi_code=#{aoiCode}
         </if>
-        <if test="userId != null">
-        AND jda.address_code IN (
-        SELECT
-        jgr.house_code
-        FROM
-        jczz_grid jg
-        LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
-        LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
-        WHERE
-        jgm.user_id = #{userId}
-        AND jg.is_deleted = 0
-        )
+        <if test="userId != null and roleType == '1'">
+            AND jda.address_code IN (
+            SELECT DISTINCT
+            jgr.house_code
+            FROM
+            jczz_grid jg
+            LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+            LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+            WHERE
+            jgm.user_id = #{userId}
+            AND jg.is_deleted = 0
+            )
+        </if>
+        <if test="userId != null and roleType == '3'">
+            AND jda.address_code IN (SELECT
+            jda.address_code
+            FROM
+            jczz_doorplate_address jda
+            LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+            WHERE
+            jc.res_police_user_id = #{userId})
+            )
         </if>
     </select>
 
@@ -412,7 +442,7 @@
         <if test="aoiCode != null  and aoiCode != ''">
             and jda.aoi_code=#{aoiCode}
         </if>
-        <if test="userId != null">
+        <if test="userId != null and roleType == '1'">
             AND jda.address_code IN (
             SELECT DISTINCT
             jgr.house_code
@@ -425,6 +455,16 @@
             AND jg.is_deleted = 0
             )
         </if>
+        <if test="userId != null and roleType == '3'">
+            AND jda.address_code IN (SELECT
+            jda.address_code
+            FROM
+            jczz_doorplate_address jda
+            LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+            WHERE
+            jc.res_police_user_id = #{userId})
+            )
+        </if>
         ) a
 
 
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
index ca68e29..2bdfeac 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
@@ -97,7 +97,7 @@
 	 */
 	HouseholdOtherVO getSecurity(@Param("household") HouseholdVO household);
 
-    List<Map<String, Object>> getHouseHoldStatistics(String code, Long userId);
+    List<Map<String, Object>> getHouseHoldStatistics(String code, Long userId,String roleType);
 
-	List<Map<String, Object>>  getHouseHoldStatisticsAge(String code, Long userId);
+	List<Map<String, Object>>  getHouseHoldStatisticsAge(String code, Long userId,String roleType);
 }
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index 397b65f..5300203 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -292,7 +292,7 @@
         WHERE
         jda.nei_code = #{code}
         AND jh.is_deleted = 0
-        <if test="userId != null">
+        <if test="userId != null and roleType == '1'">
             AND jda.address_code IN (
             SELECT
             jgr.house_code
@@ -304,6 +304,16 @@
             jgm.user_id = #{userId}
             AND jh.house_code = jgr.house_code
             AND jg.is_deleted = 0
+            )
+        </if>
+        <if test="userId != null and roleType == '3'">
+            AND jda.address_code IN (SELECT
+            jda.address_code
+            FROM
+            jczz_doorplate_address jda
+            LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+            WHERE
+            jc.res_police_user_id = #{userId})
             )
         </if>
         ) a
@@ -328,18 +338,29 @@
         WHERE
             jda.nei_code =  #{code}
           AND jh.is_deleted = 0
-        <if test="userId != null">
-        AND jda.address_code IN (
-        SELECT
-        distinct jgr.house_code
-        FROM
-        jczz_grid jg
-        LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
-        LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
-        WHERE
-        jgm.user_id = #{userId}
-        AND jg.is_deleted = 0
-        )
+        <if test="userId != null and roleType == '1'">
+            AND jda.address_code IN (
+            SELECT
+            distinct jgr.house_code
+            FROM
+            jczz_grid jg
+            LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+            LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+            WHERE
+            jgm.user_id = #{userId}
+            AND jg.is_deleted = 0
+            )
+        </if>
+
+        <if test="userId != null and roleType == '3'">
+            AND jda.address_code IN (SELECT
+            jda.address_code
+            FROM
+            jczz_doorplate_address jda
+            LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+            WHERE
+            jc.res_police_user_id = #{userId})
+            )
         </if>
         GROUP BY age
     </select>
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index 7528ca0..dcbf30b 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -45,7 +45,6 @@
 import org.springblade.modules.house.vo.HouseVO;
 import org.springblade.modules.label.entity.LabelEntity;
 import org.springblade.modules.label.service.ILabelService;
-import org.springblade.modules.place.vo.PlaceVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -354,21 +353,22 @@
 	@Override
 	public Map<String, Object> getHouseStatistics(String code, String roleType,String aoiCode,String buildingCode,String unitCode) {
 		Map<String, Object> objectObjectHashMap = new HashMap<>();
-		if (roleType.equals("1")) {
-		//	 result1 查询楼栋数  result2 查询房屋套数 result3 查询住户数  result4 查询单元数
-			Integer result1 = baseMapper.getHouseStatisticsOne(code, AuthUtil.getUserId(),aoiCode,buildingCode,unitCode);
-			Integer result2 = baseMapper.getHouseStatisticsTwo(code, AuthUtil.getUserId(),aoiCode,buildingCode,unitCode);
-			Integer result3 = baseMapper.getHouseStatisticsThree(code, AuthUtil.getUserId(),aoiCode,buildingCode,unitCode);
-			Integer result4 = baseMapper.getHouseStatisticsFour(code, AuthUtil.getUserId(),aoiCode,buildingCode,unitCode);
+		if (roleType.equals("2")) {
+			//	 result1 查询楼栋数  result2 查询房屋套数 result3 查询住户数  result4 查询单元数
+			Integer result1 = baseMapper.getHouseStatisticsOne(code, null, aoiCode, buildingCode, unitCode, roleType);
+			Integer result2 = baseMapper.getHouseStatisticsTwo(code, null, aoiCode, buildingCode, unitCode, roleType);
+			Integer result3 = baseMapper.getHouseStatisticsThree(code, null, aoiCode, buildingCode, unitCode, roleType);
+			Integer result4 = baseMapper.getHouseStatisticsFour(code, null, aoiCode, buildingCode, unitCode, roleType);
 			objectObjectHashMap.put("result1", result1);
 			objectObjectHashMap.put("result2", result2);
 			objectObjectHashMap.put("result3", result3);
 			objectObjectHashMap.put("result4", result4);
 		} else {
-			Integer result1 = baseMapper.getHouseStatisticsOne(code, null,aoiCode,buildingCode,unitCode);
-			Integer result2 = baseMapper.getHouseStatisticsTwo(code, null,aoiCode,buildingCode,unitCode);
-			Integer result3 = baseMapper.getHouseStatisticsThree(code, null,aoiCode,buildingCode,unitCode);
-			Integer result4 = baseMapper.getHouseStatisticsFour(code, null,aoiCode,buildingCode,unitCode);
+
+			Integer result1 = baseMapper.getHouseStatisticsOne(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
+			Integer result2 = baseMapper.getHouseStatisticsTwo(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
+			Integer result3 = baseMapper.getHouseStatisticsThree(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
+			Integer result4 = baseMapper.getHouseStatisticsFour(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
 			objectObjectHashMap.put("result1", result1);
 			objectObjectHashMap.put("result2", result2);
 			objectObjectHashMap.put("result3", result3);
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index b108f93..02e8bdb 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -212,15 +212,15 @@
 	@Override
 	public Object getHouseHoldStatistics(String code, String roleType) {
 		Map<String, Object> objectObjectHashMap = new HashMap<>();
-		if (roleType.equals("1")) {
-			List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, AuthUtil.getUserId());
-			List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, AuthUtil.getUserId());
+		if (roleType.equals("2")) {
+			List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, null, roleType);
+			List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, null, roleType);
 			objectObjectHashMap.put("gender", result);
 			objectObjectHashMap.put("age", result1);
 			return objectObjectHashMap;
 		} else {
-			List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, null);
-			List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, null);
+			List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, AuthUtil.getUserId(), roleType);
+			List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, AuthUtil.getUserId(), roleType);
 			objectObjectHashMap.put("gender", result);
 			objectObjectHashMap.put("age", result1);
 			return objectObjectHashMap;
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index b80bdf8..ceac40a 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -119,15 +119,26 @@
     <select id="selectTaskPageBy" resultType="org.springblade.modules.task.vo.TaskVO">
 
         SELECT
-            jt.* ,
-            jda.address_name
+        jt.* ,
+        jda.address_name
         FROM
-            jczz_task jt
-                LEFT JOIN jczz_doorplate_address jda ON jt.house_code = jda.address_code
-                LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
-        WHERE
-            jc.res_police_user_id = #{task.userId}
-          AND jt.report_type = '1'
+        jczz_task jt
+        LEFT JOIN jczz_doorplate_address jda ON jt.house_code = jda.address_code
+        LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+        <where>
+            <if test="task.reportType != null and task.reportType != '' and task.reportType == 1">
+                AND jt.report_type = #{task.reportType}
+            </if>
+
+            <if test="task.reportType == null or task.reportType == ''">
+                AND jt.report_type in (2,3,6)
+            </if>
+            <if test="task.userId != null and task.userId != ''">
+                AND jc.res_police_user_id = #{task.userId}
+            </if>
+        </where>
+
+
     </select>
 
 
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 49088d2..109a46e 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
@@ -63,5 +63,5 @@
 	 */
 	int updateView(GridmanEntity gridman);
 
-	Integer getReportForStatistics(String code, Long userId, Integer status,Integer type);
+	Integer getReportForStatistics(String code, Long userId, Integer status, Integer type, String roleType);
 }
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
index 13a1782..c000980 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -82,9 +82,9 @@
             and jtrfr.type = #{type}
         </if>
 
-        <if test="userId != null">
-            AND jda.address_code in (
-            SELECT
+        <if test="userId != null and roleType == '1'">
+            AND jda.address_code IN (
+            SELECT DISTINCT
             jgr.house_code
             FROM
             jczz_grid jg
@@ -95,6 +95,16 @@
             AND jg.is_deleted = 0
             )
         </if>
+        <if test="userId != null and roleType == '3'">
+            AND jda.address_code IN (SELECT
+            jda.address_code
+            FROM
+            jczz_doorplate_address jda
+            LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+            WHERE
+            jc.res_police_user_id = #{userId})
+            )
+        </if>
     </select>
 
 
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
index 4bf1d63..9f42a04 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -170,27 +170,27 @@
 	@Override
 	public Object getReportForStatistics(String code, String roleType) {
 		Map<String, Object> objectObjectHashMap = new HashMap<>();
-		if (roleType.equals("1")) {
-			Integer result1 = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,null);
-			Integer result = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), 1,null);
+		if (roleType.equals("2")) {
+			Integer result1 = baseMapper.getReportForStatistics(code, null, null, null, roleType);
+			Integer result = baseMapper.getReportForStatistics(code, null, 1, null, roleType);
+			objectObjectHashMap.put("result", result1);
+			objectObjectHashMap.put("result1", result);
+			objectObjectHashMap.put("result2", result1.equals(0) ? 0 : BigDecimal.valueOf(result).divide(BigDecimal.valueOf(result1), 2, BigDecimal.ROUND_HALF_UP));
+			objectObjectHashMap.put("result3", baseMapper.getReportForStatistics(code, null, null, 1, roleType));
+			objectObjectHashMap.put("result4", baseMapper.getReportForStatistics(code, null, null, 2, roleType));
+			objectObjectHashMap.put("result5", baseMapper.getReportForStatistics(code, null, null, 3, roleType));
+			objectObjectHashMap.put("result6", baseMapper.getReportForStatistics(code, null, null, 4, roleType));
+		} else {
+			Integer result1 = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, null, roleType);
+			Integer result = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), 1, null, roleType);
 			// result 总数  result1 已处理  result2 处理率  result3 公共维修  result4 居家维修  result5 矛盾纠纷  result6 投诉举报
 			objectObjectHashMap.put("result", result1);
 			objectObjectHashMap.put("result1", result);
 			objectObjectHashMap.put("result2", result1.equals(0) ? 0 : BigDecimal.valueOf(result).divide(BigDecimal.valueOf(result1), 2, BigDecimal.ROUND_HALF_UP));
-			objectObjectHashMap.put("result3",   baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,1));
-			objectObjectHashMap.put("result4",   baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,2));
-			objectObjectHashMap.put("result5",   baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,3));
-			objectObjectHashMap.put("result6",   baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null,4));
-		} else {
-			Integer result1 = baseMapper.getReportForStatistics(code, null, null,null);
-			Integer result = baseMapper.getReportForStatistics(code, null, 1,null);
-			objectObjectHashMap.put("result", result1);
-			objectObjectHashMap.put("result1", result);
-			objectObjectHashMap.put("result2", result1.equals(0) ? 0 : BigDecimal.valueOf(result).divide(BigDecimal.valueOf(result1), 2, BigDecimal.ROUND_HALF_UP));
-			objectObjectHashMap.put("result3",   baseMapper.getReportForStatistics(code,null,null,1));
-			objectObjectHashMap.put("result4",   baseMapper.getReportForStatistics(code, null, null,2));
-			objectObjectHashMap.put("result5",   baseMapper.getReportForStatistics(code, null, null,3));
-			objectObjectHashMap.put("result6",   baseMapper.getReportForStatistics(code, null, null,4));
+			objectObjectHashMap.put("result3", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 1, roleType));
+			objectObjectHashMap.put("result4", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 2, roleType));
+			objectObjectHashMap.put("result5", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 3, roleType));
+			objectObjectHashMap.put("result6", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 4, roleType));
 		}
 		return objectObjectHashMap;
 	}

--
Gitblit v1.9.3