修改bug

src/main/java/com/gz/service/statistics/impl/SelectStatisticsServiceImpl.java

@@ -227,8 +227,9 @@ public class SelectStatisticsServiceImpl implements SelectStatisticsService {
                     }
                 }
             }
-
-            archiveYearStatisticsRVOS.get(archiveYearStatisticsRVOS.size() - 1).setSumSpace(UnitUtils.storageUnitConvertStr(hj));
+            if(archiveYearStatisticsRVOS.size()>0){
+                archiveYearStatisticsRVOS.get(archiveYearStatisticsRVOS.size() - 1).setSumSpace(UnitUtils.storageUnitConvertStr(hj));
+            }
             stringRedisTemplate.opsForValue().set(key, JSONObject.toJSONString(archiveYearStatisticsRVOS), DataGlobalVariable.CACHE_EXPIRES, DataGlobalVariable.TIME_UNIT);
             return archiveYearStatisticsRVOS;
         }

src/main/java/com/gz/vo/statistics/StatisticsVO.java

@@ -23,4 +23,6 @@ public class StatisticsVO {
     private List<String> mlCodes;
     // 关键字
     private String gjz;
+    //保管期限
+    private String bgqx;
 }

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: dev
   servlet:
     multipart:
       max-file-size: 5120MB

src/main/resources/mapper/selectStatisticsMapper.xml

@@ -56,6 +56,9 @@
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND a1.gdnd BETWEEN #{startTime} AND #{endTime}
             </if>
+            <if test="bgqx != null and bgqx != ''">
+                and a1.bgqx=#{bgqx}
+            </if>
             <if test="mlCodes != null and mlCodes.size > 0">
                 AND a1.ml in
                 <foreach collection="mlCodes" item="item" index="index" open="(" close=")" separator=",">

src/main/resources/static/page/borrow/list.html

@@ -57,6 +57,11 @@
                         <button id="resultSearch" lay-submit lay-filter="resultSearch" class="layui-btn icon-btn"><i
                                 class="layui-icon"></i>结果中搜索
                         </button>
+                        <button id="resetSearch" type="reset" lay-submit lay-filter="resetSearch"
+                                class="layui-btn icon-btn">
+                            <i class="layui-icon layui-icon-refresh-3"></i>
+                            重置
+                        </button>
                     </div>
                 </div>
             </div>
@@ -605,6 +610,22 @@
             }
         })
 
+        form.on('submit(resetSearch)', function (data) {
+            // searchParam.reset = true
+            $("#ztc").val('')
+            $("#dh").val('')
+            $("#wjbh").val('')
+            $("#mj").val('')
+            $("#gdnd").val('')
+            $("#bgqx").val('')
+            const ml = searchParam.ml
+            searchParam = {}
+            searchParam.ml = ml
+            curr = 1
+            $("#resultSearch").hide()
+            renderTable()
+        })
+
         form.on('submit(resultSearch)', function (data) {
             searchParam.dh = data.field.dh
             searchParam.mlh = data.field.mlh

src/main/resources/static/page/role/editRole.html

@@ -19,7 +19,7 @@
 <div class="layuimini-container" style="width: 80%;margin: 0 auto">
     <div class="layui-form layuimini-form" lay-filter="addPaper">
         <div class="layui-row layui-col-space30">
-            <div class="layui-col-md3">
+            <div class="layui-col-md2">
                 <div class="layui-card">
                     <div class="layui-card-header"><i class="layui-icon layui-icon-menu-fill"></i>菜单权限</div>
                     <div class="layui-card-body">
@@ -27,7 +27,7 @@
                     </div>
                 </div>
             </div>
-            <div class="layui-col-md3">
+            <div class="layui-col-md2">
                 <div class="layui-card">
                     <div class="layui-card-header"><i class="layui-icon layui-icon-tree"></i>档案树权限</div>
                     <div class="layui-card-body">
@@ -51,13 +51,12 @@
                     </div>
                 </div>
             </div>
-            <div class="layui-col-md2">
+            <div class="layui-col-md3">
                 <div class="layui-card">
-                    <div class="layui-card-header"><i class="layui-icon layui-icon-star"></i>档案权限</div>
-                    <div class="layui-card-body">
-                        <input type="checkbox" name="bmqx-role" lay-skin="switch" lay-filter="switchTest"
-                               lay-text="ON|OFF">
-
+                    <div class="layui-card-header"><i class="layui-icon layui-icon-star"></i>是否仅可见本部门</div>
+                    <div class="layui-input-block">
+                        <input type="radio" name="bmqx-role" value="0" title="是" checked="">
+                        <input type="radio" name="bmqx-role" value="1" title="否">
                     </div>
                 </div>
             </div>
@@ -128,7 +127,7 @@
             })
         }
         let initdept = () => {
-            http.get('system/dict/selectDeptQx', {roleId: id}, true, function (res) {
+            http.get('system/dict/selectDeptQx', {roleId: urlParam.id}, true, function (res) {
                 tree.render({
                     elem: '#bmqx-role'
                     , data: res.data
@@ -170,13 +169,19 @@
 
         //保存方法
         let save = function () {
+                let i;
+            if(document.getElementsByName("bmqx-role")[0].checked){
+                i=document.getElementsByName("bmqx-role")[0].value
+            }else {
+                i=document.getElementsByName("bmqx-role")[1].value
+            }
             let data = {
                 roleId: urlParam.id,
                 menuIds: getChecked_list(tree.getChecked("menu-role")),
                 mjCodes: getChecked_list(tree.getChecked("miji-role")),
                 archiveTrees: getChecked_list(tree.getChecked("archive-tree-role")),
                 archiveShow: getChecked_list(tree.getChecked("archive-role")),
-                bmqxRole: document.getElementById("bmqx-role").value
+                bmqxRole: i
             }
             console.log()
             http.post('system/role/setRole', data, true, function (res) {

src/main/resources/static/page/statistics/archiveYearStatistics.html

@@ -21,6 +21,15 @@
                         <div class="layui-inline">
                             <input type="text" name="ml" lay-filter="ml" id="ml" class="layui-input">
                         </div>
+
+
+                        <div class="layui-inline">
+                            <select name="bgqx" id="bgqx">
+                            </select>
+                        </div>
+
+
+
                         <div class="layui-inline">
                             <button id="btnSearch" lay-submit lay-filter="search" class="layui-btn icon-btn"><i
                                     class="layui-icon"></i>搜索
@@ -40,7 +49,14 @@
 <script>
     layui.use(['table', 'http', 'treeSelect', 'laydate', 'form'], function () {
         let searchParam = {}
-
+        var table = layui.table,
+            laydate = layui.laydate,
+            http = layui.http,
+            form = layui.form,
+            tree = layui.tree,
+            upload = layui.upload,
+            url = layui.url,
+            $ = layui.jquery;
         layui.laydate.render({
             elem: '#time',
             type: 'year',
@@ -131,6 +147,20 @@
 
         renderTable()
 
+
+         function initBgqx() {
+            http.get('system/dict/selectDictByCode', {code: 'BAOGUANQIXIANYI'}, false, function (res) {
+                let html = '';
+                for (let i in res.data) {
+                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
+                }
+                $("#bgqx").html('<option value="">请选择保管期限</option>')
+                $("#bgqx").append(html)
+                form.render();//菜单渲染 把内容加载进去
+            })
+        }
+        initBgqx()
+
         layui.form.on('submit(search)', function (data) {
             searchParam = data.field
             var selectedNodes = layui.treeSelect.zTree('ml').getSelectedNodes();