文书档案变更

project_data/sql/0.0.4/soc/soc.sql

@@ -114,6 +114,12 @@ delete from sys_menu where id = 01730111975367106562;
 INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01730111975367106562, '演练统计排行', 1719287834364436482, 701, 'core/reportForms/drill', 'core/reportForms/drill', NULL, 1, 0, 'C', '0', '0', NULL, '1', 'chart', NULL, NULL, NOW(),NULL , NOW(), NULL);
 delete from sys_role_menu where menu_id=01730111975367106562;
 insert into sys_role_menu select  id,01730111975367106562 from sys_role where org_type in (1,2,3);
+-- 添加行社高管部署登记主持人字典
+DELETE FROM `sys_dict_type` WHERE `dict_type`='hsggbsdj_role';
+INSERT INTO `sys_dict_type`(`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113159, '行社高管部署登记主持人', 'hsggbsdj_role', '0', '省联社账号', '2023-12-05 14:56:22', '', NULL, NULL);
+DELETE FROM `sys_dict_data` WHERE `dict_type`='hsggbsdj_role';
+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, '董事长', '1', 'hsggbsdj_role', NULL, 'default', 'N', '0', '省联社账号', '2023-12-05 14:56:48', '', 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 ( 0, '行长', '2', 'hsggbsdj_role', NULL, 'default', 'N', '0', '省联社账号', '2023-12-05 14:56:55', '', NULL, NULL);
 
 
 
@@ -182,6 +188,12 @@ DROP PROCEDURE
         ALTER TABLE `core_safety_book_user` ADD COLUMN `party_b_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_hsggbsdj' AND COLUMN_NAME = 'role_id' ) THEN
+        ALTER TABLE `core_safety_book_hsggbsdj` ADD COLUMN `role_id` bigint NULL COMMENT '主持人';
+
+    END IF;
 
     IF
 NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () AND TABLE_NAME = 'sys_device' AND COLUMN_NAME = 'definition' ) THEN

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

@@ -48,6 +48,7 @@ public class CoreSafetyBookHsggbsdj extends BaseEntity {
     private String userNames;
     @ApiModelProperty(value = "机构id")
     private Long orgId;
+    private Long roleId;
     @TableField(exist = false)
     private String orgName;
     /**

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

@@ -75,10 +75,10 @@ public class CoreSafetyBookHsggbsdjServiceImpl extends ServiceImpl<CoreSafetyBoo
     @Override
     public CoreSafetyBookHsggbsdj selectCoreSafetyBookHsggbsdjById(Long id) {
         CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj = coreSafetyBookHsggbsdjMapper.selectHsggbsdjById(id);
-        List<CoreSafetyBookHsggbsdjUser> coreSafetyBookHsggbsdjUsers = coreSafetyBookHsggbsdjUserMapper.selectList(new LambdaQueryWrapper<CoreSafetyBookHsggbsdjUser>().eq(CoreSafetyBookHsggbsdjUser::getHsggbsdjId, id));
-        if(coreSafetyBookHsggbsdjUsers!=null&&coreSafetyBookHsggbsdjUsers.size()>0) {
-            coreSafetyBookHsggbsdj.setUserIds(coreSafetyBookHsggbsdjUsers.stream().map(CoreSafetyBookHsggbsdjUser::getUserId).collect(Collectors.toList()));
-        }
+//        List<CoreSafetyBookHsggbsdjUser> coreSafetyBookHsggbsdjUsers = coreSafetyBookHsggbsdjUserMapper.selectList(new LambdaQueryWrapper<CoreSafetyBookHsggbsdjUser>().eq(CoreSafetyBookHsggbsdjUser::getHsggbsdjId, id));
+//        if(coreSafetyBookHsggbsdjUsers!=null&&coreSafetyBookHsggbsdjUsers.size()>0) {
+//            coreSafetyBookHsggbsdj.setUserIds(coreSafetyBookHsggbsdjUsers.stream().map(CoreSafetyBookHsggbsdjUser::getUserId).collect(Collectors.toList()));
+//        }
         coreSafetyBookHsggbsdj.setImages(coreSafetyBookBookFilesMapper.selecVotList(coreSafetyBookHsggbsdj.getId()));
         return coreSafetyBookHsggbsdj;
     }
@@ -105,10 +105,10 @@ public class CoreSafetyBookHsggbsdjServiceImpl extends ServiceImpl<CoreSafetyBoo
         coreSafetyBookHsggbsdj.setCreateTime(DateUtils.getNowDate());
         coreSafetyBookHsggbsdj.setCreateBy(SecurityUtils.getUserId().toString());
         coreSafetyBookHsggbsdjMapper.insert(coreSafetyBookHsggbsdj);
-        for (Long id :
-                coreSafetyBookHsggbsdj.getUserIds()) {
-            coreSafetyBookHsggbsdjUserMapper.insert(new CoreSafetyBookHsggbsdjUser(coreSafetyBookHsggbsdj.getId(), id));
-        }
+//        for (Long id :
+//                coreSafetyBookHsggbsdj.getUserIds()) {
+//            coreSafetyBookHsggbsdjUserMapper.insert(new CoreSafetyBookHsggbsdjUser(coreSafetyBookHsggbsdj.getId(), id));
+//        }
         for (CoreSafetyBookBookFilesVo file :
                 coreSafetyBookHsggbsdj.getImages()) {
             coreSafetyBookBookFilesMapper.insert(new CoreSafetyBookBookFiles(coreSafetyBookHsggbsdj.getId(), file.getName(), file.getUrl()));
@@ -126,11 +126,11 @@ public class CoreSafetyBookHsggbsdjServiceImpl extends ServiceImpl<CoreSafetyBoo
     public int updateCoreSafetyBookHsggbsdj(CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj) {
         coreSafetyBookHsggbsdj.setUpdateTime(DateUtils.getNowDate());
         coreSafetyBookHsggbsdj.setUpdateBy(SecurityUtils.getUserId().toString());
-        coreSafetyBookHsggbsdjUserMapper.delete(new LambdaQueryWrapper<CoreSafetyBookHsggbsdjUser>().eq(CoreSafetyBookHsggbsdjUser::getHsggbsdjId, coreSafetyBookHsggbsdj.getId()));
-        for (Long id :
-                coreSafetyBookHsggbsdj.getUserIds()) {
-            coreSafetyBookHsggbsdjUserMapper.insert(new CoreSafetyBookHsggbsdjUser(coreSafetyBookHsggbsdj.getId(), id));
-        }
+//        coreSafetyBookHsggbsdjUserMapper.delete(new LambdaQueryWrapper<CoreSafetyBookHsggbsdjUser>().eq(CoreSafetyBookHsggbsdjUser::getHsggbsdjId, coreSafetyBookHsggbsdj.getId()));
+//        for (Long id :
+//                coreSafetyBookHsggbsdj.getUserIds()) {
+//            coreSafetyBookHsggbsdjUserMapper.insert(new CoreSafetyBookHsggbsdjUser(coreSafetyBookHsggbsdj.getId(), id));
+//        }
         coreSafetyBookBookFilesMapper.delete(new LambdaQueryWrapper<CoreSafetyBookBookFiles>().eq(CoreSafetyBookBookFiles::getBookUserId, coreSafetyBookHsggbsdj.getId()));
         for (CoreSafetyBookBookFilesVo file :
                 coreSafetyBookHsggbsdj.getImages()) {
@@ -147,7 +147,7 @@ public class CoreSafetyBookHsggbsdjServiceImpl extends ServiceImpl<CoreSafetyBoo
      */
     @Override
     public int deleteCoreSafetyBookHsggbsdjByIds(Long[] ids) {
-        coreSafetyBookHsggbsdjUserMapper.delete(new LambdaQueryWrapper<CoreSafetyBookHsggbsdjUser>().in(CoreSafetyBookHsggbsdjUser::getHsggbsdjId, Arrays.asList(ids)));
+//        coreSafetyBookHsggbsdjUserMapper.delete(new LambdaQueryWrapper<CoreSafetyBookHsggbsdjUser>().in(CoreSafetyBookHsggbsdjUser::getHsggbsdjId, Arrays.asList(ids)));
         return coreSafetyBookHsggbsdjMapper.deleteBatchIds(Arrays.asList((ids)));
     }
 

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

@@ -51,32 +51,32 @@
     </select>
     <select id="selectHsggbsdjPage" resultType="com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj">
         SELECT
-            h.id,
-            h.title,
-            h.date,
-            h.content,
-            h.create_time,
-            h.update_time,
-            h.create_by,
-            h.update_by,
-               h.join_names,
-               o.short_name as org_name,
-            group_concat( u.NAME ) AS userNames
+        h.id,
+        h.title,
+        h.date,
+        h.content,
+        h.create_time,
+        h.update_time,
+        h.create_by,
+        h.update_by,
+        h.join_names,
+        o.short_name as org_name,
+        group_concat( u.NAME ) AS userNames
         FROM
-            core_safety_book_hsggbsdj h
-                LEFT JOIN core_safety_book_hsggbsdj_user hu ON hu.hsggbsdj_id = h.id
-                LEFT JOIN sys_user u ON u.id = hu.user_id
+        core_safety_book_hsggbsdj h
+        LEFT JOIN core_safety_book_hsggbsdj_user hu ON hu.hsggbsdj_id = h.id
+        LEFT JOIN sys_user u ON u.id = hu.user_id
         left join sys_org o on o.id =h.org_id
 
         <where>
             <if test="hs.title != null  and hs.title != ''">
                 and h.title like concat(concat('%', #{hs.title}),'%')
             </if>
-<!--            <if test="hs.orgId != null ">-->
-<!--                and h.org_id = #{hs.orgId}-->
-<!--            </if>-->
+            <!--            <if test="hs.orgId != null ">-->
+            <!--                and h.org_id = #{hs.orgId}-->
+            <!--            </if>-->
             <if test="hs.range!=null and hs.range.size >1">
-                and  h.date <![CDATA[>=]]>  #{hs.range[0]} and h.date  <![CDATA[<=]]> #{hs.range[1]}
+                and h.date <![CDATA[>=]]>  #{hs.range[0]} and h.date  <![CDATA[<=]]> #{hs.range[1]}
             </if>
             <if test="hs.checkSub ==true">
                 and o.path like concat(#{hs.selectOrgPath},'%')
@@ -89,27 +89,25 @@
         h.id
     </select>
     <select id="selectHsggbsdjById" resultType="com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj">
-        SELECT
-        h.id,
-        h.title,
-        h.date,
-        h.content,
-        h.create_time,
-        h.update_time,
-        h.create_by,
-        h.update_by,
+        SELECT h.id,
+               h.title,
+               h.date,
+               h.content,
+               h.create_time,
+               h.update_time,
+               h.create_by,
+               h.update_by,
                h.join_names,
-        o.short_name as org_name,
+               o.short_name         as org_name,
                h.org_id,
-        group_concat( u.NAME ) AS userNames
-        FROM
-        core_safety_book_hsggbsdj h
-        LEFT JOIN core_safety_book_hsggbsdj_user hu ON hu.hsggbsdj_id = h.id
-        LEFT JOIN sys_user u ON u.id = hu.user_id
-        left join sys_org o on o.id =h.org_id
-        where h.id=#{id}
-        GROUP BY
-        h.id,h.create_time
+               h.role_id,
+               group_concat(u.NAME) AS userNames
+        FROM core_safety_book_hsggbsdj h
+                 LEFT JOIN core_safety_book_hsggbsdj_user hu ON hu.hsggbsdj_id = h.id
+                 LEFT JOIN sys_user u ON u.id = hu.user_id
+                 left join sys_org o on o.id = h.org_id
+        where h.id = #{id}
+        GROUP BY h.id, h.create_time
         order by h.create_time desc
 
     </select>