安全责任书

project_data/sql/0.0.3/soc/soc.sql

@@ -301,6 +301,7 @@ INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time,
 INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (0, '安保履职登记簿', '0', 'register_book_type', null, 'default', 'N', '0', null, now(), null, now(), null);
 INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (1, '教育培训登记簿', '1', 'register_book_type', null, 'default', 'N', '0', null, now(), null, now(), null);
 INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (2, '预案演练登记簿', '2', 'register_book_type', null, 'default', 'N', '0', null, now(), null, now(), null);
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (26, '安全检查登记簿', '26', 'register_book_type', null, 'default', 'N', '0', null, now(), null, now(), null);
 -- 新增行政级别字典
 delete from sys_dict_type where dict_type='administrative_level';
 delete from sys_dict_data where dict_type='administrative_level';
@@ -905,7 +906,7 @@ INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (122, 01719892877586239
 
 -- 登记簿批量导出菜单权限赋予
 delete from sys_role_menu where menu_id =1722135552494403586;
-insert into sys_role_menu select id,1722135552494403586 from sys_role where org_type in (1,2,3) and del_flag=0 and status=0;
+insert into sys_role_menu select id,1722135552494403586 from sys_role where org_type in (1,2,3,4) and del_flag=0 and status=0;
 
 -- 新增省联社角色
 delete from sys_role where role_name IN('省联社部门管理层');

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/registerbook/service/impl/CoreRegisterBookPdfServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.registerbook.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -71,6 +72,8 @@ public class CoreRegisterBookPdfServiceImpl extends ServiceImpl<CoreRegisterBook
         } else {
             wrapper.eq(CoreRegisterBookPdf::getOrgId, req.getOrgId());
         }
+        wrapper.between(CoreRegisterBookPdf::getDate, DateUtil.beginOfMonth(req.getDate()), DateUtil.endOfMonth(req.getDate()));
+        wrapper.orderByDesc(CoreRegisterBookPdf::getDate);
         Page<CoreRegisterBookPdf> pageRequest = req.getPageRequest();
         Page<CoreRegisterBookPdf> page = coreRegisterBookPdfMapper.selectPage(pageRequest, wrapper);
         if (page.getRecords().size() > 0) {