归档案件增加部门条件

src/main/java/com/cm/systemcity/controller/apis/dict/DictController.java

@@ -105,7 +105,7 @@ public class DictController extends AbstractController {
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("listdict/{dictParentId}")
     public List<DictDTO> listDict(@PathVariable("dictParentId") String dictParentId) throws SearchException {
-        Map<String, Object> params = getParams();
+        Map<String, Object> params = requestParams();
         params.put("dictParentId", dictParentId);
         return dictService.listDict(params);
     }

src/main/resources/mybatis/mapper/dict/dict-mapper.xml

@@ -150,6 +150,10 @@
                 #{dictIds[${index}]}
             </foreach>
         </if>
+        <if test="isHide != null">
+        AND
+            t1.is_hide = #{isHide}
+        </if>
         <choose>
             <when test="sort != null and (sort == 'dictName' or sort == 'dictCode' or sort == 'dictOrder')">
                 ORDER BY

src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml

@@ -463,8 +463,23 @@
                 #{reporterIds[${index}]}
             </foreach>
         </if>
+<!--        <if test="caseTypeId != null and caseTypeId != ''">-->
+<!--            AND t1.case_type_id = #{caseTypeId}-->
+<!--        </if>-->
         <if test="caseTypeId != null and caseTypeId != ''">
-            AND t1.case_type_id = #{caseTypeId}
+            AND t1.case_type_id IN (
+                SELECT
+                    cd.dict_id
+                FROM
+                    city_dict cd
+                WHERE
+                    cd.is_delete = 0
+                AND (
+                    dict_id = #{caseTypeId}
+                    OR
+                    dict_parent_id = #{caseTypeId}
+                )
+            )
         </if>
         <if test="caseStatus != null and caseStatus != ''">
             AND FIND_IN_SET(t1.case_status, #{caseStatus})
@@ -1883,10 +1898,10 @@
             AND case_type_id = #{caseTypeId}
         </if>
         <if test="startTime != null and startTime != ''">
-            AND gmt_create <![CDATA[ >= ]]> #{startTime}
+            AND LEFT(gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            AND gmt_create <![CDATA[ <= ]]> #{endTime}
+            AND LEFT(gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
         <if test="handleDepartmentId != null and handleDepartmentId != ''">
         AND (

src/main/resources/static/route/reportcase/list_placeonfile.html

@@ -13,6 +13,7 @@
     <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
     <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+    <link rel="stylesheet" href="assets/js/vendor/zTree3/css/metroStyle/metroStyle.css"/>
     <style>
         .layui-table-cell{
             height: auto;
@@ -66,6 +67,7 @@
                                 {{# } }}
                             </select>
                         </script>
+                        <div class="layui-inline" id="deptContainer"></div>
                         <div class="layui-inline">
                             <input type="text" id="startTime" class="layui-input search-item"
                                    readonly="readonly" placeholder="开始时间" style="height: 38px;width:150px;cursor: pointer" autocomplete="off">
@@ -96,7 +98,7 @@
         base: 'assets/layuiadmin/'
     }).extend({
         index: 'lib/index'
-    }).use(['index', 'table', 'laytpl', 'form','laydate'], function() {
+    }).use(['index', 'table', 'laytpl', 'form','laydate', 'selecttree'], function() {
         var $ = layui.$;
         var $win = $(window);
         var laytpl = layui.laytpl;
@@ -104,9 +106,15 @@
         var admin = layui.admin;
         var form = layui.form;
         var laydate = layui.laydate;
+        var selecttree = layui.selecttree;
         var tableUrl = 'api/reportcase/listpagereportcase?caseStatus=6';
         var dataLoading = false;
 
+        selecttree.dept({
+            elem: '#deptContainer',
+            name: 'dept',
+        });
+
         // 初始化表格
         function initTable() {
             dataLoading = true;
@@ -227,7 +235,9 @@
 
         //初始化地区
         function initArea(){
-            top.restAjax.get('api/dict/listdict/9d179f05-3ea0-48f7-853c-d3b7124b791c', {}, null, function(code, data) {
+            top.restAjax.get('api/dict/listdict/9d179f05-3ea0-48f7-853c-d3b7124b791c', {
+                isHide: 0
+            }, null, function(code, data) {
                 laytpl(document.getElementById('areaSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('areaSelectTemplateBox').innerHTML = html;
                 });
@@ -288,13 +298,15 @@
             var childCaseTypeId = $('#childCaseTypeId').val();
             var startTime = $('#startTime').val();
             var endTime = $('#endTime').val();
+            var deptId = $('#deptId').val();
             var params = '&t='+ new Date().getTime();
             if('' != areaId && 'undefined' != typeof(areaId)) {
                 params += '&areaId='+ areaId;
             }
-            if('' != caseTypeId && '' != childCaseTypeId) {
-                params += '&caseTypeId='+ childCaseTypeId;
-            } else {
+            if(childCaseTypeId) {
+                caseTypeId = childCaseTypeId;
+            }
+            if(caseTypeId) {
                 params += '&caseTypeId='+ caseTypeId;
             }
             if('' != startTime) {
@@ -303,6 +315,9 @@
             if('' != endTime) {
                 params += '&endTime='+ endTime;
             }
+            if('' != deptId) {
+                params += '&departmentId='+ deptId;
+            }
             return url + params;
         }