工单管理增加多部门查询

lawenforcement-ui/src/api/lawenforcement/provincialDept.js

@@ -42,3 +42,10 @@ export function delProvincialDept(deptId) {
     method: 'delete'
   })
 }
+
+export function getDept(){
+  return request({
+    url: '/sooka-sponest-lawenforcement/provincialDept/getDeptList',
+    method: 'get'
+  })
+}

lawenforcement-ui/src/views/lawenforcement/record/index.vue

@@ -37,14 +37,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="创建部门" prop="deptName">
-            <el-input
-              v-model="queryParams.deptName"
-              placeholder="请输入创建部门"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
+          <el-form-item label="是否立案" prop="isRegisterRecord" v-if="queryParams.isRegister !== '1'">
+            <el-select v-model="queryParams.isRegisterRecord" placeholder="请选择是否立案" clearable size="small">
+              <el-option value="3" label="是">是</el-option>
+              <el-option value="0" label="否">否</el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -120,15 +117,19 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="是否立案" prop="isRegisterRecord" v-if="queryParams.isRegister !== '1'">
-            <el-select v-model="queryParams.isRegisterRecord" placeholder="请选择是否立案" clearable size="small">
-              <el-option value="3" label="是">是</el-option>
-              <el-option value="0" label="否">否</el-option>
+        <el-col :span="8">
+          <el-form-item label="创建部门" prop="deptIdList">
+            <el-select v-model="queryParams.deptIdList" multiple placeholder="请选择" style="width: 402px !important;">
+              <el-option
+                v-for="item in provincialDeptOptions"
+                :key="item.deptId"
+                :label="item.provincialDeptName"
+                :value="item.deptId">
+              </el-option>
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="4">
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -517,6 +518,7 @@ import {
   setRecordStatus,
   updateRecord
 } from "@/api/lawenforcement/record";
+import {getDept} from "@/api/lawenforcement/provincialDept"
 import moment from "moment/moment";
 import DetailsVue from "@/views/lawenforcement/record/DetailsVue.vue";
 import Distribute from "@/views/lawenforcement/record/distribute.vue";
@@ -538,6 +540,7 @@ export default {
   data() {
     return {
       hasApprovalPermission:false,
+      provincialDeptOptions:[],
       attachPath: '',
       describe: '',
       // 遮罩层
@@ -575,6 +578,7 @@ export default {
         checkEndTime: null,
         createMethod: null,
         isRegisterRecord: null,
+        deptIdList: [],
       },
       // 表单参数
       form: {
@@ -635,6 +639,7 @@ export default {
     this.isRegister = this.$route.query.isRegister?this.$route.query.isRegister:0;
     this.getList();
     this.getTreeselectToDept();
+    this.getProvincialDeptOptions();
   },
   computed: {
     formattedCheckStartTime: {
@@ -689,6 +694,12 @@ export default {
     },
   },
   methods: {
+    // 获取省平台部门列表
+    getProvincialDeptOptions() {
+      getDept().then(response => {
+        this.provincialDeptOptions = response.data;
+      });
+    },
     /** 获取部门列表 页面初始化执行 */
     getTreeselectToDept() {
       treeselect().then(response => {
@@ -768,6 +779,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.reset();
       this.handleQuery();
     },
     // 多选框选中数据

src/main/java/com/sooka/sponest/lawenforcement/provincialDept/service/impl/LawenforcementProvincialDeptServiceImpl.java

@@ -93,6 +93,9 @@ public class LawenforcementProvincialDeptServiceImpl extends BaseService impleme
 
     @Override
     public List<Map<String, Object>> getDeptList(LawenforcementProvincialDept lawenforcementProvincialDept) {
+        if (lawenforcementProvincialDept.getDeptId() == null) {
+            lawenforcementProvincialDept.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return lawenforcementProvincialDeptMapper.getDeptList(lawenforcementProvincialDept);
     }
 }

src/main/java/com/sooka/sponest/lawenforcement/record/domain/LawenforcementRecord.java

@@ -279,6 +279,8 @@ public class LawenforcementRecord{
     private String isRegister;//是否立案填报（1：立案；2：填报）
     private String isRegisterRecord;//是否立案填报（1：立案；2：填报）
 
+    private List<String> deptIdList;
+
 
     @Override
     public String toString() {

src/main/java/com/sooka/sponest/lawenforcement/record/service/impl/LawenforcementRecordServiceImpl.java

@@ -86,7 +86,9 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
      */
     @Override
     public List<LawenforcementRecord> selectLawenforcementRecordList(LawenforcementRecord lawenforcementRecord) {
-        lawenforcementRecord.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId().toString());
+        if(StringUtils.isEmpty(lawenforcementRecord.getDeptIdList())){
+            lawenforcementRecord.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId().toString());
+        }
         return recordMapper.selectLawenforcementRecordList(lawenforcementRecord);
     }
 

src/main/resources/mapper/lawenforcement/LawenforcementProvincialDeptMapper.xml

@@ -76,9 +76,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="getDeptList" parameterType="LawenforcementProvincialDept" resultType="map">
-        select dept_id, provincial_dept_name from lawenforcement_provincial_dept
+        select dept_id deptId, provincial_dept_name provincialDeptName from lawenforcement_provincial_dept
         <where>
-            <if test="isJudgment != null and isJudgment != ''"> and is_judgment = #{isJudgment},</if>
+            <if test="isJudgment != null and isJudgment != ''"> and is_judgment = #{isJudgment}</if>
+            <if test="deptId!= null"> and (dept_id = #{deptId} or find_in_set( #{deptId}, dept_ancestors ))</if>
         </where>
     </select>
 </mapper>

src/main/resources/mapper/lawenforcement/LawenforcementRecordMapper.xml

@@ -322,9 +322,20 @@
                     </otherwise>
                 </choose>
             </if>
-            <if test="deptId !=null and deptId != ''">
-                and (d.dept_id = #{deptId} or find_in_set( #{deptId}, d.dept_ancestors ))
-            </if>
+            <choose>
+                <when test="deptIdList != null and deptIdList.size() > 0">
+                    and d.dept_id in
+                    <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
+                        #{deptId}
+                    </foreach>
+                </when>
+                <otherwise>
+                    <if test="deptId !=null and deptId != ''">
+                        and (d.dept_id = #{deptId} or find_in_set( #{deptId}, d.dept_ancestors ))
+                    </if>
+                </otherwise>
+            </choose>
+
         </where>
         order by a.create_time desc
     </select>