安全检查

project_data/sql/0.0.4/soc/soc.sql

@@ -75,3 +75,33 @@ UPDATE `sys_menu` SET `order_num` = 28 WHERE `menu_name` = '系统管理';
 UPDATE `sys_menu` SET `menu_name` = '系统运维' WHERE `menu_name` = '系统监控';
 UPDATE `sys_menu` SET `order_num` = 30 WHERE `menu_name` = '系统运维';
 UPDATE `sys_menu` SET `order_num` = 999 WHERE `menu_name` = '登记簿批量导出' limit 1;
+
+DELIMITER ??
+DROP PROCEDURE
+    IF
+        EXISTS schema_change ?? CREATE PROCEDURE schema_change () BEGIN
+    -- 安全责任书增加甲方乙方
+    IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () AND TABLE_NAME = 'core_safety_book_user' AND COLUMN_NAME = 'party_a' ) THEN
+        ALTER TABLE `core_safety_book_user` ADD COLUMN `party_a` VARCHAR ( 255 ) NULL COMMENT '甲方';
+
+    END IF;
+    IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () AND TABLE_NAME = 'core_safety_book_user' AND COLUMN_NAME = 'party_b' ) THEN
+        ALTER TABLE `core_safety_book_user` ADD COLUMN `party_b` VARCHAR ( 255 ) NULL COMMENT '乙方';
+
+    END IF;
+    IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () AND TABLE_NAME = 'core_safety_book_user' AND COLUMN_NAME = 'party_a_org' ) THEN
+        ALTER TABLE `core_safety_book_user` ADD COLUMN `party_a_org` VARCHAR ( 255 ) NULL COMMENT '甲方机构';
+
+    END IF;
+    IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () AND TABLE_NAME = 'core_safety_book_user' AND COLUMN_NAME = 'party_b_org' ) THEN
+        ALTER TABLE `core_safety_book_user` ADD COLUMN `party_b_org` VARCHAR ( 255 ) NULL COMMENT '乙方机构';
+
+    END IF;
+
+END ??
+DELIMITER;
+CALL schema_change ();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/domain/CoreSafetyBookUser.java

@@ -54,7 +54,10 @@ public class CoreSafetyBookUser extends BaseEntity {
     private String userName;
     @TableField(exist = false)
     private List<String> names;
-
+    private String partyA;
+    private String partyAOrg;
+    private String partyB;
+    private String partyBOrg;
     /**
      * 签署时间
      */

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

@@ -93,14 +93,14 @@ public class CoreSafetyBookServiceImpl extends ServiceImpl<CoreSafetyBookMapper,
             u.setBookId(coreSafetyBook.getId());
             coreSafetyBookUserMapper.insert(u);
             //处理用户信息
-            coreSafetyBookUserIdMapper.delete(new LambdaQueryWrapper<CoreSafetyBookUserId>().eq(CoreSafetyBookUserId::getBookUserId, u.getId()));
-            for (Long l :
-                    u.getUserIds()) {
-                CoreSafetyBookUserId i = new CoreSafetyBookUserId();
-                i.setUserId(l);
-                i.setBookUserId(u.getId());
-                coreSafetyBookUserIdMapper.insert(i);
-            }
+//            coreSafetyBookUserIdMapper.delete(new LambdaQueryWrapper<CoreSafetyBookUserId>().eq(CoreSafetyBookUserId::getBookUserId, u.getId()));
+//            for (Long l :
+//                    u.getUserIds()) {
+//                CoreSafetyBookUserId i = new CoreSafetyBookUserId();
+//                i.setUserId(l);
+//                i.setBookUserId(u.getId());
+//                coreSafetyBookUserIdMapper.insert(i);
+//            }
             //处理文件信息
             coreSafetyBookBookFilesMapper.delete(new LambdaQueryWrapper<CoreSafetyBookBookFiles>().eq(CoreSafetyBookBookFiles::getBookUserId, u.getId()));
             for (CoreSafetyBookBookFilesVo file :
@@ -126,8 +126,8 @@ public class CoreSafetyBookServiceImpl extends ServiceImpl<CoreSafetyBookMapper,
         List<CoreSafetyBookUser> coreSafetyBookUsers = coreSafetyBookUserMapper.selectByBookId(id);
         for (CoreSafetyBookUser s :
                 coreSafetyBookUsers) {
-            s.setNames(Collections.singletonList(s.getUserName()));
-            s.setUserIds(caseString(s.getUserId()));
+//            s.setNames(Collections.singletonList(s.getUserName()));
+//            s.setUserIds(caseString(s.getUserId()));
             s.setFiles(coreSafetyBookBookFilesMapper.selecVotList(s.getId()));
         }
         coreSafetyBook.setBookUsers(coreSafetyBookUsers);

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

@@ -60,6 +60,10 @@
                u.update_time,
                u.book_id,
                u.time,
+               u.party_a,
+               u.party_a_org,
+               u.party_b,
+               u.party_b_org,
                group_concat(su.name) as user_name,
                group_concat(su.id)   as user_id
         from core_safety_book_user u