引用附件调整

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/bid/domain/JyTenderBidDetail.java

@@ -3,7 +3,7 @@ package com.jeeplus.business.bid.domain;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import lombok.Data;
 
 import java.util.List;
@@ -69,7 +69,7 @@ public class JyTenderBidDetail extends BaseEntity {
      * 中标附件
      */
     @TableField(exist = false)
-    private List<WorkAttachmentDto> bidFiles;
+    private List<WorkAttachmentInfoDTO> bidFiles;
 
     @TableField(exist = false)
     private String createName;

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/bid/mapper/TenderBidBasicMapper.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.business.bid.domain.TenderBidBasic;
 import com.jeeplus.business.bid.service.dto.TenderBidDTO;
 import com.jeeplus.business.tender.domain.Tender;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,7 +18,7 @@ import java.util.List;
 public interface TenderBidBasicMapper extends BaseMapper<TenderBidBasic> {
     TenderBidBasic findById(@Param("id") String id);
 
-    List<WorkAttachment> findFileList(@Param("id") String id);
+    List<WorkAttachmentInfo> findFileList(@Param("id") String id);
 
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/bid/mapper/TenderBidDetailMapper.java

@@ -2,7 +2,8 @@ package com.jeeplus.business.bid.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.business.bid.domain.JyTenderBidDetail;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.business.notify.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,7 @@ import java.util.List;
 public interface TenderBidDetailMapper extends BaseMapper<JyTenderBidDetail> {
 
     //查出附件信息
-    List<WorkAttachmentDto> getByAttachmentId(String id);
+    List<WorkAttachmentInfoDTO> getByAttachmentId(String id);
     //获取中标详情
     List<JyTenderBidDetail> findByBasicId(@Param("id") String id);
     //根据基础表id查询详情id

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/bid/mapper/xml/TenderBidBasicMapper.xml

@@ -23,7 +23,7 @@
 
     </select>
 
-    <select id="findFileList" resultType="com.jeeplus.pubmodules.oss.domain.WorkAttachment">
+    <select id="findFileList" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
 		SELECT * FROM work_attachment WHERE del_flag = 0 AND attachment_id = #{id}
 	</select>
     <select id="findIsExit" resultType="java.lang.Integer">

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/bid/mapper/xml/TenderBidDetailMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jeeplus.business.bid.mapper.TenderBidDetailMapper">
 
-    <select id="getByAttachmentId" resultType="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto">
+    <select id="getByAttachmentId" resultType="com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO">
         SELECT
 			id,
 			url,

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/bid/service/TenderBidService.java

@@ -12,6 +12,7 @@ import com.jeeplus.business.bid.domain.TenderBidBasic;
 import com.jeeplus.business.bid.mapper.TenderBidBasicMapper;
 import com.jeeplus.business.bid.mapper.TenderBidDetailMapper;
 import com.jeeplus.business.bid.service.dto.TenderBidDTO;
+import com.jeeplus.business.notify.service.dto.WorkAttachmentDto;
 import com.jeeplus.business.tender.domain.BidDetail;
 import com.jeeplus.business.tender.domain.Tender;
 import com.jeeplus.business.tender.mapper.BidDetailMapper;
@@ -19,14 +20,14 @@ import com.jeeplus.business.tender.service.DTO.TenderDTO;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.flowable.feign.IFlowableApi;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.feign.IPostApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.FlowCopy;
 import com.jeeplus.sys.service.dto.PostDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -66,9 +67,9 @@ public class TenderBidService {
             if (CollectionUtils.isNotEmpty(bidDetails)){
                 bidDetails.stream().forEach(detail->{
                     //附件信息
-                    List<WorkAttachmentDto> acList = detailMapper.getByAttachmentId(detail.getId());
+                    List<WorkAttachmentInfoDTO> acList = detailMapper.getByAttachmentId(detail.getId());
                     if (CollectionUtils.isNotEmpty(acList)) {
-                        for (WorkAttachmentDto i : acList) {
+                        for (WorkAttachmentInfoDTO i : acList) {
                             i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                         }
                     }
@@ -81,9 +82,9 @@ public class TenderBidService {
             List<JyTenderBidDetail> details=detailMapper.findByBasicId(id);
             for (JyTenderBidDetail bidDetail : details) {
                 //附件信息
-                List<WorkAttachmentDto> acList = detailMapper.getByAttachmentId(bidDetail.getId());
+                List<WorkAttachmentInfoDTO> acList = detailMapper.getByAttachmentId(bidDetail.getId());
                 if (CollectionUtils.isNotEmpty(acList)) {
-                    for (WorkAttachmentDto i : acList) {
+                    for (WorkAttachmentInfoDTO i : acList) {
                         i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                     }
                 }
@@ -92,9 +93,9 @@ public class TenderBidService {
             }
             tenderBidDTO.setBidDetails(details); //中标详情
             //附件信息
-            List<WorkAttachmentDto> files = detailMapper.getByAttachmentId(tender.getId());
+            List<WorkAttachmentInfoDTO> files = detailMapper.getByAttachmentId(tender.getId());
             if (CollectionUtils.isNotEmpty(files)) {
-                for (WorkAttachmentDto i : files) {
+                for (WorkAttachmentInfoDTO i : files) {
                     i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                 }
             }
@@ -333,17 +334,17 @@ public class TenderBidService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void updateFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id) {
+    public void updateFiles(List<WorkAttachmentInfoDTO> list, UserDTO userDTO, String id) {
         int j = 1;
         String names = new String();
         //表中存在，但是传过来不存在，说明已删除，表中数据也要删除
-        for (WorkAttachmentDto dto : list) {
+        for (WorkAttachmentInfoDTO dto : list) {
             names = names + "," +dto.getUrl();
         }
         //查询保存的附件信息
-        List<WorkAttachment> infoList = basicMapper.findFileList(id);
+        List<WorkAttachmentInfo> infoList = basicMapper.findFileList(id);
         if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(infoList)) {
-            for (WorkAttachment i : infoList) {
+            for (WorkAttachmentInfo i : infoList) {
                 if (!names.contains(i.getUrl())) {
 //                    ossServiceMapper.deleteById(i.getId());
                     SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteById(i.getId());
@@ -351,11 +352,11 @@ public class TenderBidService {
             }
         }
         //保存信息
-        for (WorkAttachmentDto dto : list) {
+        for (WorkAttachmentInfoDTO dto : list) {
             //判断是否存在
             Integer isExit = basicMapper.findIsExit(id, dto.getName());
             if (isExit == 0) {
-                WorkAttachment i = new WorkAttachment();
+                WorkAttachmentInfo i = new WorkAttachmentInfo();
                 //包含了url、size、name
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
 //                i.getCreateBy().setId(userDTO.getId());
@@ -393,10 +394,10 @@ public class TenderBidService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id) {
+    public void saveFiles(List<WorkAttachmentInfoDTO> list, UserDTO userDTO, String id) {
         int j = 1;
-        for (WorkAttachmentDto dto : list) {
-            WorkAttachment i = new WorkAttachment();
+        for (WorkAttachmentInfoDTO dto : list) {
+            WorkAttachmentInfo i = new WorkAttachmentInfo();
             //包含了url、size、name
             i.setId(UUID.randomUUID().toString().replace("-", ""));
 //            i.getCreateBy().setId(userDTO.getId());
@@ -485,7 +486,7 @@ public class TenderBidService {
         if (null != detailedList){
             detailedList.forEach(de->{
                 //附件
-                List<WorkAttachmentDto> fileList = detailMapper.getByAttachmentId(de.getId());
+                List<WorkAttachmentInfoDTO> fileList = detailMapper.getByAttachmentId(de.getId());
                 if ( null != fileList ){
                     fileList.forEach(f->{
                         SpringUtil.getBean(IWorkAttachmentApi.class).deleteById(f.getId());

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/bid/service/dto/TenderBidDTO.java

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.business.bid.domain.JyTenderBidDetail;
 import com.jeeplus.business.tender.domain.BidDetail;
 import com.jeeplus.core.domain.BaseEntity;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -80,7 +80,7 @@ public class TenderBidDTO extends BaseEntity {
     /**
      * 中标附件
      */
-    private List<WorkAttachmentDto> files;
+    private List<WorkAttachmentInfoDTO> files;
 
 
     /**

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/borrow/controller/BorrowController.java

@@ -8,7 +8,6 @@ import com.jeeplus.business.borrow.domain.RefundHis;
 import com.jeeplus.business.borrow.service.BorrowService;
 import com.jeeplus.business.borrow.service.dto.BorrowDTO;
 import com.jeeplus.business.borrow.service.dto.RefundDTO;
-import com.jeeplus.business.drive.service.dto.DriveApplyDTO;
 import com.jeeplus.business.finance.util.EasyPoiUtil;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.annotation.ExportMode;

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/borrow/service/dto/BorrowDTO.java

@@ -2,6 +2,7 @@ package com.jeeplus.business.borrow.service.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.jeeplus.core.domain.BaseEntity;
+
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import lombok.Data;
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/drive/controller/DriveController.java

@@ -9,8 +9,6 @@ import com.jeeplus.business.drive.service.dto.DriveAccountDTO;
 import com.jeeplus.business.drive.service.dto.DriveApplyDTO;
 import com.jeeplus.business.drive.service.dto.DriveDTO;
 import com.jeeplus.business.finance.util.EasyPoiUtil;
-import com.jeeplus.business.meetingRoom.service.dto.MeetingRoomDTO;
-import com.jeeplus.business.monthly.service.dto.MonthlyDTO;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.annotation.ExportMode;
@@ -22,9 +20,7 @@ import com.jeeplus.sys.service.dto.UserDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/drive/controller/DriveInfoController.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.business.drive.domain.DriveInfo;
 import com.jeeplus.business.drive.service.DriveInfoService;
 import com.jeeplus.business.finance.util.EasyPoiUtil;
-import com.jeeplus.business.monthly.service.dto.MonthlyDTO;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.annotation.ExportMode;
 import com.jeeplus.logging.annotation.ApiLog;

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/drive/controller/DriveMaintainController.java

@@ -3,7 +3,6 @@ package com.jeeplus.business.drive.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.business.drive.service.DriveMaintainService;
-import com.jeeplus.business.drive.service.dto.DriveApplyDTO;
 import com.jeeplus.business.drive.service.dto.DriveMaintainDTO;
 import com.jeeplus.business.finance.util.EasyPoiUtil;
 import com.jeeplus.common.excel.ExcelOptions;

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/humanResources/service/StaffDimissionService.java

@@ -31,7 +31,6 @@ import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.UserDTO;
 
-import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.utils.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -364,6 +363,13 @@ public class StaffDimissionService {
 
         UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getById(id);
 
-        UserUtils.deleteCache ( userDTO );
+        //清除用户缓存
+        RedisUtils.getInstance ( ).delete ( CacheNames.USER_CACHE_USER_ID, userDTO.getIdCacheKey ( ) );
+        RedisUtils.getInstance ( ).delete ( CacheNames.USER_CACHE_DATA_RULE_LIST, userDTO.getIdCacheKey ( ) );
+        RedisUtils.getInstance ( ).delete ( CacheNames.USER_CACHE_MENU_LIST, userDTO.getIdCacheKey ( ) );
+        RedisUtils.getInstance ( ).delete ( CacheNames.USER_CACHE_ROLE_LIST, userDTO.getIdCacheKey ( ) );
+        RedisUtils.getInstance ( ).delete ( CacheNames.USER_CACHE_TOP_MENU, userDTO.getIdCacheKey ( ) );
+        RedisUtils.getInstance ( ).delete ( CacheNames.USER_CACHE_LOGIN_NAME, userDTO.getLoginNameCacheKey ( ) );
+        RedisUtils.getInstance ( ).delete ( CacheNames.USER_CACHE_LOGIN_NAME, userDTO.getOldLoginNameCacheKey ( ) );
     }
 }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/tender/controller/TenderController.java

@@ -12,7 +12,6 @@ import com.jeeplus.common.excel.annotation.ExportMode;
 import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
-import com.jeeplus.pubmodules.purchase.service.dto.MaterialInfoDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/tender/domain/BidDetail.java

@@ -3,8 +3,7 @@ package com.jeeplus.business.tender.domain;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
-import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import lombok.Data;
 
 import java.util.List;
@@ -70,7 +69,7 @@ public class BidDetail extends BaseEntity {
      * 投标附件
      */
     @TableField(exist = false)
-    private List<WorkAttachmentDto> bidFiles;
+    private List<WorkAttachmentInfoDTO> bidFiles;
 
     @TableField(exist = false)
     private String createName;

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/tender/mapper/BidDetailMapper.java

@@ -2,7 +2,7 @@ package com.jeeplus.business.tender.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.business.tender.domain.BidDetail;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,5 +15,5 @@ public interface BidDetailMapper extends BaseMapper<BidDetail> {
     List<BidDetail> findByTenderId(@Param("id") String id);
 
     //查出附件信息
-    List<WorkAttachmentDto> getByAttachmentId(String id);
+    List<WorkAttachmentInfoDTO> getByAttachmentId(String id);
 }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/tender/mapper/TenderMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.business.tender.domain.Tender;
 import com.jeeplus.business.tender.service.DTO.TenderDTO;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,7 +21,7 @@ public interface TenderMapper extends BaseMapper<Tender> {
 
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 
-    List<WorkAttachment> findFileList(@Param("id") String id);
+    List<WorkAttachmentInfo> findFileList(@Param("id") String id);
 
     Tender findById(@Param("id") String id);
     //导出列表查询

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/tender/mapper/xml/BidDetailMapper.xml

@@ -27,7 +27,7 @@
         where a.tender_id = #{id} and a.del_flag = '0'
     </select>
 
-    <select id="getByAttachmentId" resultType="com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto">
+    <select id="getByAttachmentId" resultType="com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO">
         SELECT
 			id,
 			url,

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/tender/mapper/xml/TenderMapper.xml

@@ -54,7 +54,7 @@
 		ORDER BY a.create_time DESC
     </select>
 
-    <select id="findFileList" resultType="com.jeeplus.pubmodules.oss.domain.WorkAttachment">
+    <select id="findFileList" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
 		SELECT * FROM work_attachment WHERE del_flag = 0 AND attachment_id = #{id}
 	</select>
     <select id="findIsExit" resultType="java.lang.Integer">

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/tender/service/DTO/TenderDTO.java

@@ -4,8 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.business.tender.domain.BidDetail;
 import com.jeeplus.core.domain.BaseEntity;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
-import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -111,15 +110,15 @@ public class TenderDTO extends BaseEntity {
     /**
      * 招投标附件
      */
-    private List<WorkAttachmentDto> files;
+    private List<WorkAttachmentInfoDTO> files;
     /**
      * 投标附件
      */
-    private List<WorkAttachmentDto> bidFiles;
+    private List<WorkAttachmentInfoDTO> bidFiles;
     /**
      * 投标详情附件
      */
-    private List<WorkAttachmentDto> detatilFiles;
+    private List<WorkAttachmentInfoDTO> detatilFiles;
 
     /**
      * 投标明细列表

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/tender/service/TenderService.java

@@ -18,15 +18,15 @@ import com.jeeplus.business.tender.service.DTO.TenderDTO;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.flowable.feign.IFlowableApi;
-import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
-import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
-import com.jeeplus.pubmodules.wareHouse.domain.WareHouseDetailed;
+
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.feign.IPostApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.FlowCopy;
 import com.jeeplus.sys.service.dto.PostDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -220,17 +220,17 @@ public class TenderService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void updateFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id) {
+    public void updateFiles(List<WorkAttachmentInfoDTO> list, UserDTO userDTO, String id) {
         int j = 1;
         String names = new String();
         //表中存在，但是传过来不存在，说明已删除，表中数据也要删除
-        for (WorkAttachmentDto dto : list) {
+        for (WorkAttachmentInfoDTO dto : list) {
             names = names + "," +dto.getUrl();
         }
         //查询保存的附件信息
-        List<WorkAttachment> infoList = tenderMapper.findFileList(id);
+        List<WorkAttachmentInfo> infoList = tenderMapper.findFileList(id);
         if (org.flowable.editor.language.json.converter.util.CollectionUtils.isNotEmpty(infoList)) {
-            for (WorkAttachment i : infoList) {
+            for (WorkAttachmentInfo i : infoList) {
                 if (!names.contains(i.getUrl())) {
 //                    ossServiceMapper.deleteById(i.getId());
                     SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteById(i.getId());
@@ -238,11 +238,11 @@ public class TenderService {
             }
         }
         //保存信息
-        for (WorkAttachmentDto dto : list) {
+        for (WorkAttachmentInfoDTO dto : list) {
             //判断是否存在
             Integer isExit = tenderMapper.findIsExit(id, dto.getName());
             if (isExit == 0) {
-                WorkAttachment i = new WorkAttachment();
+                WorkAttachmentInfo i = new WorkAttachmentInfo();
                 //包含了url、size、name
                 i.setId(UUID.randomUUID().toString().replace("-", ""));
 //                i.getCreateBy().setId(userDTO.getId());
@@ -280,10 +280,10 @@ public class TenderService {
      * @param id 关联id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveFiles(List<WorkAttachmentDto> list, UserDTO userDTO, String id) {
+    public void saveFiles(List<WorkAttachmentInfoDTO> list, UserDTO userDTO, String id) {
         int j = 1;
-        for (WorkAttachmentDto dto : list) {
-            WorkAttachment i = new WorkAttachment();
+        for (WorkAttachmentInfoDTO dto : list) {
+            WorkAttachmentInfo i = new WorkAttachmentInfo();
             //包含了url、size、name
             i.setId(UUID.randomUUID().toString().replace("-", ""));
 //            i.getCreateBy().setId(userDTO.getId());
@@ -328,9 +328,9 @@ public class TenderService {
             if (CollectionUtils.isNotEmpty(bidDetails)){
                 bidDetails.stream().forEach(detail->{
                     //附件信息
-                    List<WorkAttachmentDto> acList = bidDetailMapper.getByAttachmentId(detail.getId());
+                    List<WorkAttachmentInfoDTO> acList = bidDetailMapper.getByAttachmentId(detail.getId());
                     if (CollectionUtils.isNotEmpty(acList)) {
-                        for (WorkAttachmentDto i : acList) {
+                        for (WorkAttachmentInfoDTO i : acList) {
                             i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                         }
                     }
@@ -340,9 +340,9 @@ public class TenderService {
             }
             tenderDTO.setTenderList(bidDetails);
             //附件信息
-            List<WorkAttachmentDto> files = bidDetailMapper.getByAttachmentId(tender.getId());
+            List<WorkAttachmentInfoDTO> files = bidDetailMapper.getByAttachmentId(tender.getId());
             if (CollectionUtils.isNotEmpty(files)) {
-                for (WorkAttachmentDto i : files) {
+                for (WorkAttachmentInfoDTO i : files) {
                     i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
                 }
             }
@@ -359,7 +359,7 @@ public class TenderService {
         if (null != detailedList){
             detailedList.forEach(de->{
                 //附件
-                List<WorkAttachmentDto> fileList = bidDetailMapper.getByAttachmentId(de.getId());
+                List<WorkAttachmentInfoDTO> fileList = bidDetailMapper.getByAttachmentId(de.getId());
                 if ( null != fileList ){
                     fileList.forEach(f->{
                         SpringUtil.getBean(IWorkAttachmentApi.class).deleteById(f.getId());