隐患台账修改

danger-manage-admin/src/main/java/com/zehong/web/controller/hiddenDanger/TStaningBookController.java

 package com.zehong.web.controller.hiddenDanger;
 
 import java.util.List;
+
+import com.zehong.common.core.domain.entity.SysUser;
+import com.zehong.common.core.domain.model.LoginUser;
+import com.zehong.common.utils.ServletUtils;
+import com.zehong.framework.web.service.TokenService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,7 +37,8 @@ public class TStaningBookController extends BaseController
 {
     @Autowired
     private ITStaningBookService tStaningBookService;
-
+    @Autowired
+    private TokenService tokenService;
     /**
      * 查询隐患台账列表
      */
@@ -40,8 +46,10 @@ public class TStaningBookController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TStaningBook tStaningBook)
     {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
         startPage();
-        List<TStaningBook> list = tStaningBookService.selectTStaningBookList(tStaningBook);
+        List<TStaningBook> list = tStaningBookService.selectTStaningBookList(tStaningBook,user.getDeptId());
         return getDataTable(list);
     }
 
@@ -53,7 +61,10 @@ public class TStaningBookController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(TStaningBook tStaningBook)
     {
-        List<TStaningBook> list = tStaningBookService.selectTStaningBookList(tStaningBook);
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        startPage();
+        List<TStaningBook> list = tStaningBookService.selectTStaningBookList(tStaningBook,user.getDeptId());
         ExcelUtil<TStaningBook> util = new ExcelUtil<TStaningBook>(TStaningBook.class);
         return util.exportExcel(list, "隐患台账数据");
     }

danger-manage-system/src/main/java/com/zehong/system/domain/TStaningBook.java

 package com.zehong.system.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -140,6 +142,17 @@ public class TStaningBook extends BaseEntity
     /** 删除 0否 1是 */
     private Integer isDel;
 
+
+    private List<Long> deptList;
+
+    public List<Long> getDeptList() {
+        return deptList;
+    }
+
+    public void setDeptList(List<Long> deptList) {
+        this.deptList = deptList;
+    }
+
     public String getEscalationName() {
         return escalationName;
     }

danger-manage-system/src/main/java/com/zehong/system/mapper/SysDeptMapper.java

@@ -134,4 +134,7 @@ public interface SysDeptMapper
     public List<Map<String,Object>>  classification(Long deptId);
 
     public List<Map<String,Object>> classificationByList(@Param("list") List<Map<String,Object>> list);
+
+
+    public List<Long> selectDeptByParentId(@Param("deptList") List<Long> deptList);
 }

danger-manage-system/src/main/java/com/zehong/system/service/ITStaningBookService.java

@@ -27,7 +27,7 @@ public interface ITStaningBookService
      * @param tStaningBook 隐患台账
      * @return 隐患台账集合
      */
-    public List<TStaningBook> selectTStaningBookList(TStaningBook tStaningBook);
+    public List<TStaningBook> selectTStaningBookList(TStaningBook tStaningBook,Long deptId);
 
     /**
      * 新增隐患台账

danger-manage-system/src/main/java/com/zehong/system/service/impl/TStaningBookServiceImpl.java

 package com.zehong.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -49,20 +50,23 @@ public class TStaningBookServiceImpl implements ITStaningBookService
      * @return 隐患台账
      */
     @Override
-    public List<TStaningBook> selectTStaningBookList(TStaningBook tStaningBook)
+    public List<TStaningBook> selectTStaningBookList(TStaningBook tStaningBook,Long deptId)
     {
+        List<Long> oneList = new ArrayList<>();
+        oneList.add(deptId);
+        List<Long> deptIds = selectDeptIds(new ArrayList<>(),oneList);
+        tStaningBook.setDeptList(deptIds);
         List<TStaningBook> list = tStaningBookMapper.selectTStaningBookList(tStaningBook);
-//        for(TStaningBook book: list){
-//            if(book.getDeptId()!=null){
-//                SysDept dept = deptMapper.selectDeptById(book.getDeptId());
-//                if(dept!=null){
-//                    book.setDeptName(dept.getDeptName());
-//                }
-//            }
-//        }
-        return list;
+        return  list;
+    }
+    public List<Long> selectDeptIds(List<Long> list,List<Long> deptIds){
+        List<Long> resultlist = deptMapper.selectDeptByParentId(deptIds);
+        if(resultlist.size()==0){
+            return list;
+        }
+        list.addAll(resultlist);
+        return selectDeptIds(list,resultlist);
     }
-
     /**
      * 新增隐患台账
      * 

danger-manage-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -193,4 +193,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			</foreach>
 			GROUP BY d.`dept_id`
 	</select>
+	<select id="selectDeptByParentId" resultType="java.lang.Long">
+		SELECT dept_id FROM sys_dept WHERE parent_id IN
+		<foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+			#{deptId}
+		</foreach>
+	</select>
 </mapper> 
\ No newline at end of file

danger-manage-system/src/main/resources/mapper/system/TStaningBookMapper.xml

@@ -56,6 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN t_staff s3 ON b.`person_liable` = s3.`staff_id`
         LEFT JOIN sys_dept d ON d.`dept_id` = b.`dept_id`
         <where>
+            AND s1.dept_id in
+            <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
             <if test="troubleName != null  and troubleName != ''"> and b.trouble_name like concat('%', #{troubleName}, '%')</if>
             <if test="findTime != null "> and b.find_time &gt; #{findTime}</if>
             <if test="rectificationTime != null "> and b.find_time &lt; #{rectificationTime}</if>