导出bug修复

src/main/java/com/zcloud/controller/bus/HiddenExcelController.java

@@ -8,6 +8,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import com.zcloud.entity.Page;
+import com.zcloud.entity.system.Department;
 import com.zcloud.service.hiddenApi.HiddenApiService;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.util.Strings;
@@ -59,6 +60,10 @@ public class HiddenExcelController extends BaseController {
     @Autowired
     private HiddenCheckService hiddenCheckService;
 
+    @Autowired
+    private DepartmentService departmentService; // 部门信息
+
+
     @RequestMapping(value = "/exportExcelToSession")
 //	// @RequiresPermissions("toExcel")
     @ResponseBody
@@ -121,6 +126,30 @@ public class HiddenExcelController extends BaseController {
 
         List<PageData> varList = new ArrayList<PageData>();
         List<String> wertitles = this.setTitles();
+        // 增加隐患整改部门查询  开始
+        if(StringUtils.isNotBlank(pd.getString("RECTIFICATIONDEPT"))){
+            String url ="department_list.html?DEPARTMENT_ID=";
+            List<Department> departments = departmentService.listAllDepartment(pd.getString("RECTIFICATIONDEPT"), url);
+            List<String> departmentIds = new ArrayList<>();
+            departmentIds.add(pd.getString("RECTIFICATIONDEPT"));
+            for(Department department:departments){
+                departmentIds.add(department.getDEPARTMENT_ID());
+            }
+            pd.put("departmentIds",departmentIds);
+        }
+        // 增加发现整改部门查询  开始
+        if(StringUtils.isNotBlank(pd.getString("creatorUserDept"))){
+            String url ="department_list.html?DEPARTMENT_ID=";
+            List<Department> departments = departmentService.listAllDepartment(pd.getString("creatorUserDept"), url);
+            List<String> departmentIds = new ArrayList<>();
+            departmentIds.add(pd.getString("creatorUserDept"));
+            for(Department department:departments){
+                departmentIds.add(department.getDEPARTMENT_ID());
+            }
+            pd.put("creatorUserDepts",departmentIds);
+        }
+
+        // 增加隐患发现部门查询  结束
         List<PageData> hiddenListAll = getHiddenList(pd);// 获取 隐患数据
 
         /**

src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java

@@ -1046,6 +1046,29 @@ public class HiddenApiController extends BaseController {
         titles.add("复查人");	//14
         titles.add("检查人员");	//15
         dataMap.put("titles", titles);
+        // 增加隐患整改部门查询  开始
+        if(StringUtils.isNotBlank(pd.getString("RECTIFICATIONDEPT"))){
+            String url ="department_list.html?DEPARTMENT_ID=";
+            List<Department> departments = departmentService.listAllDepartment(pd.getString("RECTIFICATIONDEPT"), url);
+            List<String> departmentIds = new ArrayList<>();
+            departmentIds.add(pd.getString("RECTIFICATIONDEPT"));
+            for(Department department:departments){
+                departmentIds.add(department.getDEPARTMENT_ID());
+            }
+            pd.put("departmentIds",departmentIds);
+        }
+        // 增加发现整改部门查询  开始
+        if(StringUtils.isNotBlank(pd.getString("creatorUserDept"))){
+            String url ="department_list.html?DEPARTMENT_ID=";
+            List<Department> departments = departmentService.listAllDepartment(pd.getString("creatorUserDept"), url);
+            List<String> departmentIds = new ArrayList<>();
+            departmentIds.add(pd.getString("creatorUserDept"));
+            for(Department department:departments){
+                departmentIds.add(department.getDEPARTMENT_ID());
+            }
+            pd.put("creatorUserDepts",departmentIds);
+        }
+
         List<PageData> varOList = hiddenApiService.listForExcel(pd);
         List<PageData> varList = new ArrayList<PageData>();
         for(int i=0;i<varOList.size();i++){

src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml

@@ -583,7 +583,11 @@
 		<if test="creatorUserDept != null and creatorUserDept != ''"><!-- 隐患发现人 部门-->
 			and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER
 			hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID
-			where user.DEPARTMENT_ID = #{creatorUserDept} )
+			where user.DEPARTMENT_ID in
+			<foreach item="item" index="index" collection="creatorUserDepts" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+			)
 		</if>
 		<if test="creatorName != null and creatorName != ''"><!-- 隐患发现人 -->
 			and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID
@@ -666,6 +670,13 @@
 			and f.STATE = '2'
 			and (select count(1) from BUS_HIDDENCHECK bh where bh.HIDDEN_ID=f.HIDDEN_ID and bh.USER_ID=#{checkUser} )>0
 		</if>
+		<if test='RECTIFICATIONDEPT != null and RECTIFICATIONDEPT != ""'><!-- 验收隐患 -->
+			AND
+			f.RECTIFICATIONDEPT IN
+			<foreach item="item" index="index" collection="departmentIds" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
 		GROUP BY f.HIDDEN_ID
 		order by FIELD ( f.STATE, '-2' ) desc,<!-- 因为这是隐患确认列表有确认按钮的排在前面 -->
 		f.DISCOVERYTIME desc  <!-- 剩下的按隐患发现时间排序 -->
@@ -922,7 +933,11 @@
 		<if test="creatorUserDept != null and creatorUserDept != ''"><!-- 隐患发现人 部门-->
 			and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER
 			hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID
-			where user.DEPARTMENT_ID = #{creatorUserDept} )
+			where user.DEPARTMENT_ID in
+			<foreach item="item" index="index" collection="creatorUserDepts" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+			)
 		</if>
 		<if test="creatorName != null and creatorName != ''"><!-- 隐患发现人 -->
 			and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID
@@ -992,6 +1007,13 @@
 			and f.STATE = '2'
 			and (select count(1) from BUS_HIDDENCHECK bh where bh.HIDDEN_ID=f.HIDDEN_ID and bh.USER_ID=#{checkUser} )>0
 		</if>
+		<if test='RECTIFICATIONDEPT != null and RECTIFICATIONDEPT != ""'><!-- 验收隐患 -->
+			AND
+			f.RECTIFICATIONDEPT IN
+			<foreach item="item" index="index" collection="departmentIds" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
 		GROUP BY f.HIDDEN_ID
 		order by FIELD ( f.STATE, '-2' ) desc,<!-- 因为这是隐患确认列表有确认按钮的排在前面 -->
 		f.DISCOVERYTIME desc  <!-- 剩下的按隐患发现时间排序 -->