机构扩展需求变更

project_data/sql/0.0.3/soc/soc.sql

@@ -142,9 +142,48 @@ DROP PROCEDURE IF EXISTS schema_change ??
         ALTER TABLE `core_resumption` 
 			ADD COLUMN `times` smallint NULL COMMENT '第几次' AFTER `role_id`;
     END IF;
+	-- 机构扩展添加字段
+    IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'remote_count' ) THEN
+        ALTER TABLE `sys_org_extend`
+            ADD COLUMN `remote_count` int NULL COMMENT '业务库防控隔离门出入口数量';
+    END IF;
+    IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'cash_adding_room' ) THEN
+        ALTER TABLE `sys_org_extend`
+            ADD COLUMN `cash_adding_room` int NULL COMMENT '离行式加钞间出入口数量';
+    END IF;
+    IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'safe_box' ) THEN
+        ALTER TABLE `sys_org_extend`
+            ADD COLUMN `safe_box` int NULL COMMENT '是否设立保管箱库';
+    END IF;
+    IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'inner_count' ) THEN
+        ALTER TABLE `sys_org_extend`
+            ADD COLUMN `inner_count` int NULL COMMENT '内部保安人数';
+    END IF;
+    IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'outside_count' ) THEN
+        ALTER TABLE `sys_org_extend`
+            ADD COLUMN `outside_count` int NULL COMMENT '外聘保安人数';
+    END IF;
 	
 END ??
 DELIMITER;
 CALL schema_change ();
 
-update sys_menu set menu_name='调阅情况跟踪' where menu_name='监控调阅任务管理';
+update sys_menu set menu_name='调阅情况跟踪' where menu_name='监控调阅任务管理';
+
+-- 机构类型字典变更
+DELETE FROM `sys_dict_data` WHERE `dict_type`='sys_org_type';
+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 ( 900, '省联社', '1', 'sys_org_type', NULL, 'default', 'N', '0', '何悦', '2023-08-16 17:51:17', '何悦', '2023-08-24 10:35:12', 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 ( 800, '办事处', '2', 'sys_org_type', NULL, 'default', 'N', '0', '何悦', '2023-08-16 17:51:38', '超级管理员', '2023-09-05 14:55:20', 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 ( 200, '行社', '3', 'sys_org_type', NULL, 'default', 'N', '0', '何悦', '2023-08-16 17:52:01', '超级管理员', '2023-09-15 18:10:38', 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 ( 100, '营业网点', '4', 'sys_org_type', NULL, 'default', 'N', '0', '何悦', '2023-08-16 17:52:13', '超级管理员', '2023-09-15 18:15:21', 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 ( 300, '离行式自助银行', '5', 'sys_org_type', NULL, 'default', 'N', '0', '何悦', '2023-08-16 17:52:41', '超级管理员', '2023-09-15 18:15:35', 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 ( 600, '中心业务库', '6', 'sys_org_type', NULL, 'default', 'N', '0', '何悦', '2023-08-16 17:52:59', '省联社账号', '2023-11-01 10:42:56', 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 ( 700, '监控中心', '10', 'sys_org_type', NULL, 'default', 'N', '0', '何悦', '2023-08-16 17:53:46', '省联社账号', '2023-11-01 10:43:10', 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 ( 500, '网点业务库', '8', 'sys_org_type', NULL, 'default', 'N', '0', '超级管理员', '2023-09-12 19:57:55', '超级管理员', '2023-09-15 18:18:44', 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 ( 400, '保管箱库', '7', 'sys_org_type', NULL, 'default', 'N', '0', '超级管理员', '2023-09-15 17:10:47', '', NULL, 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 ( 1000, '其他', '9', 'sys_org_type', NULL, 'default', 'N', '0', '超级管理员', '2023-09-17 00:13:26', '超级管理员', '2023-09-17 00:13:37', NULL);

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysOrgExtend.java

@@ -108,6 +108,12 @@ public class SysOrgExtend extends BaseEntity {
      */
     @ApiModelProperty(value = "业务库出入口远程控制")
     private Integer remoteControl;
+    private Integer remoteCount;
+    private Integer cashAddingRoom;
+    private Integer safeBox;
+    private Integer innerCount;
+    private Integer outsideCount;
+
     /**
      * 离行式大堂设备
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/mapper/CoreSafetyBookMapper.java

@@ -63,4 +63,6 @@ public interface CoreSafetyBookMapper extends BaseMapper<CoreSafetyBook> {
     int deleteCoreSafetyBookByIds(Long[] ids);
 
     Page<CoreSafetyBook> selectPageSafetyBook(Page<CoreSafetyBook> page, @Param("info") CoreSafetyBook coreSafetyBook);
+
+    CoreSafetyBook selectBookById(Long id);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/impl/CoreSafetyBookServiceImpl.java

@@ -111,7 +111,7 @@ public class CoreSafetyBookServiceImpl extends ServiceImpl<CoreSafetyBookMapper,
      */
     @Override
     public CoreSafetyBook selectCoreSafetyBookById(Long id) {
-        CoreSafetyBook coreSafetyBook = coreSafetyBookMapper.selectById(id);
+        CoreSafetyBook coreSafetyBook = coreSafetyBookMapper.selectBookById(id);
         List<CoreSafetyBookUser> coreSafetyBookUsers = coreSafetyBookUserMapper.selectByBookId(id);
         for (CoreSafetyBookUser s :
                 coreSafetyBookUsers) {

soc-modules/soc-modules-core/src/main/resources/mapper/safetybook/CoreSafetyBookMapper.xml

@@ -87,6 +87,25 @@
 
         </if>
     </select>
+    <select id="selectBookById" resultType="com.xunmei.core.safetybook.domain.CoreSafetyBook">
+        select b.id,
+               b.year,
+               b.org_id,
+               b.create_org_id,
+               b.create_by,
+               b.create_time,
+               b.update_by,
+               b.update_time,
+               b.deleted,
+               b.type,
+               o.name as org_name,
+               u.name as user_name
+        from core_safety_book b
+                 left join sys_org o on b.org_id=o.id
+                 left join sys_user u on b.create_by=u.id
+        where b.deleted = 0 and b.id=#{id}
+
+    </select>
 
     <insert id="insertCoreSafetyBook" parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBook"
             useGeneratedKeys="true" keyProperty="id">

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysWorkTimeSetController.java

@@ -60,7 +60,7 @@ public class SysWorkTimeSetController extends BaseController {
      * 查询作息设置列表
      */
     @ApiOperation(value = "findId")
-    @RequiresPermissions("system:set:find")
+//    @RequiresPermissions("system:set:find")
     @GetMapping("/findId")
     public AjaxResult findId(SysWorkTimeSet sysWorkTimeSet) {
         SysWorkTimeSet workTimeSet;