Merge remote-tracking branch 'origin/V0.0.4' into V0.0.4

project_data/sql/0.0.4/soc/soc.sql

@@ -19,4 +19,16 @@ INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 1729308502301728
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 1729308502301728769);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 1729308502301728769);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 1729308502301728769);
-INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 1729308502301728769);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 1729308502301728769);
+-- 文书档案文件表
+CREATE TABLE if not exists `core_safety_book_book_files` (
+                                               `id` bigint NOT NULL,
+                                               `book_user_id` bigint DEFAULT NULL,
+                                               `name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
+                                               `url` varchar(2000) COLLATE utf8mb4_general_ci DEFAULT NULL,
+                                               `create_by` bigint DEFAULT NULL COMMENT '创建人id',
+                                               `create_time` datetime(6) DEFAULT NULL COMMENT '创建时间',
+                                               `update_by` bigint DEFAULT NULL COMMENT '修改人id',
+                                               `update_time` datetime(6) DEFAULT NULL COMMENT '更新时间',
+                                               PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;

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

@@ -67,7 +67,8 @@ public class CoreSafetyBookAqbwbndjh extends BaseEntity {
      * 照片
      */
     @ApiModelProperty(value = "照片")
-    private String images;
+    @TableField(exist = false)
+    private List<CoreSafetyBookBookFilesVo> images;
 
     /**
      * 机构id

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

@@ -0,0 +1,91 @@
+package com.xunmei.core.safetybook.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.xunmei.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 core_safety_book_book_files
+ *
+ * @author xunmei
+ * @date 2023-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("core_safety_book_book_files")
+@ApiModel(value = "CoreSafetyBookBookFiles对象", description = "【请填写功能名称】")
+public class CoreSafetyBookBookFiles extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    public CoreSafetyBookBookFiles(Long bookUserId, String name, String url) {
+        this.bookUserId = bookUserId;
+        this.name = name;
+        this.url = url;
+    }
+
+    public CoreSafetyBookBookFiles() {
+    }
+
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "${comment}", notes = "$column.readConverterExp()")
+    private Long bookUserId;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "${comment}", notes = "$column.readConverterExp()")
+    private String name;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "${comment}", notes = "$column.readConverterExp()")
+    private String url;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+
+
+                .append("id", getId())
+
+
+                .append("bookUserId", getBookUserId())
+
+
+                .append("name", getName())
+
+
+                .append("url", getUrl())
+
+
+                .append("createBy", getCreateBy())
+
+
+                .append("createTime", getCreateTime())
+
+
+                .append("updateBy", getUpdateBy())
+
+
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

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

@@ -0,0 +1,10 @@
+package com.xunmei.core.safetybook.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+@Data
+public class CoreSafetyBookBookFilesVo {
+    private String name;
+    private String url;
+}

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

@@ -67,7 +67,8 @@ public class CoreSafetyBookHsggbsdj extends BaseEntity {
      * 照片
      */
     @ApiModelProperty(value = "照片")
-    private String images;
+    @TableField(exist = false)
+    private List<CoreSafetyBookBookFilesVo> images;
     @ApiModelProperty(value = "参会人员")
     private String joinNames;
     @TableField(exist = false)

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

@@ -66,7 +66,8 @@ public class CoreSafetyBookUser extends BaseEntity {
      * 签署文件
      */
     @ApiModelProperty(value = "签署文件")
-    private String files;
+    @TableField(exist = false)
+    private List<CoreSafetyBookBookFilesVo> files;
 
 
     @Override
@@ -95,7 +96,6 @@ public class CoreSafetyBookUser extends BaseEntity {
                 .append("time", getTime())
 
 
-                .append("files", getFiles())
                 .toString();
     }
 }

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

@@ -0,0 +1,65 @@
+package com.xunmei.core.safetybook.mapper;
+
+import java.util.List;
+
+import com.xunmei.core.safetybook.domain.CoreSafetyBookBookFiles;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.core.safetybook.domain.CoreSafetyBookBookFilesVo;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author xunmei
+ * @date 2023-11-28
+ */
+public interface CoreSafetyBookBookFilesMapper extends BaseMapper<CoreSafetyBookBookFiles> {
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    CoreSafetyBookBookFiles selectCoreSafetyBookBookFilesById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param coreSafetyBookBookFiles 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    List<CoreSafetyBookBookFiles> selectCoreSafetyBookBookFilesList(CoreSafetyBookBookFiles coreSafetyBookBookFiles);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param coreSafetyBookBookFiles 【请填写功能名称】
+     * @return 结果
+     */
+    int insertCoreSafetyBookBookFiles(CoreSafetyBookBookFiles coreSafetyBookBookFiles);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param coreSafetyBookBookFiles 【请填写功能名称】
+     * @return 结果
+     */
+    int updateCoreSafetyBookBookFiles(CoreSafetyBookBookFiles coreSafetyBookBookFiles);
+
+    /**
+     * 删除【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    int deleteCoreSafetyBookBookFilesById(Long id);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteCoreSafetyBookBookFilesByIds(Long[] ids);
+
+    List<CoreSafetyBookBookFilesVo> selecVotList(Long id);
+}

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

@@ -0,0 +1,72 @@
+package com.xunmei.core.safetybook.service;
+
+import java.util.List;
+
+import com.xunmei.core.safetybook.domain.CoreSafetyBookBookFiles;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author xunmei
+ * @date 2023-11-28
+ */
+public interface ICoreSafetyBookBookFilesService extends IService<CoreSafetyBookBookFiles> {
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    CoreSafetyBookBookFiles selectCoreSafetyBookBookFilesById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param coreSafetyBookBookFiles 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    List<CoreSafetyBookBookFiles> selectCoreSafetyBookBookFilesList(CoreSafetyBookBookFiles coreSafetyBookBookFiles);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param coreSafetyBookBookFiles 【请填写功能名称】
+     * @return 结果
+     */
+    int insertCoreSafetyBookBookFiles(CoreSafetyBookBookFiles coreSafetyBookBookFiles);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param coreSafetyBookBookFiles 【请填写功能名称】
+     * @return 结果
+     */
+    int updateCoreSafetyBookBookFiles(CoreSafetyBookBookFiles coreSafetyBookBookFiles);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的【请填写功能名称】主键集合
+     * @return 结果
+     */
+    int deleteCoreSafetyBookBookFilesByIds(Long[] ids);
+
+    /**
+     * 删除【请填写功能名称】信息
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    int deleteCoreSafetyBookBookFilesById(Long id);
+
+    /**
+     * 查询【请填写功能名称】分页数据
+     *
+     * @param coreSafetyBookBookFiles 查询条件对象
+     * @return Page
+     */
+    TableDataInfo<CoreSafetyBookBookFiles> selectPage(CoreSafetyBookBookFiles coreSafetyBookBookFiles);
+}

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

@@ -6,11 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
-import com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjh;
-import com.xunmei.core.safetybook.domain.CoreSafetyBookAqbwbndjhUser;
-import com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdjUser;
+import com.xunmei.core.safetybook.domain.*;
 import com.xunmei.core.safetybook.mapper.CoreSafetyBookAqbwbndjhMapper;
 import com.xunmei.core.safetybook.mapper.CoreSafetyBookAqbwbndjhUserMapper;
+import com.xunmei.core.safetybook.mapper.CoreSafetyBookBookFilesMapper;
 import com.xunmei.core.safetybook.mapper.CoreSafetyBookHsggbsdjUserMapper;
 import com.xunmei.core.safetybook.service.ICoreSafetyBookAqbwbndjhService;
 import com.xunmei.system.api.RemoteOrgService;
@@ -40,6 +39,9 @@ public class CoreSafetyBookAqbwbndjhServiceImpl extends ServiceImpl<CoreSafetyBo
     private RemoteOrgService orgService;
     @Autowired
     private CoreSafetyBookAqbwbndjhUserMapper coreSafetyBookAqbwbndjhUserMapper;
+    @Autowired
+    private CoreSafetyBookBookFilesMapper coreSafetyBookBookFilesMapper;
+
     @Override
     public TableDataInfo<CoreSafetyBookAqbwbndjh> selectPage(CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh) {
         //未删除
@@ -73,9 +75,10 @@ public class CoreSafetyBookAqbwbndjhServiceImpl extends ServiceImpl<CoreSafetyBo
     public CoreSafetyBookAqbwbndjh selectCoreSafetyBookAqbwbndjhById(Long id) {
         CoreSafetyBookAqbwbndjh coreSafetyBookAqbwbndjh = coreSafetyBookAqbwbndjhMapper.selectAqbwbndjhById(id);
         List<CoreSafetyBookAqbwbndjhUser> coreSafetyBookAqbwbndjhUsers = coreSafetyBookAqbwbndjhUserMapper.selectList(new LambdaQueryWrapper<CoreSafetyBookAqbwbndjhUser>().eq(CoreSafetyBookAqbwbndjhUser::getAqbwbndjhId, id));
-        if(coreSafetyBookAqbwbndjhUsers!=null&&coreSafetyBookAqbwbndjhUsers.size()>0) {
+        if (coreSafetyBookAqbwbndjhUsers != null && coreSafetyBookAqbwbndjhUsers.size() > 0) {
             coreSafetyBookAqbwbndjh.setUserIds(coreSafetyBookAqbwbndjhUsers.stream().map(CoreSafetyBookAqbwbndjhUser::getUserId).collect(Collectors.toList()));
         }
+        coreSafetyBookAqbwbndjh.setImages(coreSafetyBookBookFilesMapper.selecVotList(coreSafetyBookAqbwbndjh.getId()));
         return coreSafetyBookAqbwbndjh;
     }
 
@@ -105,6 +108,10 @@ public class CoreSafetyBookAqbwbndjhServiceImpl extends ServiceImpl<CoreSafetyBo
 //                coreSafetyBookAqbwbndjh.getUserIds()) {
 //            coreSafetyBookAqbwbndjhUserMapper.insert(new CoreSafetyBookAqbwbndjhUser(coreSafetyBookAqbwbndjh.getId(), id));
 //        }
+        for (CoreSafetyBookBookFilesVo file :
+                coreSafetyBookAqbwbndjh.getImages()) {
+            coreSafetyBookBookFilesMapper.insert(new CoreSafetyBookBookFiles(coreSafetyBookAqbwbndjh.getId(), file.getName(), file.getUrl()));
+        }
         return 1;
     }
 
@@ -123,6 +130,11 @@ public class CoreSafetyBookAqbwbndjhServiceImpl extends ServiceImpl<CoreSafetyBo
 //                coreSafetyBookAqbwbndjh.getUserIds()) {
 //            coreSafetyBookAqbwbndjhUserMapper.insert(new CoreSafetyBookAqbwbndjhUser(coreSafetyBookAqbwbndjh.getId(), id));
 //        }
+        coreSafetyBookBookFilesMapper.delete(new LambdaQueryWrapper<CoreSafetyBookBookFiles>().eq(CoreSafetyBookBookFiles::getBookUserId, coreSafetyBookAqbwbndjh.getId()));
+        for (CoreSafetyBookBookFilesVo file :
+                coreSafetyBookAqbwbndjh.getImages()) {
+            coreSafetyBookBookFilesMapper.insert(new CoreSafetyBookBookFiles(coreSafetyBookAqbwbndjh.getId(), file.getName(), file.getUrl()));
+        }
         return coreSafetyBookAqbwbndjhMapper.updateById(coreSafetyBookAqbwbndjh);
     }
 

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

@@ -0,0 +1,124 @@
+package com.xunmei.core.safetybook.service.impl;
+
+import java.util.List;
+
+import com.xunmei.common.core.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.safetybook.mapper.CoreSafetyBookBookFilesMapper;
+import com.xunmei.core.safetybook.domain.CoreSafetyBookBookFiles;
+import com.xunmei.core.safetybook.service.ICoreSafetyBookBookFilesService;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author xunmei
+ * @date 2023-11-28
+ */
+@Service
+public class CoreSafetyBookBookFilesServiceImpl extends ServiceImpl<CoreSafetyBookBookFilesMapper, CoreSafetyBookBookFiles> implements ICoreSafetyBookBookFilesService {
+    @Autowired
+    private CoreSafetyBookBookFilesMapper coreSafetyBookBookFilesMapper;
+
+    @Override
+    public TableDataInfo<CoreSafetyBookBookFiles> selectPage(CoreSafetyBookBookFiles coreSafetyBookBookFiles) {
+        //未删除
+        Page<CoreSafetyBookBookFiles> page;
+        //分页
+        if (coreSafetyBookBookFiles.getPageNum() != null && coreSafetyBookBookFiles.getPageSize() != null) {
+            page = new Page<>(coreSafetyBookBookFiles.getPageNum(), coreSafetyBookBookFiles.getPageSize());
+        } else {
+            page = new Page<>();
+        }
+        //查询条件
+        QueryWrapper<CoreSafetyBookBookFiles> query = new QueryWrapper<>(coreSafetyBookBookFiles);
+        //下穿
+
+        //时间范围查询
+        if (coreSafetyBookBookFiles.getParams().get("beginTime") != null && coreSafetyBookBookFiles.getParams().get("endTime") != null) {
+            query.between("create_time", coreSafetyBookBookFiles.getParams().get("beginTime"), coreSafetyBookBookFiles.getParams().get("endTime"));
+        }
+        //获取数据
+        page = coreSafetyBookBookFilesMapper.selectPage(page, query);
+        //抓换为TableDataInfo适配前端
+        return TableDataInfo.build(page);
+
+
+    }
+
+
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public CoreSafetyBookBookFiles selectCoreSafetyBookBookFilesById(Long id) {
+        return coreSafetyBookBookFilesMapper.selectById(id);
+    }
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param coreSafetyBookBookFiles 【请填写功能名称】
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<CoreSafetyBookBookFiles> selectCoreSafetyBookBookFilesList(CoreSafetyBookBookFiles coreSafetyBookBookFiles) {
+        return coreSafetyBookBookFilesMapper.selectList(new QueryWrapper<>(coreSafetyBookBookFiles));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param coreSafetyBookBookFiles 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int insertCoreSafetyBookBookFiles(CoreSafetyBookBookFiles coreSafetyBookBookFiles) {
+        coreSafetyBookBookFiles.setCreateTime(DateUtils.getNowDate());
+        return coreSafetyBookBookFilesMapper.insert(coreSafetyBookBookFiles);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param coreSafetyBookBookFiles 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int updateCoreSafetyBookBookFiles(CoreSafetyBookBookFiles coreSafetyBookBookFiles) {
+        coreSafetyBookBookFiles.setUpdateTime(DateUtils.getNowDate());
+        return coreSafetyBookBookFilesMapper.updateById(coreSafetyBookBookFiles);
+    }
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreSafetyBookBookFilesByIds(Long[] ids) {
+        return coreSafetyBookBookFilesMapper.deleteBatchIds(Arrays.asList((ids)));
+    }
+
+    /**
+     * 删除【请填写功能名称】信息
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreSafetyBookBookFilesById(Long id) {
+        return coreSafetyBookBookFilesMapper.deleteById(id);
+    }
+}

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

@@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.safetybook.domain.CoreSafetyBookBookFiles;
+import com.xunmei.core.safetybook.domain.CoreSafetyBookBookFilesVo;
 import com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj;
 import com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdjUser;
+import com.xunmei.core.safetybook.mapper.CoreSafetyBookBookFilesMapper;
 import com.xunmei.core.safetybook.mapper.CoreSafetyBookHsggbsdjMapper;
 import com.xunmei.core.safetybook.mapper.CoreSafetyBookHsggbsdjUserMapper;
 import com.xunmei.core.safetybook.service.ICoreSafetyBookHsggbsdjService;
@@ -38,7 +41,8 @@ public class CoreSafetyBookHsggbsdjServiceImpl extends ServiceImpl<CoreSafetyBoo
     private RemoteOrgService orgService;
     @Autowired
     private CoreSafetyBookHsggbsdjUserMapper coreSafetyBookHsggbsdjUserMapper;
-
+    @Autowired
+    private CoreSafetyBookBookFilesMapper coreSafetyBookBookFilesMapper;
     @Override
     public TableDataInfo<CoreSafetyBookHsggbsdj> selectPage(CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj) {
         //未删除
@@ -75,6 +79,7 @@ public class CoreSafetyBookHsggbsdjServiceImpl extends ServiceImpl<CoreSafetyBoo
         if(coreSafetyBookHsggbsdjUsers!=null&&coreSafetyBookHsggbsdjUsers.size()>0) {
             coreSafetyBookHsggbsdj.setUserIds(coreSafetyBookHsggbsdjUsers.stream().map(CoreSafetyBookHsggbsdjUser::getUserId).collect(Collectors.toList()));
         }
+        coreSafetyBookHsggbsdj.setImages(coreSafetyBookBookFilesMapper.selecVotList(coreSafetyBookHsggbsdj.getId()));
         return coreSafetyBookHsggbsdj;
     }
 
@@ -104,6 +109,10 @@ public class CoreSafetyBookHsggbsdjServiceImpl extends ServiceImpl<CoreSafetyBoo
                 coreSafetyBookHsggbsdj.getUserIds()) {
             coreSafetyBookHsggbsdjUserMapper.insert(new CoreSafetyBookHsggbsdjUser(coreSafetyBookHsggbsdj.getId(), id));
         }
+        for (CoreSafetyBookBookFilesVo file :
+                coreSafetyBookHsggbsdj.getImages()) {
+            coreSafetyBookBookFilesMapper.insert(new CoreSafetyBookBookFiles(coreSafetyBookHsggbsdj.getId(), file.getName(), file.getUrl()));
+        }
         return 1;
     }
 
@@ -122,6 +131,11 @@ public class CoreSafetyBookHsggbsdjServiceImpl extends ServiceImpl<CoreSafetyBoo
                 coreSafetyBookHsggbsdj.getUserIds()) {
             coreSafetyBookHsggbsdjUserMapper.insert(new CoreSafetyBookHsggbsdjUser(coreSafetyBookHsggbsdj.getId(), id));
         }
+        coreSafetyBookBookFilesMapper.delete(new LambdaQueryWrapper<CoreSafetyBookBookFiles>().eq(CoreSafetyBookBookFiles::getBookUserId, coreSafetyBookHsggbsdj.getId()));
+        for (CoreSafetyBookBookFilesVo file :
+                coreSafetyBookHsggbsdj.getImages()) {
+            coreSafetyBookBookFilesMapper.insert(new CoreSafetyBookBookFiles(coreSafetyBookHsggbsdj.getId(), file.getName(), file.getUrl()));
+        }
         return coreSafetyBookHsggbsdjMapper.updateById(coreSafetyBookHsggbsdj);
     }
 

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

@@ -7,9 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
-import com.xunmei.core.safetybook.domain.CoreSafetyBook;
-import com.xunmei.core.safetybook.domain.CoreSafetyBookUser;
-import com.xunmei.core.safetybook.domain.CoreSafetyBookUserId;
+import com.xunmei.core.safetybook.domain.*;
+import com.xunmei.core.safetybook.mapper.CoreSafetyBookBookFilesMapper;
 import com.xunmei.core.safetybook.mapper.CoreSafetyBookMapper;
 import com.xunmei.core.safetybook.mapper.CoreSafetyBookUserIdMapper;
 import com.xunmei.core.safetybook.mapper.CoreSafetyBookUserMapper;
@@ -40,6 +39,8 @@ public class CoreSafetyBookServiceImpl extends ServiceImpl<CoreSafetyBookMapper,
     private CoreSafetyBookUserMapper coreSafetyBookUserMapper;
     @Autowired
     private CoreSafetyBookUserIdMapper coreSafetyBookUserIdMapper;
+    @Autowired
+    private CoreSafetyBookBookFilesMapper coreSafetyBookBookFilesMapper;
 
     @Override
     public TableDataInfo<CoreSafetyBook> selectPage(CoreSafetyBook coreSafetyBook) {
@@ -73,7 +74,7 @@ public class CoreSafetyBookServiceImpl extends ServiceImpl<CoreSafetyBookMapper,
             baseMapper.updateById(coreSafetyBook);
         } else {
             Long count = baseMapper.selectCount(new LambdaQueryWrapper<CoreSafetyBook>().eq(CoreSafetyBook::getOrgId, coreSafetyBook.getOrgId()).eq(CoreSafetyBook::getType, coreSafetyBook.getType()).eq(CoreSafetyBook::getYear, coreSafetyBook.getYear()));
-            if (count>0){
+            if (count > 0) {
                 throw new RuntimeException("指定机构已存在当前年度相同类型责任书!");
             }
             //新增
@@ -100,9 +101,15 @@ public class CoreSafetyBookServiceImpl extends ServiceImpl<CoreSafetyBookMapper,
                 i.setBookUserId(u.getId());
                 coreSafetyBookUserIdMapper.insert(i);
             }
+            //处理文件信息
+            coreSafetyBookBookFilesMapper.delete(new LambdaQueryWrapper<CoreSafetyBookBookFiles>().eq(CoreSafetyBookBookFiles::getBookUserId, u.getId()));
+            for (CoreSafetyBookBookFilesVo file :
+                    u.getFiles()) {
+                coreSafetyBookBookFilesMapper.insert(new CoreSafetyBookBookFiles(u.getId(), file.getName(), file.getUrl()));
 
-
+            }
         }
+
         return 0;
     }
 
@@ -121,6 +128,7 @@ public class CoreSafetyBookServiceImpl extends ServiceImpl<CoreSafetyBookMapper,
                 coreSafetyBookUsers) {
             s.setNames(Collections.singletonList(s.getUserName()));
             s.setUserIds(caseString(s.getUserId()));
+            s.setFiles(coreSafetyBookBookFilesMapper.selecVotList(s.getId()));
         }
         coreSafetyBook.setBookUsers(coreSafetyBookUsers);
         return coreSafetyBook;

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

@@ -13,7 +13,6 @@
         <result property="updateTime" column="update_time"/>
         <result property="createBy" column="create_by"/>
         <result property="updateBy" column="update_by"/>
-        <result property="images" column="images"/>
         <result property="orgId" column="org_id"/>
     </resultMap>
 
@@ -26,7 +25,6 @@
                update_time,
                create_by,
                update_by,
-               images,
                org_id
         from core_safety_book_aqbwbndjh
     </sql>
@@ -45,9 +43,6 @@
             <if test="content != null  and content != ''">
                 and content = #{content}
             </if>
-            <if test="images != null  and images != ''">
-                and images = #{images}
-            </if>
             <if test="orgId != null ">
                 and org_id = #{orgId}
             </if>
@@ -68,7 +63,6 @@
         a.update_time,
         a.create_by,
         a.update_by,
-        a.images,
         a.org_id,
         a.type,
         a.year,
@@ -110,7 +104,6 @@
                a.update_time,
                a.create_by,
                a.update_by,
-               a.images,
                a.org_id,
                a.type,
                a.year,
@@ -145,8 +138,6 @@
             </if>
             <if test="updateBy != null">update_by,
             </if>
-            <if test="images != null">images,
-            </if>
             <if test="orgId != null">org_id,
             </if>
         </trim>
@@ -167,8 +158,6 @@
             </if>
             <if test="updateBy != null">#{updateBy},
             </if>
-            <if test="images != null">#{images},
-            </if>
             <if test="orgId != null">#{orgId},
             </if>
         </trim>
@@ -199,9 +188,6 @@
             <if test="updateBy != null">update_by =
                 #{updateBy},
             </if>
-            <if test="images != null">images =
-                #{images},
-            </if>
             <if test="orgId != null">org_id =
                 #{orgId},
             </if>

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

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xunmei.core.safetybook.mapper.CoreSafetyBookBookFilesMapper">
+
+    <resultMap type="com.xunmei.core.safetybook.domain.CoreSafetyBookBookFiles" id="CoreSafetyBookBookFilesResult">
+        <result property="id" column="id"/>
+        <result property="bookUserId" column="book_user_id"/>
+        <result property="name" column="name"/>
+        <result property="url" column="url"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectCoreSafetyBookBookFilesVo">
+        select id,
+               book_user_id,
+               name,
+               url,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from core_safety_book_book_files
+    </sql>
+
+    <select id="selectCoreSafetyBookBookFilesList"
+            parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBookBookFiles"
+            resultMap="CoreSafetyBookBookFilesResult">
+        <include refid="selectCoreSafetyBookBookFilesVo"/>
+        <where>
+            <if test="bookUserId != null ">
+                and book_user_id = #{bookUserId}
+            </if>
+            <if test="name != null  and name != ''">
+                and name like concat('%', #{name}, '%')
+            </if>
+            <if test="url != null  and url != ''">
+                and url = #{url}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectCoreSafetyBookBookFilesById" parameterType="Long"
+            resultMap="CoreSafetyBookBookFilesResult">
+        <include refid="selectCoreSafetyBookBookFilesVo"/>
+        where id = #{id}
+    </select>
+    <select id="selecVotList" resultType="com.xunmei.core.safetybook.domain.CoreSafetyBookBookFilesVo">
+        select name,url from core_safety_book_book_files where book_user_id=#{id}
+    </select>
+
+    <insert id="insertCoreSafetyBookBookFiles"
+            parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBookBookFiles">
+        insert into core_safety_book_book_files
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,
+            </if>
+            <if test="bookUserId != null">book_user_id,
+            </if>
+            <if test="name != null">name,
+            </if>
+            <if test="url != null">url,
+            </if>
+            <if test="createBy != null">create_by,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},
+            </if>
+            <if test="bookUserId != null">#{bookUserId},
+            </if>
+            <if test="name != null">#{name},
+            </if>
+            <if test="url != null">#{url},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateCoreSafetyBookBookFiles"
+            parameterType="com.xunmei.core.safetybook.domain.CoreSafetyBookBookFiles">
+        update core_safety_book_book_files
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="bookUserId != null">book_user_id =
+                #{bookUserId},
+            </if>
+            <if test="name != null">name =
+                #{name},
+            </if>
+            <if test="url != null">url =
+                #{url},
+            </if>
+            <if test="createBy != null">create_by =
+                #{createBy},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCoreSafetyBookBookFilesById" parameterType="Long">
+        delete
+        from core_safety_book_book_files
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteCoreSafetyBookBookFilesByIds" parameterType="String">
+        delete from core_safety_book_book_files where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -13,7 +13,6 @@
         <result property="updateTime" column="update_time"/>
         <result property="createBy" column="create_by"/>
         <result property="updateBy" column="update_by"/>
-        <result property="images" column="images"/>
     </resultMap>
 
     <sql id="selectCoreSafetyBookHsggbsdjVo">
@@ -24,8 +23,7 @@
                create_time,
                update_time,
                create_by,
-               update_by,
-               images
+               update_by
         from core_safety_book_hsggbsdj
     </sql>
 
@@ -43,9 +41,6 @@
             <if test="content != null  and content != ''">
                 and content = #{content}
             </if>
-            <if test="images != null  and images != ''">
-                and images = #{images}
-            </if>
         </where>
     </select>
 
@@ -64,7 +59,6 @@
             h.update_time,
             h.create_by,
             h.update_by,
-            h.images,
                h.join_names,
                o.short_name as org_name,
             group_concat( u.NAME ) AS userNames
@@ -104,7 +98,6 @@
         h.update_time,
         h.create_by,
         h.update_by,
-        h.images,
                h.join_names,
         o.short_name as org_name,
                h.org_id,
@@ -140,8 +133,6 @@
             </if>
             <if test="updateBy != null">update_by,
             </if>
-            <if test="images != null">images,
-            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},
@@ -160,8 +151,6 @@
             </if>
             <if test="updateBy != null">#{updateBy},
             </if>
-            <if test="images != null">#{images},
-            </if>
         </trim>
     </insert>
 
@@ -189,9 +178,6 @@
             <if test="updateBy != null">update_by =
                 #{updateBy},
             </if>
-            <if test="images != null">images =
-                #{images},
-            </if>
         </trim>
         where id = #{id}
     </update>

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

@@ -13,7 +13,6 @@
         <result property="bookId" column="book_id"/>
         <result property="userId" column="user_id"/>
         <result property="time" column="time"/>
-        <result property="files" column="files"/>
     </resultMap>
 
     <sql id="selectCoreSafetyBookUserVo">
@@ -23,8 +22,7 @@
                update_by,
                update_time,
                book_id,
-               time,
-               files
+               time
         from core_safety_book_user
     </sql>
 
@@ -41,9 +39,7 @@
             <if test="time != null ">
                 and time = #{time}
             </if>
-            <if test="files != null  and files != ''">
-                and files = #{files}
-            </if>
+
         </where>
     </select>
 
@@ -64,7 +60,6 @@
                u.update_time,
                u.book_id,
                u.time,
-               u.files,
                group_concat(su.name) as user_name,
                group_concat(su.id)   as user_id
         from core_safety_book_user u
@@ -92,8 +87,6 @@
             </if>
             <if test="time != null">time,
             </if>
-            <if test="files != null">files,
-            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="createBy != null">#{createBy},
@@ -110,8 +103,6 @@
             </if>
             <if test="time != null">#{time},
             </if>
-            <if test="files != null">#{files},
-            </if>
         </trim>
     </insert>
 
@@ -139,9 +130,6 @@
             <if test="time != null">time =
                 #{time},
             </if>
-            <if test="files != null">files =
-                #{files},
-            </if>
         </trim>
         where id = #{id}
     </update>